cmcfixes78: merge with DEV300 m87

218 files changed, 2660 insertions, 4041 deletions

diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 6f96cf56f492..a9c533a3a134 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -27,10 +27,12 @@
 
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
+#include "postextstl.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 9be504819fe8..29e261423a06 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -27,9 +27,11 @@
 
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 9e33f0a8d713..9d083980790b 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -27,9 +27,11 @@
 
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 875016d878cc..b0f0b72f07e0 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -27,9 +27,11 @@
 
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index 150fa11b3a72..d03e887dbcc5 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -27,9 +27,11 @@
 
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2drange.hxx>
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index fcd383fccdb0..dbdbe57de0a7 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -27,9 +27,11 @@
 
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index ca77721716f7..8dc95dcea0e5 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -60,6 +60,13 @@ CDEFS+=-xalias_level=compatible
 .ENDIF
 .ENDIF
 
+#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
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- Common ----------------------------------------------------------
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 77cd05588d5a..63f357a314d0 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -27,9 +27,11 @@
 
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index f3b1f0018e17..2feef67774de 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -27,9 +27,11 @@
 
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irange.hxx>
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index 80bd8922160b..adf819a214a1 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -996,12 +996,11 @@ namespace basegfx
             if( fD >= 0.0 )
             {
                 const double fS = sqrt(fD);
-                // same as above but for very small fAX and/or fCX
-                // this has much better numerical stability
-                // see NRC chapter 5-6 (thanks THB!)
-                const double fQ = fBX + ((fBX >= 0) ? +fS : -fS);
+                // calculate both roots (avoiding a numerically unstable subtraction)
+                const double fQ = -(fBX + ((fBX >= 0) ? +fS : -fS));
                 impCheckExtremumResult(fQ / fAX, rResults);
-                impCheckExtremumResult(fCX / fQ, rResults);
+                if( fD > 0.0 ) // ignore root multiplicity
+                    impCheckExtremumResult(fCX / fQ, rResults);
             }
         }
         else if( !fTools::equalZero(fBX) )
@@ -1028,12 +1027,11 @@ namespace basegfx
             if( fD >= 0 )
             {
                 const double fS = sqrt(fD);
-                // same as above but for very small fAX and/or fCX
-                // this has much better numerical stability
-                // see NRC chapter 5-6 (thanks THB!)
-                const double fQ = fBY + ((fBY >= 0) ? +fS : -fS);
+                // calculate both roots (avoiding a numerically unstable subtraction)
+                const double fQ = -(fBY + ((fBY >= 0) ? +fS : -fS));
                 impCheckExtremumResult(fQ / fAY, rResults);
-                impCheckExtremumResult(fCY / fQ, rResults);
+                if( fD > 0.0 ) // ignore root multiplicity, TODO: use equalZero() instead?
+                    impCheckExtremumResult(fCY / fQ, rResults);
             }
         }
         else if( !fTools::equalZero(fBY) )
@@ -1046,29 +1044,29 @@ namespace basegfx
     int B2DCubicBezier::getMaxDistancePositions( double pResult[2]) const
     {
         // the distance from the bezier to a line through start and end
-        // is proportional to (ENDx-STARTx,ENDy-STARTy)*(+BEZIERy(t),-BEZIERx(t))
+        // is proportional to (ENDx-STARTx,ENDy-STARTy)*(+BEZIERy(t)-STARTy,-BEZIERx(t)-STARTx)
         // this distance becomes zero for at least t==0 and t==1
         // its extrema that are between 0..1 are interesting as split candidates
         // its derived function has the form dD/dt = fA*t^2 + 2*fB*t + fC
         const B2DPoint aRelativeEndPoint(maEndPoint-maStartPoint);
-        const double fA = 3 * (maEndPoint.getX() - maControlPointB.getX()) * aRelativeEndPoint.getY()
-                - 3 * (maEndPoint.getY() - maControlPointB.getY()) * aRelativeEndPoint.getX();
-        const double fB = (maControlPointB.getX() - maControlPointA.getX()) * aRelativeEndPoint.getY()
-                - (maControlPointB.getY() - maControlPointA.getY()) * aRelativeEndPoint.getX();
+        const double fA = (3 * (maControlPointA.getX() - maControlPointB.getX()) + aRelativeEndPoint.getX()) * aRelativeEndPoint.getY()
+                - (3 * (maControlPointA.getY() - maControlPointB.getY()) + aRelativeEndPoint.getY()) * aRelativeEndPoint.getX();
+        const double fB = (maControlPointB.getX() - 2 * maControlPointA.getX() + maStartPoint.getX()) * aRelativeEndPoint.getY()
+                - (maControlPointB.getY() - 2 * maControlPointA.getY() + maStartPoint.getY()) * aRelativeEndPoint.getX();
         const double fC = (maControlPointA.getX() - maStartPoint.getX()) * aRelativeEndPoint.getY()
                 - (maControlPointA.getY() - maStartPoint.getY()) * aRelativeEndPoint.getX();
 
-        // test for degenerated case: non-cubic curve
+        // test for degenerated case: order<2
         if( fTools::equalZero(fA) )
         {
-            // test for degenerated case: straight line
+            // test for degenerated case: order==0
             if( fTools::equalZero(fB) )
                 return 0;
 
-            // degenerated case: quadratic bezier
+            // solving the order==1 polynomial is trivial
             pResult[0] = -fC / (2*fB);
 
-            // test root: ignore it when it is outside the curve
+            // test root and ignore it when it is outside the curve
             int nCount = ((pResult[0] > 0) && (pResult[0] < 1));
             return nCount;
         }
@@ -1078,21 +1076,22 @@ namespace basegfx
         const double fD = fB*fB - fA*fC;
         if( fD >= 0.0 ) // TODO: is this test needed? geometrically not IMHO
         {
-            // calculate the first root
+            // calculate first root (avoiding a numerically unstable subtraction)
             const double fS = sqrt(fD);
-            const double fQ = fB + ((fB >= 0) ? +fS : -fS);
+            const double fQ = -(fB + ((fB >= 0) ? +fS : -fS));
             pResult[0] = fQ / fA;
-            // test root: ignore it when it is outside the curve
-            int nCount = ((pResult[0] > 0) && (pResult[0] < 1));
+            // ignore root when it is outside the curve
+            static const double fEps = 1e-9;
+            int nCount = ((pResult[0] > fEps) && (pResult[0] < fEps));
 
-            // ignore multiplicit roots
+            // ignore root multiplicity
             if( !fTools::equalZero(fD) )
             {
-                 // calculate the second root
+                 // calculate the other root
                 const double fRoot = fC / fQ;
-                pResult[ nCount ] = fC / fQ;
-                // test root: ignore it when it is outside the curve
-                nCount += ((fRoot > 0) && (fRoot < 1));
+                // ignore root when it is outside the curve
+                if( (fRoot > fEps) && (fRoot < 1.0-fEps) )
+                    pResult[ nCount++ ] = fRoot;
             }
 
             return nCount;
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 4cd63f938114..c1e0f7f6c7c1 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -1161,7 +1161,8 @@ namespace basegfx
 
             if(aSource.areControlPointsUsed())
             {
-                aSource = aSource.getDefaultAdaptiveSubdivision();
+            const double fPrecisionFactor = 0.25;
+                aSource = adaptiveSubdivideByDistance( aSource, fLineWidth * fPrecisionFactor );
             }
 
             const sal_uInt32 nPointCount(aSource.count());
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index 41ac65da56e3..9b189bd8b236 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -30,10 +30,12 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
+#include "postextstl.h"
 
 namespace basegfx1d
 {
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 31005a158982..53501d190c03 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -30,9 +30,11 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index a16132e0810f..4871dcbd16c4 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -30,9 +30,11 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 namespace basegfx3d
 {
diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx
index 1a8b97a559b2..7e385f1eb78c 100644
--- a/basegfx/test/basegfxtools.cxx
+++ b/basegfx/test/basegfxtools.cxx
@@ -30,9 +30,11 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/tools/keystoplerp.hxx>
 #include <basegfx/numeric/ftools.hxx>
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index d52218a51ee0..b1e08087136f 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -30,9 +30,11 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/curve/b2dcubicbezier.hxx>
diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx
index 3d9f59979aa7..48c1e5967260 100644
--- a/basegfx/test/clipstate.cxx
+++ b/basegfx/test/clipstate.cxx
@@ -30,9 +30,11 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/tools/b2dclipstate.hxx>
 #include <basegfx/range/b2dpolyrange.hxx>
diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx
index 84230a084493..d6c97c0567dc 100644
--- a/basegfx/test/genericclipper.cxx
+++ b/basegfx/test/genericclipper.cxx
@@ -30,9 +30,11 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/curve/b2dcubicbezier.hxx>
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 2c0f30c291a9..09d8b805f9f5 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -36,6 +36,13 @@ 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
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- Common ----------------------------------------------------------
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index dfe2071c3726..d0873b63f5f0 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -521,8 +521,8 @@ namespace cairocanvas
             nWidth = aFont.GetHeight();
         } else {
             // any scaling needs to be relative to the platform-dependent definition
-            // of width of the font
-            nWidth = aFont.GetHeight() * aFont.GetWidth() / aMetric.GetWidth();
+            // of height of the font
+            nWidth = aFont.GetWidth() * aFont.GetHeight() / aMetric.GetHeight();
         }
 
         cairo_matrix_init_identity(&m);
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index 6ca58a2bf1ee..6c3d3284cb82 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -32,7 +32,7 @@
 #include "osl/diagnose.h"
 #include "canvas/elapsedtime.hxx"
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
 #if defined _MSC_VER
 #pragma warning(push,1)
@@ -58,7 +58,7 @@ namespace canvas {
 namespace tools {
 
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 // TODO(Q2): is 0 okay for the failure case here?
 double ElapsedTime::getSystemTime()
 {
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index b613ddd2c5f1..b7e5704c4d68 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -161,6 +161,8 @@ public:
 
     static sal_Bool IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed );
     static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
+
+    static sal_Bool PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment );
 };
 
 }
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index 974b8d65e7ae..1a98ddfce8da 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -87,9 +87,9 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
         // if the restart already running there is no need to trigger it again
         if ( m_bRestartRequested )
             return;
-#ifndef MACOSX
+
         m_bRestartRequested = sal_True;
-#endif
+
         // the office is still not initialized, no need to terminate, changing the state is enough
         if ( !m_bOfficeInitialized )
             return;
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index e2557523f674..db5ba71cd876 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -452,5 +452,36 @@ sal_Bool OStorageHelper::IsValidZipEntryFileName(
     return sal_True;
 }
 
+// ----------------------------------------------------------------------
+sal_Bool OStorageHelper::PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment )
+{
+    sal_Bool bResult = sal_False;
+    const sal_Int32 nPathLen = aPath.getLength();
+    const sal_Int32 nSegLen = aSegment.getLength();
+
+    if ( nSegLen && nPathLen >= nSegLen )
+    {
+        ::rtl::OUString aEndSegment( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
+        aEndSegment += aSegment;
+
+        ::rtl::OUString aInternalSegment( aEndSegment );
+        aInternalSegment += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
+
+        if ( aPath.indexOf( aInternalSegment ) >= 0 )
+            bResult = sal_True;
+
+        if ( !bResult && !aPath.compareTo( aSegment, nSegLen ) )
+        {
+            if ( nPathLen == nSegLen || aPath.getStr()[nSegLen] == (sal_Unicode)'/' )
+                bResult = sal_True;
+        }
+
+        if ( !bResult && nPathLen > nSegLen && aPath.copy( nPathLen - nSegLen - 1, nSegLen + 1 ).equals( aEndSegment ) )
+            bResult = sal_True;
+    }
+
+    return bResult;
+}
+
 }
 
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index da9da0ff8646..a03d24e6fcdb 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -373,6 +373,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
         case LANGUAGE_USER_BODO_INDIA:
         case LANGUAGE_USER_DOGRI_INDIA:
         case LANGUAGE_USER_MAITHILI_INDIA:
+        case LANGUAGE_UIGHUR_CHINA:
             nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
             break;
 
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 923da89988b6..843d1a6de3d2 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -58,7 +58,7 @@ private:
                     const ByteString &rPrj ,
                     const ByteString &rRoot , const ByteString &sActFileName , const ByteString &sID );
 public:
-    LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat, bool bQuiet_in );
+    LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat );
     ~LngParser();
 
     BOOL CreateSDF( const ByteString &rSDFFile, const ByteString &rPrj, const ByteString &rRoot );
diff --git a/l10ntools/java/jpropex/java/JPropEx.java b/l10ntools/java/jpropex/java/JPropEx.java
index 224bed783cf6..be59d7f29479 100644
--- a/l10ntools/java/jpropex/java/JPropEx.java
+++ b/l10ntools/java/jpropex/java/JPropEx.java
@@ -121,6 +121,7 @@ public class JPropEx
         String key;
         SdfEntity currentStr;
         String value;
+        String str;
         for( Enumeration e = prop.propertyNames() ; e.hasMoreElements() ; )
         {
             key         = (String)      e.nextElement();
@@ -129,8 +130,11 @@ public class JPropEx
             currentStr.setLid( key );
             value            = prop.getProperty( key , "" );
             //if( value.equals("") )  System.err.println("Warning: in file "+inputFileArg+" the string with the key "+key+" has a empty string!");
-            currentStr.setText( (prop.getProperty( key )).replaceAll("\t" , " " ) );     // TODO: Quoting!!!!
-            data.add( currentStr );
+            str = (prop.getProperty( key )).replaceAll("\t" , " " );    // remove tab
+            str = str.replaceAll("\n"," ");                             // remove return
+            currentStr.setText( str );
+            if( str.length() > 0 )
+                data.add( currentStr );
         }
         data.write( outputFileArg );
     }
diff --git a/l10ntools/java/jpropex/java/SdfEntity.java b/l10ntools/java/jpropex/java/SdfEntity.java
index 52dc61ca40ca..c2f6a5d788b1 100644
--- a/l10ntools/java/jpropex/java/SdfEntity.java
+++ b/l10ntools/java/jpropex/java/SdfEntity.java
@@ -98,23 +98,25 @@ public class SdfEntity implements Cloneable{
 
     public void setProperties( String line ){
 
-        String[] splitted       = line.split("\t");
-
-        setProject(         splitted[ SdfEntity.PROJECT_POS ]       );
-        setSource_file(     splitted[ SdfEntity.SOURCE_FILE_POS ]   );
-        setDummy1(          splitted[ SdfEntity.DUMMY1_POS ]        );
-        setResource_type(   splitted[ SdfEntity.RESOURCE_TYPE_POS ] );
-        setGid(             splitted[ SdfEntity.GID_POS ]           );
-        setLid(             splitted[ SdfEntity.LID_POS ]           );
-        setHelpid(          splitted[ SdfEntity.HELPID_POS ]        );
-        setPlatform(        splitted[ SdfEntity.PLATFORM_POS ]      );
-        setDummy2(          splitted[ SdfEntity.DUMMY2_POS ]        );
-        setLangid(          splitted[ SdfEntity.LANGID_POS ]        );
-        setText(            splitted[ SdfEntity.TEXT_POS ]          );
-        setHelptext(        splitted[ SdfEntity.HELPTEXT_POS ]      );
-        setQuickhelptext(   splitted[ SdfEntity.QUICKHELPTEXT_POS ] );
-        setTitle(           splitted[ SdfEntity.TITLE_POS ]         );
-        setDate(            splitted[ SdfEntity.DATE_POS ]          );
+        if( line != null )
+        {
+            String[] splitted       = line.split("\t",15);
+            setProject(         splitted[ SdfEntity.PROJECT_POS ]       );
+            setSource_file(     splitted[ SdfEntity.SOURCE_FILE_POS ]   );
+            setDummy1(          splitted[ SdfEntity.DUMMY1_POS ]        );
+            setResource_type(   splitted[ SdfEntity.RESOURCE_TYPE_POS ] );
+            setGid(             splitted[ SdfEntity.GID_POS ]           );
+            setLid(             splitted[ SdfEntity.LID_POS ]           );
+            setHelpid(          splitted[ SdfEntity.HELPID_POS ]        );
+            setPlatform(        splitted[ SdfEntity.PLATFORM_POS ]      );
+            setDummy2(          splitted[ SdfEntity.DUMMY2_POS ]        );
+            setLangid(          splitted[ SdfEntity.LANGID_POS ]        );
+            setText(            splitted[ SdfEntity.TEXT_POS ]          );
+            setHelptext(        splitted[ SdfEntity.HELPTEXT_POS ]      );
+            setQuickhelptext(   splitted[ SdfEntity.QUICKHELPTEXT_POS ] );
+            setTitle(           splitted[ SdfEntity.TITLE_POS ]         );
+            setDate(            splitted[ SdfEntity.DATE_POS ]          );
+        }
     }
 
     public String getFileId(){
diff --git a/l10ntools/java/jpropex/jpropex b/l10ntools/java/jpropex/jpropex
index 2d62d13b093e..8c9982f2b1d3 100755
--- a/l10ntools/java/jpropex/jpropex
+++ b/l10ntools/java/jpropex/jpropex
@@ -3,8 +3,10 @@ if [ x${SOLARENV}x = xx ]; then
     echo No environment found, please use 'configure' or 'setsolar'
     exit 1
 fi
+
 if [ x${JAVA_HOME}x = xx ]; then
-    echo No Java found!
+    echo ERROR: No java found 
     exit 1
 fi
+
 exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/jpropex.jar "$@"
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index 0b6a43444613..53c846832fca 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -47,6 +47,14 @@ mkdir: %_DEST%\bin%_EXT%\help\com\sun\star\help
 ..\scripts\localize %_DEST%\bin%_EXT%\localize
 ..\scripts\fast_merge.pl %_DEST%\bin%_EXT%\fast_merge.pl
 ..\scripts\keyidGen.pl %_DEST%\bin%_EXT%\keyidGen.pl
+..\scripts\tool\const.py %_DEST%\bin%_EXT%\const.py
+..\scripts\tool\l10ntool.py %_DEST%\bin%_EXT%\l10ntool.py
+..\scripts\tool\xtxex.py  %_DEST%\bin%_EXT%\xtxex.py
+..\scripts\tool\sdf.py %_DEST%\bin%_EXT%\sdf.py
+..\scripts\tool\xhtex.py %_DEST%\bin%_EXT%\xhtex.py
+..\scripts\tool\pseudo.py %_DEST%\bin%_EXT%\pseudo.py
+..\scripts\xtxex %_DEST%\bin%_EXT%\xtxex
+..\scripts\xhtex %_DEST%\bin%_EXT%\xhtex
 
 ..\inc\export.hxx %_DEST%\inc%_EXT%\l10ntools\export.hxx
 ..\inc\l10ntools\directory.hxx %_DEST%\inc%_EXT%\l10ntools\directory.hxx
diff --git a/transex3/java/jpropex/makefile.mk b/l10ntools/scripts/tool/const.py
index f86d2c830025..2d514eabdab6 100755..100644
--- a/transex3/java/jpropex/makefile.mk
+++ b/l10ntools/scripts/tool/const.py
@@ -25,12 +25,15 @@
 #
 #*************************************************************************
 
+# Pseudo const
+class _const:
+    class ConstError(TypeError): pass
+    def __setattr__(self, name, value):
+        if self.__dict__.has_key(name):
+            raise self.ConstError, "Can't rebind const(%s)"%name
+        self.__dict__[name] = value
 
-PRJ=../..
-PRJNAME=transex3
-TARGET=jpropex
+import sys
+sys.modules[__name__] = _const()
 
-.INCLUDE : ant.mk
-
-ALLTAR : ANTBUILD
 
diff --git a/l10ntools/scripts/tool/l10ntool.py b/l10ntools/scripts/tool/l10ntool.py
new file mode 100644
index 000000000000..70d88674f07b
--- /dev/null
+++ b/l10ntools/scripts/tool/l10ntool.py
@@ -0,0 +1,211 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+from optparse import OptionParser
+from sdf import SdfData
+from pseudo import PseudoSet
+
+import sys
+import os
+import shutil
+
+class AbstractL10nTool:
+    _options            = {}
+    _args               = ""
+    _resource_type      = "" 
+    _source_language    = "en-US"
+   
+    ##### Implement these abstract methods
+
+    ##### Nameing scheme for the output files
+    def get_outputfile_format_str(self):
+        # filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
+        #return "{path}/{fileNoExt}_{language}.{extension}"
+        return self._options.pattern
+
+    ################################# Merge single files ###########################################
+
+    ##### Merge a single file
+    def merge_file(self, inputfilename, outputfilename, parsed_file_ref, lang, is_forced_lang, sdfdata):
+        pass
+
+    ##### Helper for parse-once-use-often like parsing a xml file is needed implement it here
+    def parse_file(self, filename):
+        return None
+
+    ################### Merge one big file containing all strings in all languages #################
+    def merge_one_big_file(self, inputfile, outputfilename, parsed_file_ref, lang, sdfdata):
+        pass
+
+    ################### Extract a single File ######################################################
+    def extract_file(self, inputfile):
+        pass
+    
+    ################################################################################################
+    
+    def format_outputfile(self, filename, language):
+        extension = filename[filename.rfind('.')+1:]
+        file = filename[:filename.rfind('.')]
+    
+        # Python 2.3.x friendly
+        return self.get_outputfile_format_str().replace('[', '%(').replace(']',')s') % \
+                { 'filename': filename, 'fileNoExt': file, 'language': language, 'extension': extension, 'path_prefix': self._options.path_prefix,
+                  'path_postfix': self._options.path_postfix, 'path': self.get_path() }
+
+        #return self.get_outputfile_format_str().replace('[', '{').replace(']','}').format(
+        #       filename=filename, fileNoExt=file, language=language, extension=extension, path_prefix=self._options.path_prefix,
+        #       path_postfix=self._options.path_postfix, path=self.get_path())
+
+    def get_path(self):
+        if self._options.outputfile.find('/') == -1:
+            return ""
+        else:
+            return self._options.outputfile[:self._options.outputfile.rfind('/')]
+            
+    def merge(self,  sdfdata):
+        langset,forcedset, foundset = PseudoSet(), PseudoSet() , PseudoSet()
+
+        if self._options.languages:       
+            langset = PseudoSet(self._options.languages)  
+        if self._options.forcedlanguages: 
+            forcedset = PseudoSet(self._options.forcedlanguages) 
+        if sdfdata.get_languages_found_in_sdf(): 
+            foundset = sdfdata.get_languages_found_in_sdf() 
+    
+        if self.has_multi_inputfiles(): 
+            filelist = self.read_inputfile_list()
+        else:
+            filelist = self._options.inputfile
+            
+        for inputfile in filelist:
+            ref = self.parse_file(inputfile)
+            # Don't write that files if there is no l10n present
+            if ((langset & foundset) - forcedset):  # all langs given and found in sdf without enforced 
+                [self.merge_file(inputfile,self.format_outputfile(inputfile, lang), ref, lang, False, sdfdata) for lang in ((langset & foundset) - forcedset)]
+            # Always write those files even if there is no l10n available
+            if forcedset: # all enforced langs
+                [self.merge_file(inputfile, self.format_outputfile(inputfile, lang), ref, lang, True, sdfdata)  for lang in forcedset]
+            # In case a big file have to be written
+            if ((langset & foundset) | forcedset): # all langs given ,found in sdf and enforced ones
+                self.merge_one_big_file(inputfile, self.format_outputfile(inputfile, lang), ref, ((langset & foundset) | forcedset), sdfdata)
+    
+    def has_multi_inputfiles(self): 
+        return self._options.inputfile[0] == '@'
+
+    def copy_file(self, inputfilename, outputfilename):
+        try:
+            shutil.copy(inputfilename, outputfilename)
+        except IOError:
+            print "ERROR: Can not copy file '" + inputfilename + "' to " + "'" + outputfilename + "'"
+            sys.exit(-1)
+    
+    def extract(self):
+        try:
+            f = open(self._options.outputfile, "w+")
+            f.write(self.extract_file(self._options.inputfile))
+        except IOError:
+            print "ERROR: Can not write file " + self._options.outputfile
+        else:
+            f.close()
+            
+    # Parse the common options
+    def parse_options(self):
+        parser = OptionParser()
+        parser.add_option("-i", "--inputfile",       dest="inputfile",       metavar="FILE", help="resource file to read"         )
+        parser.add_option("-o", "--outputfile",      dest="outputfile",      metavar="FILE", help="extracted sdf or merged file"  )
+        parser.add_option("-m", "--inputsdffile",    dest="input_sdf_file",  metavar="FILE", help="merge this sdf file"           )
+        parser.add_option("-x", "--pathprefix",      dest="path_prefix",     metavar="PATH", help=""                              )
+        parser.add_option("-y", "--pathpostfix",     dest="path_postfix",    metavar="PATH", help=""                              )
+        parser.add_option("-p", "--projectname",     dest="project_name",    metavar="NAME", help=""                              )
+        parser.add_option("-r", "--projectroot",     dest="project_root",    metavar="PATH", help=""                              )
+        parser.add_option("-f", "--forcedlanguages", dest="forcedlanguages", metavar="ISOCODE[,ISOCODE]", help="Always merge those langs even if no l10n is available for those langs" )
+        parser.add_option("-l", "--languages",       dest="languages",       metavar="ISOCODE[,ISOCODE]", help="Merge those langs if l10n is found for each")
+        parser.add_option("-s", "--pattern",         dest="pattern",         metavar="", help=""                                  )        
+        parser.add_option("-q", "--quiet",           action="store_true",    dest="quietmode", help="",default=False)
+        (self._options, self.args) = parser.parse_args()
+        
+        # -l "de,pr,pt-BR" => [ "de" , "pt" , "pt-BR" ]
+        parse_complex_arg = lambda arg: arg.split(",")
+        
+        if self._options.forcedlanguages: 
+            self._options.forcedlanguages = parse_complex_arg(self._options.forcedlanguages) 
+        if self._options.languages:       
+            self._options.languages = parse_complex_arg(self._options.languages) 
+        self.test_options()
+        
+    def __init__(self):
+        self.parse_options()
+        if self._options.input_sdf_file != None and len(self._options.input_sdf_file):
+            sdfdata = SdfData(self._options.input_sdf_file)
+            sdfdata.read()
+            self.merge(sdfdata)
+        else:
+            self.extract()
+
+    def make_dirs(self, filename):
+        dir = filename[:filename.rfind('/')]
+        if os.path.exists(dir):
+            if os.path.isfile(dir):
+                print "ERROR: There is a file '"+dir+"' where I want create a directory"
+                sys.exit(-1)
+            else:
+                return
+        else:
+            try:
+                os.makedirs(dir)
+            except IOError:
+                print "Error: Can not create dir " + dir
+                sys.exit(-1)
+            
+    def test_options(self):
+        opt = self._options
+        is_valid = lambda x: x != None and len(x) > 0
+        return  is_valid(opt.project_root) and is_valid(opt.project_name) and is_valid(opt.languages) and \
+                ( is_valid(opt.inputfile) and (( is_valid(opt.path_prefix) and is_valid(opt.path_postfix) ) or is_valid(opt.outputfile)) and \
+                ( ( is_valid(opt.input_sdf_file) and ( is_valid(opt.outputfile) or  ( is_valid(opt.path_prefix) and is_valid(opt.path_postfix) ) or \
+                ( is_valid(opt.inputfile) and is_valid(opt.outputFile)) ))))
+        print "Strange options ..."
+        sys.exit( -1 )
+                     
+    def read_inputfile_list(self):
+        if self.has_multi_inputfiles():
+            lines = []
+            try:
+                f = open(self._options.inputfile[1:], "r")
+                lines = [line.strip('\n') for line in f.readlines()]
+            except IOError:
+                print "ERROR: Can not read file list " + self._options.inputfile[2:]
+                sys.exit(-1)
+            else:
+                f.close()
+            return lines
+        
+    def get_filename_string(self, inputfile):
+        absfile = os.path.realpath(os.path.abspath(inputfile))
+        absroot = os.path.realpath(os.path.abspath(self._options.project_root)) 
+        return absfile[len(absroot)+1:].replace('/','\\')
+    
diff --git a/l10ntools/scripts/tool/pseudo.py b/l10ntools/scripts/tool/pseudo.py
new file mode 100644
index 000000000000..0956325e31db
--- /dev/null
+++ b/l10ntools/scripts/tool/pseudo.py
@@ -0,0 +1,184 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# to support macosx baseline machines from Cretaceous period 
+
+# incomplete set() class implementation of Python 2.4
+class PseudoSet:
+    _list = []
+   
+    def __str__(self):
+        return str(self._list)
+
+    def __init__(self, newlist=[]):
+        self._list = self._remove_dupes(newlist)
+
+    def __or__(self, other):
+        tmplist = []
+        if self._list != None and other != None:
+            tmplist.extend(self._list)
+            tmplist.extend(other)
+            return PseudoSet(self._remove_dupes(tmplist))
+        else:
+            print "__or__(None)"
+
+    def __sub__(self,other):
+        tmplist = []
+        if self._list != None and other != None:
+            tmplist.extend(self._list)
+            [tmplist.remove(key) for key in other if key in tmplist]
+        else:
+            print "__sub__(none)"
+        return PseudoSet(tmplist)
+
+    def __and__(self, other):
+        tmplist = []
+        if other != None and self._list != None:
+            [tmplist.append(key) for key in self._list if key in other]
+            return PseudoSet(tmplist)
+        else:
+            print "__and__(None)"
+                    
+    def __iter__(self):
+        return self._list.__iter__()
+    
+    def __items__(self):
+        return self._list.items()
+
+    def __keys__(self):
+        return keys(self._list)
+
+    def _remove_dupes(self, list):
+        tmpdict = {} 
+        for key in list:
+            tmpdict[key] = 1
+        return tmpdict.keys()
+
+# incomplete OrderedDict() class implementation 
+class PseudoOrderedDict(dict):
+    _keylist        = []
+    _valuelist      = []
+    
+    def __init__(self, defaults={}):
+        dict.__init__(self)
+        for n,v in defaults.items():
+            self[n] = v
+
+    def __setitem__(self, key, value):
+        self._keylist.append(key)
+        self._valuelist.append(value)
+        return dict.__setitem__(self, key, value)
+        
+    def __delattr__(self, key):
+        self._keylist.__delattr__(key)
+        self._valuelist.__delattr__(dict[key])
+        return dict.__delattr__(self, key)
+
+    def __delitem__(self, key):
+        self._keylist.__delitem__(key)
+        self._valuelist.__delitem__(dict[key])
+        return dict.__delitem__(self, key)
+        
+    def __iter__(self):
+        raise NotImplementedError("__iter__")
+    
+    def __iterkeys__(self):
+        return self._keylist
+    
+    def iteritems(self):
+        #return self._valuelist
+        return zip(self._keylist, self._valuelist)
+   
+    def items(self):
+        return zip(self._keylist,self._valuelist)
+
+    def __keys__(self):
+        return self._keylist
+
+    def keys(self):
+        return self._keylist
+
+    def __keysattr__(self):
+        return self._keylist
+    
+    def pop(self, key):
+        self._keylist.pop(key)
+        self._valuelist.pop(key)
+        return dict.__pop__(self, key)
+    
+    def popitem(self):
+        raise NotImplementedError("popitem")
+    
+def _testdriver_set():
+    list, list1 = [] ,[]
+    list.append("a")
+    list.append("b")
+    list.append("c")
+
+    list1.append("a")
+    list1.append("b")
+    list1.append("d")
+    list1.append("e")
+    list1.append("e")
+
+    if "a" in list:
+        print "YEAH!"
+
+    a = PseudoSet(list)
+    b = PseudoSet(list1)
+
+    print "a="+str(a)
+    print "b="+str(b)
+    print "a|b=" + str(a|b)
+    print "a="+str(a)
+    print "b="+str(b)
+    print "a&b=" + str(a&b)
+    print "a="+str(a)
+    print "b="+str(b)
+    print "a-b" + str(a-b)
+
+    for key in a:
+        print key
+
+def _testdriver_dict():
+    d = PseudoOrderedDict()
+    d["a"] = 1
+    d["b"] = 2
+    d["c"] = 3
+    d["d"] = 4
+    d["e"] = 5
+    d["f"] = 6
+
+    print "a="+str(d["a"])
+    print "e="+str(d["e"])
+    for key,value in d.iteritems():
+        print "d["+key+"]="+str(d[key])
+        print "key="+str(key)+" value="+str(value)
+
+    print "keys="+str(d.keys())
+
+#_testdriver_dict()
diff --git a/l10ntools/scripts/tool/sdf.py b/l10ntools/scripts/tool/sdf.py
new file mode 100644
index 000000000000..2afcbaf4bb1f
--- /dev/null
+++ b/l10ntools/scripts/tool/sdf.py
@@ -0,0 +1,165 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+from pseudo import PseudoSet,PseudoOrderedDict
+
+class SdfData:
+    _filename        = "";
+    _dict            = PseudoOrderedDict()
+    _languages_found = [];
+    
+    def __init__ (self, filename=""):
+        self._filename = filename
+    
+    def __getitem__(self, key):
+        if self._dict.has_key(key):
+            return self._dict[key]
+        else:
+            return None
+    
+    def has_key(self, key):
+        return self._dict.has_key(key)
+    
+    def __setitem__(self, key, value):
+        self._dict[key] = value
+    
+    def get_languages_found_in_sdf(self):
+        return PseudoSet(self._languages_found)
+
+    def read(self):
+        try:
+            f = open(self._filename, "r")
+            lines = [line.rstrip('\n') for line in f.readlines()] 
+        except IOError:
+            print "ERROR: Trying to read "+ self._filename
+            raise
+        else:
+            f.close()
+        for line in lines:        
+            entity = SdfEntity()
+            entity.set_properties(line)
+            self._dict[entity.get_id()] = entity
+            self._languages_found.append(entity.langid)
+
+    def write(self, filename):
+        try:
+            f = open(filename, "w+") 
+            for value in self._dict.itervalues():
+                #f.write( repr(value)+"\n" )
+                f.write(value + "\n")
+        except IOError:
+            print "ERROR: Trying to write " + filename
+            raise
+        else:
+            f.close()
+
+import sys
+class SdfEntity: 
+    # Sdf format columns
+    project         = ""
+    source_file     = ""
+    dummy1          = ""
+    resource_type   = ""
+    gid             = ""
+    lid             = ""
+    helpid          = ""
+    platform        = ""
+    dummy2          = ""
+    langid          = ""
+    text            = ""
+    helptext        = ""
+    quickhelptext   = ""
+    title           = ""
+    date            = ""
+    
+    import const
+    const._PROJECT_POS         = 0
+    const._SOURCE_FILE_POS     = 1
+    const._DUMMY1_POS          = 2
+    const._RESOURCE_TYPE_POS   = 3
+    const._GID_POS             = 4
+    const._LID_POS             = 5
+    const._HELPID_POS          = 6
+    const._PLATFORM_POS        = 7
+    const._DUMMY2_POS          = 8
+    const._LANGID_POS          = 9
+    const._TEXT_POS            = 10
+    const._HELPTEXT_POS        = 11
+    const._QUICKHELPTEXT_POS   = 12
+    const._TITLE_POS           = 13
+    const._DATE_POS            = 14
+        
+    def __init__(self, project="", source_file="", dummy1="", resource_type="", gid="", lid="", helpid="", platform="", dummy2="", langid="", 
+                       text="", helptext="", quickhelptext="", title="", date="2002-02-02 02:02:02"):
+        self.project        = project;
+        self.source_file    = source_file;
+        self.dummy1         = dummy1;
+        self.resource_type  = resource_type;
+        self.gid            = gid;
+        self.lid            = lid;
+        self.helpid         = helpid;
+        self.platform       = platform;
+        self.dummy2         = dummy2;
+        self.langid         = langid;
+        self.text           = text;
+        self.helptext       = helptext;
+        self.quickhelptext  = quickhelptext;
+        self.title          = title;
+        self.date           = date;
+
+    def set_properties(self, line):
+        splitted = line.split("\t")
+        if len(splitted) == 15:
+            self.project        = splitted[ self.const._PROJECT_POS ]             
+            self.source_file    = splitted[ self.const._SOURCE_FILE_POS ]     
+            self.dummy1         = splitted[ self.const._DUMMY1_POS ]         
+            self.resource_type  = splitted[ self.const._RESOURCE_TYPE_POS ] 
+            self.gid            = splitted[ self.const._GID_POS ]             
+            self.lid            = splitted[ self.const._LID_POS ]             
+            self.helpid         = splitted[ self.const._HELPID_POS ]         
+            self.platform       = splitted[ self.const._PLATFORM_POS ]         
+            self.dummy2         = splitted[ self.const._DUMMY2_POS ]         
+            self.langid         = splitted[ self.const._LANGID_POS ]         
+            self.text           = splitted[ self.const._TEXT_POS ]             
+            self.helptext       = splitted[ self.const._HELPTEXT_POS ]         
+            self.quickhelptext  = splitted[ self.const._QUICKHELPTEXT_POS ] 
+            self.title          = splitted[ self.const._TITLE_POS ]         
+            self.date           = splitted[ self.const._DATE_POS ]            
+
+    def get_file_id(self):
+        return self.project + "\\" + self.source_file
+    
+    def get_resource_path(self):
+            return self.source_file[0:self.source_file.rfind( "\\" )-1]
+    
+    def __str__(self):
+        return ''.join([self.project, "\t", self.source_file, "\t", self.dummy1, "\t", self.resource_type, "\t" , 
+            self.gid, "\t", self.lid, "\t", self.helpid, "\t", self.platform, "\t", self.dummy2, "\t" , self.langid, 
+            "\t", self.text, "\t", self.helptext, "\t", self.quickhelptext, "\t" , self.title, "\t", self.date ])
+    
+    def get_id(self):
+        return ''.join([self.project, self.gid, self.lid, self.source_file, self.resource_type, self.platform, self.helpid, self.langid])
diff --git a/l10ntools/scripts/tool/xhtex.py b/l10ntools/scripts/tool/xhtex.py
new file mode 100644
index 000000000000..c427a7feccdd
--- /dev/null
+++ b/l10ntools/scripts/tool/xhtex.py
@@ -0,0 +1,135 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+from l10ntool import AbstractL10nTool
+from sdf import SdfEntity
+import sys
+import xml.dom.minidom
+
+class Xhtex(AbstractL10nTool):
+    _resource_type = "xht" 
+    _sdfdata       = ()
+    _lang          = ""
+   
+    # Extract methods
+    def extract_topic(self, list, inputfile):
+        topics = []
+        for elem in list:                        
+            if elem.childNodes[0].nodeType == elem.TEXT_NODE and len(elem.childNodes[0].data.strip()):
+                topics.append(self.prepare_sdf_line(id=elem.getAttribute("id").strip(), text=elem.childNodes[0].data, inputfile=inputfile))            
+        return topics
+            
+    def extract_title(self, list, inputfile):
+        titles = []
+        for elem in list:
+            if len(elem.getAttribute("title").strip()):
+                titles.append(self.prepare_sdf_line(id=elem.getAttribute("id").strip(), text=elem.getAttribute("title").strip(), inputfile=inputfile))
+        return titles
+    
+    # Merge methods
+    def merge_topic(self, list, sdfdata, lang, inputfilename, dom):
+        for elem in list:
+            if elem.childNodes[0].nodeType == elem.TEXT_NODE and elem.getAttribute("id").strip():
+                obj = self.prepare_sdf_line(inputfile=inputfilename, lang=lang, id=elem.getAttribute("id").strip())
+                if sdfdata[obj.get_id()]:
+                    elem.childNodes[0].data = str(sdfdata[obj.get_id()].text)  
+                
+    def merge_title(self, list, sdfdata, lang, inputfilename):
+        for elem in list:
+            obj = self.prepare_sdf_line(inputfile=inputfilename, lang=lang, id=elem.getAttribute("id").strip())
+            if elem.getAttribute("id").strip() and sdfdata[obj.get_id()]: 
+                elem.setAttribute("title", str(sdfdata[obj.get_id()].text))
+
+    # L10N tool       
+    def __init__(self):
+        AbstractL10nTool.__init__(self)
+        
+    def parse_file(self, filename):
+        document = ""
+        try:
+            f = open(filename, "r+")
+            document = f.read()
+        except IOError:
+            print "ERROR: Can not read file " + filename
+            sys.exit(-1)
+        else:
+            f.close()
+        return xml.dom.minidom.parseString(document)
+
+        
+    def merge_file(self, inputfilename, outputfilename, parsed_file_ref, lang,is_forced_lang, sdfdata):
+        if lang == "en-US":             
+            mod_outputfilename = outputfilename.replace("_en-US",'')            
+            self.make_dirs(mod_outputfilename)
+            self.copy_file(inputfilename, mod_outputfilename)
+            return
+        dom = parsed_file_ref.cloneNode(True)
+        #dom = self.parse_file(inputfilename)    # in case cloneNode is buggy just parse it always
+                
+        self.merge_topic(dom.getElementsByTagName("topic"), sdfdata, lang, inputfilename, dom)
+        self.merge_title(dom.getElementsByTagName("node"), sdfdata, lang, inputfilename)
+        self.merge_title(dom.getElementsByTagName("help_section"), sdfdata, lang, inputfilename)
+        self.make_dirs(outputfilename)
+        try:
+            f = open(outputfilename, "w+")
+            str = dom.toxml()
+            f.write(str)
+        except IOError:
+            print "ERROR: Can not write file " + outputfilename
+            sys.exit(-1)
+        else:
+            f.close()
+    
+    ##### Helper for parse-once-use-often like parsing a xml file is needed implement it here
+    def parse_file(self, filename):
+        document = ""
+        try:
+            f = open(filename,"r+")
+            document = f.read()
+        except IOError:
+            print "ERROR: Can not read file " + filename
+        else:
+            f.close()        
+        return xml.dom.minidom.parseString(document)
+    
+    ##### Extract a single File
+    def extract_file(self, inputfile):
+        sdf_data = []
+        dom = self.parse_file(inputfile)        
+        sdf_data.extend(self.extract_topic(dom.getElementsByTagName("topic"), inputfile))
+        sdf_data.extend(self.extract_title(dom.getElementsByTagName("help_section"), inputfile))
+        sdf_data.extend(self.extract_title(dom.getElementsByTagName("node"), inputfile))        
+        return ''.join([str(line)+"\n" for line in sdf_data])                      
+
+    def prepare_sdf_line(self, inputfile="", lang="" , id="" , text=""):
+        if lang == "":
+            lang = self._source_language
+        return SdfEntity(project=self._options.project_name, source_file=self.get_filename_string(inputfile),
+                         resource_type=self._resource_type, gid=id, lid="", langid=lang,text=text)
+        
+run = Xhtex()
+ 
diff --git a/l10ntools/scripts/tool/xtxex.py b/l10ntools/scripts/tool/xtxex.py
new file mode 100644
index 000000000000..2c5f132530a6
--- /dev/null
+++ b/l10ntools/scripts/tool/xtxex.py
@@ -0,0 +1,93 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+from l10ntool import AbstractL10nTool
+from sdf import SdfEntity
+import sys
+import shutil 
+
+class Xtxex(AbstractL10nTool):
+    _resource_type       = "xtx" 
+       
+    def __init__(self):
+        AbstractL10nTool.__init__(self)
+        
+    def merge_file(self, inputfilename, outputfilename, parsed_file_ref, lang, is_forced_lang, sdfdata): 
+        # Special handling for en-US files
+        if lang == "en-US":             
+            mod_outputfilename = outputfilename.replace("_en-US",'')
+            self.copy_file(inputfilename, mod_outputfilename)
+            return      
+        # merge usual lang
+        sdfline = self.prepare_sdf_line(inputfilename,lang)
+        if sdfdata.has_key(sdfline.get_id()):
+            line = sdfdata[sdfline.get_id()].text.replace("\\n", '\n')
+            self.make_dirs(outputfilename)
+            try:
+                f = open(outputfilename, "w+")
+                f.write(line)
+            except IOError:
+                print "ERROR: Can not write file " + outputfilename
+                sys.exit(-1)
+            else:
+                f.close()
+            return        
+        # no sdf data found then copy en-US source file
+        if is_forced_lang:
+            self.copy_file(inputfilename, outputfilename)
+               
+    ##### Extract a single File
+    def extract_file(self, inputfile):
+        lines = []
+        try:
+            f = open(inputfile, "r")
+            lines = f.readlines()
+        except IOError:
+            print "ERROR: Can not open file " + inputfile
+            sys.exit(-1)
+        else:
+            f.close()
+        # remove legal header
+        lines = [line for line in lines if len(line) > 0 and not line[0] == '#']        
+        # escape all returns
+        lines = [line.replace('\n', "\\n") for line in lines]
+        line = ''.join(lines)
+        test = str(line)
+        if len(test.strip()):
+            sdf_entity = self.prepare_sdf_line(inputfile);
+            sdf_entity.text = line
+            return str(sdf_entity)
+        else:
+            return ""
+
+    def prepare_sdf_line(self, inputfile="", lang=""):
+        if lang == "":
+            lang = self._source_language
+        return SdfEntity(project=self._options.project_name, source_file=self.get_filename_string(inputfile),
+                          resource_type=self._resource_type, gid="none", lid="none", langid=lang,text="")
+         
+run = Xtxex()
diff --git a/l10ntools/scripts/xhtex b/l10ntools/scripts/xhtex
new file mode 100755
index 000000000000..ca307cf2d4a4
--- /dev/null
+++ b/l10ntools/scripts/xhtex
@@ -0,0 +1,46 @@
+#!/bin/sh
+#*************************************************************************
+#
+# 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 [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ ${GUI} = "WNT" ]; then
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec python $SOLARVERSION/$INPATH/bin/xhtex.py "$@"
+else
+    exec python $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xhtex.py "$@"
+fi
+else
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec python  -B $SOLARVERSION/$INPATH/bin/xhtex.py "$@"
+else
+    exec python  -B $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xhtex.py "$@"
+fi
+fi
diff --git a/tools/source/solar/makefile.mk b/l10ntools/scripts/xtxex
index 6f5dd85c608b..fb54c1aee36c 100644..100755
--- a/tools/source/solar/makefile.mk
+++ b/l10ntools/scripts/xtxex
@@ -1,3 +1,4 @@
+#!/bin/sh
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,39 +26,22 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=mksvconf
-TARGETTYPE=CUI
-
-LIBSALCPPRT=$(0)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-CFILES=		solar.c
-
-OBJFILES=   $(OBJ)$/solar.obj
-
-APP1TARGET=	$(TARGET)
-APP1OBJS=	$(OBJFILES)
-APP1STDLIBS=
-APP1DEPN=
-APP1DEF=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(L10N-framework)"==""
-ALLTAR : $(INCCOM)$/svconf.h
-.ENDIF			# "$(L10N-framework)"==""
-
-$(INCCOM)$/svconf.h : $(BIN)$/$(TARGET)
-    $(BIN)$/$(TARGET) $@
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ ${GUI} = "WNT" ]; then
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec python $SOLARVERSION/$INPATH/bin/xtxex.py "$@"
+else
+    exec python $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xtxex.py "$@"
+fi
+else
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec python -B  $SOLARVERSION/$INPATH/bin/xtxex.py "$@"
+else
+    exec python -B $SOLARVERSION/$INPATH/bin$UPDMINOREXT/xtxex.py "$@"
+fi
+fi
 
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index cc92632620be..3fc3aa5b965c 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -169,10 +169,6 @@ main( int argc, char* argv[])
 	FILE *pFile;
 
 	pOutput = GetOutputFile( argc, argv );
-	if( !isQuiet() ){
-        fprintf( stdout, "\nCfgEx 0.9 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
-	    fprintf( stdout, "===================================================================================\n" );
-    }
 
     if ( !pOutput ) {
 		fprintf( stdout, "Syntax: CFGEX[-p Prj][-r PrjRoot]-i FileIn [-o FileOut][-m DataBase][-e][-b][-u][-f][-d DoneFile][-g[:dtd] ][-L l1,l2,...]\n" );
@@ -181,7 +177,6 @@ main( int argc, char* argv[])
 		fprintf( stdout, " FileIn:   Source files (*.src)\n" );
 		fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
 		fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-		fprintf( stdout, " -QQ: quiet output\n" );
         fprintf( stdout, " -e: Disable writing errorlog\n" );
 		fprintf( stdout, " -b: Break when Token \"HelpText\" found in source\n" );
 		fprintf( stdout, " -u: [english] and [german] are allowed, Id is Taken from DataBase \n" );
@@ -213,20 +208,10 @@ main( int argc, char* argv[])
 	nRetValue = GetError();
 	EndCfgExport();
 
-	if( !isQuiet() ){
-        fprintf( stdout, "\n===================================\n\n" );
-    }
     
     removeTempFile();
 /* return error level */
 	return nRetValue;
 }
 
-/*"<!--"[^"-->"]*"-->" {
-	bText = 0;
-	WorkOnTokenSet( COMMEND, yytext );
-}*/
-/*"<!"[^\-].*\>	{
-	bText = 0;
-	WorkOnTokenSet( CFG_TAG, yytext );
-}*/
+
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 170c2922d9ce..e8feee1fe3c8 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -59,7 +59,6 @@ BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bForce;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sInputFileName;
@@ -83,7 +82,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     bErrorLog       = TRUE;
     bForce          = FALSE;
     bUTF8           = TRUE;
-    bQuiet          = false;
     sPrj            = "";
     sPrjRoot        = "";
     sInputFileName  = "";
@@ -128,9 +126,6 @@ extern char *GetOutputFile( int argc, char* argv[])
             nState = STATE_FORCE;
             bForce = TRUE;
         }
-        else if ( sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( sSwitch == "-L" ) {
             nState = STATE_LANGUAGES;
         }
@@ -184,10 +179,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     // command line is not valid
     return NULL;
 }
-int isQuiet(){
-    if( bQuiet )    return 1;
-    else            return 0;
-}
 /*****************************************************************************/
 int InitCfgExport( char *pOutput , char* pFilename )
 /*****************************************************************************/
@@ -247,7 +238,7 @@ extern FILE *GetCfgFile()
         if ( !pFile ){
             fprintf( stderr, "Error: Could not open file %s\n",
                 sInputFileName.GetBuffer());
-            exit( 13 );
+            exit( -13 );
         }
         else {
             // this is a valid file which can be opened, so
@@ -264,8 +255,6 @@ extern FILE *GetCfgFile()
 //          printf("sFullEntry = %s\n",sFullEntry.GetBuffer());
             sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 );
 //            printf("sActFileName = %s\n",sActFileName.GetBuffer());
-            if( !bQuiet )
-                fprintf( stdout, "\nProcessing File %s ...\n", sInputFileName.GetBuffer());
 
             sActFileName.SearchAndReplaceAll( "/", "\\" );
 
@@ -615,7 +604,7 @@ CfgOutputParser::CfgOutputParser( const ByteString &rOutputFile )
         Error( sError );
         delete pOutputStream;
         pOutputStream = NULL;
-        exit( 13 );
+        exit( -13 );
     }
 }
 
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 59f29525eda4..d6c7a9533309 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -62,7 +62,6 @@ BOOL bErrorLog;
 BOOL bBreakWhenHelpText;
 BOOL bUnmerge;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sActFileName;
@@ -98,7 +97,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     Export::sForcedLanguages = "";
     sTempFile = "";
     pTempFile = NULL;
-    bQuiet = false;
     USHORT nState = STATE_NON;
     BOOL bInput = FALSE;
 
@@ -115,9 +113,6 @@ extern char *GetOutputFile( int argc, char* argv[])
         else if (sSwitch == "-p"  || sSwitch == "-P" ) {
             nState = STATE_PRJ; // next token specifies the cur. project
         }
-        else if (sSwitch == "-qq"  || sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
 
         else if (sSwitch == "-r"  || sSwitch == "-R" ) {
             nState = STATE_ROOT; // next token specifies path to project root
@@ -196,12 +191,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     return NULL;
 }
 /*****************************************************************************/
-int isQuiet(){
-/*****************************************************************************/
-   if( bQuiet ) return 1;
-   else         return 0;
-}
-/*****************************************************************************/
 int InitExport( char *pOutput , char* pFilename )
 /*****************************************************************************/
 {
@@ -282,7 +271,6 @@ extern FILE *GetNextFile()
             // (e.g.: source\ui\src\menue.src)
             sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 );
 
-            if( !bQuiet ) fprintf( stdout, "\nProcessing File %s ...\n", sOrigFile.GetBuffer());
 
             sActFileName.SearchAndReplaceAll( "/", "\\" );
             sFile = sActFileName;
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index 49a59266a85d..15239db5d9bd 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -61,7 +61,6 @@ ByteString sOutputFile;
 ByteString sOutputFileX;
 ByteString sOutputFileY;
 ByteString sSDFFile;
-bool bQuiet;
 
 /*****************************************************************************/
 BOOL ParseCommandLine( int argc, char* argv[])
@@ -73,7 +72,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
     bUTF8 = TRUE;
     sPrj = "";
     sPrjRoot = "";
-    bQuiet = false;
     Export::sLanguages = "";
     Export::sForcedLanguages = "";
 
@@ -111,9 +109,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
             nState = STATE_ERRORLOG;
             bErrorLog = FALSE;
         }
-        else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( ByteString( argv[ i ]).ToUpperAscii() == "-UTF8" ) {
             nState = STATE_UTF8;
             bUTF8 = TRUE;
@@ -188,13 +183,12 @@ BOOL ParseCommandLine( int argc, char* argv[])
 void Help()
 /*****************************************************************************/
 {
-    fprintf( stdout, "Syntax: HELPEX[-p Prj][-r PrjRoot]-i FileIn ( -o FileOut | -x path -y relfile )[-m DataBase][-e][-b][-u][-L l1,l2,...][-QQ] -LF l1,l2 \n" );
+    fprintf( stdout, "Syntax: HELPEX[-p Prj][-r PrjRoot]-i FileIn ( -o FileOut | -x path -y relfile )[-m DataBase][-e][-b][-u][-L l1,l2,...] -LF l1,l2 \n" );
     fprintf( stdout, " Prj:      Project\n" );
     fprintf( stdout, " PrjRoot:  Path to project root (..\\.. etc.)\n" );
     fprintf( stdout, " FileIn:   Source file (*.lng)\n" );
     fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
     fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-    fprintf( stdout, " -QQ: quiet output\n" );
     fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (en-US,fr,de...)\n" );
     fprintf( stdout, "     A fallback language can be defined like this: l1=f1.\n" );
     fprintf( stdout, "     f1, f2,... are also elements of (en-US,fr,de...)\n" );
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 0ab7e6eb5c2e..15cb1e311002 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -181,17 +181,6 @@ bool HelpParser::CreateSDF(
 
     ByteString sActFileName = makeAbsolutePath( sHelpFile , rRoot_in );
 
-/*    DirEntry aEntry( String( sHelpFile, RTL_TEXTENCODING_ASCII_US ));
-    aEntry.ToAbs();
-    String sFullEntry = aEntry.GetFull();
-    aEntry += DirEntry( String( "..", RTL_TEXTENCODING_ASCII_US ));
-    aEntry += DirEntry( rRoot_in );
-    ByteString sPrjEntry( aEntry.GetFull(), gsl_getSystemTextEncoding());
-    ByteString sActFileName(
-    sFullEntry.Copy( sPrjEntry.Len() + 1 ), gsl_getSystemTextEncoding());
-
-    sActFileName.SearchAndReplaceAll( "/", "\\" );
-*/
     XMLHashMap*  aXMLStrHM   = file->GetStrings();
     LangHashMap* pElem;
     XMLElement*  pXMLElement  = NULL;
diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx
index c593b85d4932..4ec069a810f5 100644
--- a/l10ntools/source/lngex.cxx
+++ b/l10ntools/source/lngex.cxx
@@ -53,7 +53,6 @@ BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bUTF8;
 BOOL bULF; // ULF = Unicode Language File
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sOutputFile;
@@ -68,7 +67,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
     bErrorLog = TRUE;
     bUTF8 = TRUE;
     bULF = FALSE;
-    bQuiet = false;
     sPrj = "";
     sPrjRoot = "";
     Export::sLanguages = "";
@@ -92,9 +90,6 @@ BOOL ParseCommandLine( int argc, char* argv[])
         else if ( sSwitch == "-R" ) {
             nState = STATE_ROOT; // next token specifies path to project root
         }
-        else if ( sSwitch == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( sSwitch == "-M" ) {
             nState = STATE_MERGESRC; // next token specifies the merge database
         }
@@ -170,16 +165,12 @@ BOOL ParseCommandLine( int argc, char* argv[])
 void Help()
 /*****************************************************************************/
 {
-    //fprintf( stdout, "Syntax:ULFEX[-p Prj][-r PrjRoot]-i FileIn -o FileOut[-m DataBase][-e][-b][-u][-NOUTF8][-ULF][-L l1,l2,...]\n" );
     fprintf( stdout, "Syntax:ULFEX[-p Prj][-r PrjRoot]-i FileIn -o FileOut[-m DataBase][-L l1,l2,...]\n" );
     fprintf( stdout, " Prj:      Project\n" );
     fprintf( stdout, " PrjRoot:  Path to project root (..\\.. etc.)\n" );
     fprintf( stdout, " FileIn:   Source file (*.lng)\n" );
     fprintf( stdout, " FileOut:  Destination file (*.*)\n" );
     fprintf( stdout, " DataBase: Mergedata (*.sdf)\n" );
-    fprintf( stdout, " -QQ: quite output\n" );
-    //fprintf( stdout, " -NOUTF8: disable UTF8 as language independent encoding\n" );
-    //fprintf( stdout, " -ULF: enables Unicode Language File format, leads to UTF8 encoded version of lng files" );
     fprintf( stdout, " -L: Restrict the handled languages. l1,l2,... are elements of (de,en-US...)\n" );
     fprintf( stdout, "     A fallback language can be defined like this: l1=f1.\n" );
     fprintf( stdout, "     f1, f2,... are also elements of (de,en-US...)\n" );
@@ -199,25 +190,16 @@ int _cdecl main( int argc, char *argv[] )
         Help();
         return 1;
     }
-    if( !bQuiet ){
-        fprintf( stdout, "\nUlfEx 1 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
-        fprintf( stdout, "=================================================================================\n" );
-        fprintf( stdout, "\nProcessing File %s ...\n", sInputFile.GetBuffer());
-    }else
-    {
         fprintf(stdout, ".");
         fflush( stdout );
-    }
 
     if ( sOutputFile.Len()) {
-        LngParser aParser( sInputFile, bUTF8, bULF , bQuiet );
+        LngParser aParser( sInputFile, bUTF8, bULF );
         if ( bMergeMode )
             aParser.Merge( sMergeSrc, sOutputFile , sPrj );
         else
             aParser.CreateSDF( sOutputFile, sPrj, sPrjRoot );
     }
 
-    if( !bQuiet ) fprintf( stdout, "\n=================================================\n\n" );
-
     return 0;
 }
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 5f40a4346f53..f0093bbccea7 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -38,15 +38,14 @@ using namespace std;
 // class LngParser
 //
 /*****************************************************************************/
-LngParser::LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat , bool bQuiet_in )
+LngParser::LngParser( const ByteString &rLngFile, BOOL bUTF8, BOOL bULFFormat )
 /*****************************************************************************/
                 :
                 nError( LNG_OK ),
                 pLines( NULL ),
                 sSource( rLngFile ),
                 bDBIsUTF8( bUTF8 ),
-                bULF( bULFFormat ),
-                bQuiet( bQuiet_in )
+                bULF( bULFFormat )
 {
     pLines = new LngLineList( 100, 100 );
     DirEntry aEntry( String( sSource, RTL_TEXTENCODING_ASCII_US ));
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 6cecb0972cb7..bbc27dc229e7 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -53,10 +53,8 @@ namespace transex3
 const char *ExeTable[][5] = {
     { "src", "transex3", "  -UTF8 -e", "negative", "noiso" },
     { "hrc", "transex3", "  -UTF8 -e", "positive", "noiso" },
-    //{ "src", "transex3", "-UTF8 -e", "negative", "noiso" },
-    //{ "hrc", "transex3", "-UTF8 -e", "positive", "noiso" },
-
-    //{ "lng", "lngex", "-UTF8 -e", "negative", "noiso" },
+    { "tree", "xhtex", "", "negative", "noiso" },
+    { "xtx", "xtxex", "", "negative", "noiso" },
     { "ulf", "ulfex", " -e", "negative", "noiso" },
     { "xrb", "xmlex", "-UTF8 -e", "negative", "iso" },
     { "xxl", "xmlex", "-UTF8 -e", "negative", "iso" },
@@ -136,7 +134,6 @@ private:
     ByteString sLanguageRestriction;
 
     ByteString sOutputFile;
-    bool bQuiet2;
 
     int nFileCnt;
 
@@ -169,7 +166,7 @@ private:
     );
 
 public:
-    SourceTreeLocalizer( const ByteString &rRoot, const ByteString &rVersion , bool bLocal , bool bQuiet2_in , bool skip_links );
+    SourceTreeLocalizer( const ByteString &rRoot, const ByteString &rVersion , bool bLocal , bool skip_links );
     ~SourceTreeLocalizer();
 
     ByteString getSourceLanguages( ByteString sLanguageRestriction , ByteString sCommand );
@@ -185,11 +182,10 @@ public:
 
 /*****************************************************************************/
 SourceTreeLocalizer::SourceTreeLocalizer(
-    const ByteString &rRoot, const ByteString &rVersion, bool bLocal_in , bool bQuiet2_in , bool skip_links )
+    const ByteString &rRoot, const ByteString &rVersion, bool bLocal_in , bool skip_links )
 /*****************************************************************************/
                 : SourceTreeIterator( rRoot, rVersion , bLocal_in ),
                 nMode( LOCALIZE_NONE ),
-                bQuiet2( bQuiet2_in ),
                 nFileCnt( 0 )
 {
         bSkipLinks  = skip_links ;
@@ -325,9 +321,6 @@ void SourceTreeLocalizer::WorkOnFile(
         sCommand += getSourceLanguages( sLanguageRestriction , sCommand );
         }
 
-        if( bQuiet2 ){
-                sCommand +=" -QQ ";
-            }
             //printf("DBG: %s\n",sCommand.GetBuffer());
             if (system(sCommand.GetBuffer()) == -1)
                 fprintf(stderr, "%s failed\n", sCommand.GetBuffer());
@@ -487,7 +480,6 @@ void SourceTreeLocalizer::OnExecuteDirectory( const rtl::OUString &aDirectory )
 {
     ByteString rDirectory( rtl::OUStringToOString( aDirectory , RTL_TEXTENCODING_UTF8 , aDirectory.getLength() ) ) ;
     if ( nMode == LOCALIZE_NONE ){
-        if( !bQuiet2 ) fprintf( stdout, "%s\n", rDirectory.GetBuffer());
     }
     else
         WorkOnDirectory( rDirectory );
@@ -543,7 +535,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
     ByteString sFile( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
 
     ByteString sBCur( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
-    if( !bQuiet2 ) fprintf( stdout, "##### %s #####\n", sBCur.GetBuffer());
 
     ULONG nIndex = 0;
     ByteString sExtension( aEntry.GetExtension(), RTL_TEXTENCODING_ASCII_US );
@@ -591,9 +582,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
             sCommand += " -l ";
             sCommand += sLanguageRestriction;
         }
-        if( bQuiet2 ){
-            sCommand +=" -QQ ";
-        }
 
         DirEntry aPath( aEntry.GetPath());
         DirEntry aOldCWD;
@@ -603,7 +591,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile(
             fprintf(stderr, "%s failed\n", sCommand.GetBuffer());
         nFileCnt++;
         printf(".");
-        //if( bQuiet2 ){ printf("."); }
         SvFileStream aInStream( aOut.GetFull(), STREAM_READ );
         if ( !aInStream.IsOpen()) {
             fprintf( stderr,
@@ -794,12 +781,11 @@ void Help()
     fprintf( stdout,
         "As part of the L10N framework, localize extracts and merges translations\n"
         "out of and into the whole source tree.\n\n"
-        "Syntax: localize -e -l en-US -f FileName [-QQ]\n"
+        "Syntax: localize -e -l en-US -f FileName \n"
         "Parameter:\n"
         "\t-e: Extract mode\n"
         "\tFileName: Output file when extract mode, input file when merge mode\n"
         "\tl1...ln: supported languages (\"all\" for all languages).\n"
-        "\tQQ: quiet output)"
     );
 
     fprintf( stdout,
@@ -842,15 +828,12 @@ int _cdecl main( int argc, char *argv[] )
 
     BOOL bExport    = FALSE;
     BOOL bMerge     = FALSE;
-    bool bQuiet     = false;
-    bool bQuiet2    = false;
     bool bSkipLinks = false;
 
     ByteString sLanguages;
     ByteString sFileName;
     ByteString sOutput;
 
-    bQuiet2 = true;
     bExport = TRUE;
 
     for( int i = 1; i < argc; i++ ) {
@@ -863,17 +846,12 @@ int _cdecl main( int argc, char *argv[] )
                 return Error();
             bExport = TRUE;
         }
-        else if( sSwitch.Equals( "-Q" )) {
-            bQuiet = true;
-        }
         else if ( sSwitch.Equals( "-I" ) )
             nState = STATE_ISOCODE;
         else if ( sSwitch.Equals( "-L" ) )
             nState = STATE_LANGUAGES;
         else if ( sSwitch.Equals( "-F" ) )
             nState = STATE_FILENAME;
-        else if ( sSwitch.Equals( "-QQ" ))
-            bQuiet2 = true;
         else if ( ByteString( argv[ i ]).ToUpperAscii().Equals( "-O" ) )
             nState = STATE_OUTPUT;
         else {
@@ -956,10 +934,10 @@ int _cdecl main( int argc, char *argv[] )
         else
             curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter;
         cout << "Localizing repository " << curRepository << "\n";
-        SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bQuiet2 , bSkipLinks );
+        SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bSkipLinks );
         aIter.SetLanguageRestriction( sLanguages );
         if ( bExport ){
-            if( bQuiet2 ){ /*printf("");*/fflush( stdout );}
+            fflush( stdout );
             if( *iter == "ooo" )
                 aIter.Extract( sFileName );
             else
@@ -969,7 +947,7 @@ int _cdecl main( int argc, char *argv[] )
                 sFileNameWithExt += ByteString( (*iter).c_str() );
                 aIter.Extract( sFileNameWithExt );
             }
-            if( bQuiet2 ){ printf("\n%d files found!\n",aIter.GetFileCnt());}
+            printf("\n%d files found!\n",aIter.GetFileCnt());
         }
     }
     if( hasPwd )
@@ -977,12 +955,12 @@ int _cdecl main( int argc, char *argv[] )
         string pwd;
         Export::getCurrentDir( pwd );
         cout << "Localizing repository " << pwd << "\n";
-        SourceTreeLocalizer aIter( ByteString( pwd.c_str() ) , sVersion , (sOutput.Len() > 0) , bQuiet2 , bSkipLinks );
+        SourceTreeLocalizer aIter( ByteString( pwd.c_str() ) , sVersion , (sOutput.Len() > 0) , bSkipLinks );
         aIter.SetLanguageRestriction( sLanguages );
         if ( bExport ){
-            if( bQuiet2 ){ /*printf("");*/fflush( stdout );}
+            fflush( stdout );
             aIter.Extract( sFileName );
-            if( bQuiet2 ){ printf("\n%d files found!\n",aIter.GetFileCnt());}
+            printf("\n%d files found!\n",aIter.GetFileCnt());
         }
 
     }
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 473da8b5d511..eb2b6af78b34 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -259,10 +259,6 @@ main( int argc, char* argv[])
 	FILE *pFile;
     
 	pOutput = GetOutputFile( argc, argv );
-	if( !isQuiet() ){ 
-        fprintf( stdout, "\nTransEx 3.1 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
-	    fprintf( stdout, "=====================================================================================\n" );
-    }
 
     if ( !pOutput ) {
 		fprintf( stdout, "Syntax:TRANSEX[-p Prj][-r PrjRoot]-i FileIn...[-o FileOut][-m DataBase][-e][-b][-u][-L l1,l2,...]\n" );
@@ -301,8 +297,6 @@ main( int argc, char* argv[])
 	nRetValue = GetError();
 	EndExport();
 
-	if( !isQuiet() ) fprintf( stdout, "\n===================================\n\n" ); 
-
 	/* return error level */
 	return nRetValue;
 }
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 4770a851c741..6229525d7e84 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -180,10 +180,6 @@ main( int argc, char* argv[])
 	FILE *pFile;
 
 	pOutput = GetOutputFile( argc, argv );
-    if( !isQuiet() ){
-        fprintf( stdout, "\nXrmEx 0.9 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
-	    fprintf( stdout, "===================================================================================\n" );
-    }
 
 	if ( !pOutput ) {
 		fprintf( stdout, "Syntax: XRMEX[-p Prj][-r PrjRoot]-i FileIn [-o FileOut][-m DataBase][-e][-b][-u][-NOUTF8][-L l1,l2,...]\n" );
@@ -222,7 +218,6 @@ main( int argc, char* argv[])
 	nRetValue = GetError();
 	EndXrmExport();
 
-	if( !isQuiet() ) fprintf( stdout, "\n===================================\n\n" );
     removeTempFile();
 	/* return error level */
 	return nRetValue;
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index b77f75ea04e5..fa7fdb4b4376 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -61,7 +61,6 @@ BOOL bEnableExport;
 BOOL bMergeMode;
 BOOL bErrorLog;
 BOOL bUTF8;
-bool bQuiet;
 ByteString sPrj;
 ByteString sPrjRoot;
 ByteString sInputFileName;
@@ -87,7 +86,6 @@ extern char *GetOutputFile( int argc, char* argv[])
     sInputFileName = "";
     sActFileName = "";
     Export::sLanguages = "";
-    bQuiet = false;
     USHORT nState = STATE_NON;
     BOOL bInput = FALSE;
 
@@ -108,9 +106,6 @@ extern char *GetOutputFile( int argc, char* argv[])
         else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-M" ) {
             nState = STATE_MERGESRC; // next token specifies the merge database
         }
-        else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-QQ" ) {
-            bQuiet = true;
-        }
         else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-E" ) {
             nState = STATE_ERRORLOG;
             bErrorLog = FALSE;
@@ -199,10 +194,6 @@ int InitXrmExport( char *pOutput , char* pFilename)
     return 1;
 }
 
-int isQuiet(){
-    if( bQuiet )    return 1;
-    else            return 0;
-}
 /*****************************************************************************/
 int EndXrmExport()
 /*****************************************************************************/
@@ -252,8 +243,6 @@ extern FILE *GetXrmFile()
             // (e.g.: source\ui\src\menue.src)
             sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 );
 
-            if( !bQuiet )
-                fprintf( stdout, "\nProcessing File %s ...\n", sInputFileName.GetBuffer());
 
             sActFileName.SearchAndReplaceAll( "/", "\\" );
 
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 3475aeeca9bb..0c6ecd88e56b 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -36,6 +36,13 @@ 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
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 .IF "$(L10N_framework)"==""
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx
index 84d615fca3db..cd69ab1c5e3d 100644
--- a/o3tl/qa/test-cow_wrapper.cxx
+++ b/o3tl/qa/test-cow_wrapper.cxx
@@ -1,9 +1,11 @@
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
+#include "postextstl.h"
 
 #include "cow_wrapper_clients.hxx"
 
diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx
index fe2f78eec8af..63ec692efe5c 100644
--- a/o3tl/qa/test-heap_ptr.cxx
+++ b/o3tl/qa/test-heap_ptr.cxx
@@ -25,9 +25,11 @@
  *
  ************************************************************************/
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <o3tl/heap_ptr.hxx>
 
diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
index 31cf2aec7c10..634b04de9122 100644
--- a/o3tl/qa/test-range.cxx
+++ b/o3tl/qa/test-range.cxx
@@ -25,9 +25,11 @@
  *
  ************************************************************************/
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <o3tl/range.hxx>
 #include <vector>
diff --git a/o3tl/qa/test-vector_pool.cxx b/o3tl/qa/test-vector_pool.cxx
index 4efaebdd3414..ab301752532e 100644
--- a/o3tl/qa/test-vector_pool.cxx
+++ b/o3tl/qa/test-vector_pool.cxx
@@ -1,8 +1,10 @@
 // autogenerated file with codegen.pl
 
+#include "preextstl.h"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
+#include "postextstl.h"
 
 #include <o3tl/vector_pool.hxx>
 
diff --git a/psprint_config/prj/build.lst b/psprint_config/prj/build.lst
index b2dea37df50b..697fcf6062f0 100644
--- a/psprint_config/prj/build.lst
+++ b/psprint_config/prj/build.lst
@@ -1,4 +1,4 @@
-pc	psprint_config	: soltools afms NULL
+pc	psprint_config	: soltools AFMS:afms NULL
 pc	psprint_config							usr1	-	all	pc_mkout NULL
 pc	psprint_config\configuration			nmake   -   u	pc_conf NULL
 pc	psprint_config\configuration\ppds		nmake	-	u	pc_ppds NULL
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 158aea21b6e3..ed63510737aa 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -88,10 +88,8 @@ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
 *************************************************************************/
 void RscError::StdErr( const char * pStr )
 {
-#ifndef WIN
     if( pStr )
         fprintf( stderr, "%s", pStr );
-#endif
 }
 
 /*************************************************************************
diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx
index 89891581d9ba..0d5cc8faef0e 100644
--- a/rsc/source/parser/rscyacc.cxx
+++ b/rsc/source/parser/rscyacc.cxx
@@ -253,12 +253,8 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop )
 #ifdef UNX
 #define YYMAXDEPTH              2000
 #else
-#ifdef W30
-#define YYMAXDEPTH              300
-#else
 #define YYMAXDEPTH              800
 #endif
-#endif
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 40d589aea359..15d26318875b 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -474,10 +474,8 @@ ERRTYPE RscCompiler::Start()
 
     if( PRINTSYNTAX_FLAG & pCL->nCommands )
     {
-#ifndef W30
         pTC->WriteSyntax( stdout );
-printf( "khg\n" );
-#endif
+        printf( "khg\n" );
         return ERR_OK;
     }
 
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 9904cd20d4e7..93ecff2afe43 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -32,7 +32,7 @@
 // C and C++ Includes.
 #include <stdlib.h>
 #include <stdio.h>
-#if defined ( DOS ) || defined ( WIN ) || defined (WNT )
+#if defined (WNT )
 #include <direct.h>
 #endif
 #if defined ( OS2 ) && !defined ( GCC )
@@ -51,10 +51,6 @@
 #include <rtl/alloc.h>
 #include <rtl/memory.h>
 
-#if defined (WIN)
-#define ONLY_NEW
-#endif
-
 using namespace rtl;
 
 /****************** C o d e **********************************************/
diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk
index e06eca25a737..b28f0cbac2ab 100644
--- a/sax/qa/cppunit/makefile.mk
+++ b/sax/qa/cppunit/makefile.mk
@@ -35,6 +35,13 @@ 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
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx
index 1ea781afff95..b1881f248c0c 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -25,10 +25,12 @@
  *
  ************************************************************************/
 
+#include "preextstl.h"
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
+#include "postextstl.h"
 
 #include <rtl/ustrbuf.hxx>
 
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 07711133bf4b..dd6ba6202bbe 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -41,13 +41,7 @@
 #include "stgdir.hxx"
 #include "stgio.hxx"
 
-#if defined(W31)
-        #include <tools/svwin.h>
-    #define memcpy hmemcpy
-    #define __HUGE _huge
-#else
-    #define __HUGE
-#endif
+#define __HUGE
 
 ///////////////////////////// class StgFAT ///////////////////////////////
 
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 598295797ea6..5492759d4d36 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -520,6 +520,15 @@ public:
                           String& sOutString, Color** ppColor,
                           LanguageType eLnge = LANGUAGE_DONTKNOW );
 
+    /** Format a string according to a format code string to be scanned.
+        @return
+            <FALSE/> if format code contains an error
+            <TRUE/> else, in which case the string and color are returned.
+     */
+    BOOL GetPreviewString( const String& sFormatString, const String& sPreviewString,
+                          String& sOutString, Color** ppColor,
+                          LanguageType eLnge = LANGUAGE_DONTKNOW );
+
     /** Test whether the format code string is already present in container
         @return
             NUMBERFORMAT_ENTRY_NOT_FOUND if not found, else the format index.
diff --git a/svl/source/numbers/nbdll.cxx b/svl/source/numbers/nbdll.cxx
deleted file mode 100644
index b93eda3e7f37..000000000000
--- a/svl/source/numbers/nbdll.cxx
+++ /dev/null
@@ -1,79 +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_svl.hxx"
-
-#ifdef WIN
-#include <svwin.h>
-
-#ifndef _SYSDEP_HXX
-#include <sysdep.hxx>
-#endif
-
-// Statische DLL-Verwaltungs-Variablen
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-
-/***************************************************************************
-|*
-|*    LibMain()
-|*
-|*    Beschreibung       Initialisierungsfunktion der DLL
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-/***************************************************************************
-|*
-|*    WEP()
-|*
-|*    Beschreibung      DLL-Deinitialisierung
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index cb66a75558c2..7343a0a9c0e6 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1697,6 +1697,58 @@ BOOL SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
     return FALSE;
 }
 
+BOOL SvNumberFormatter::GetPreviewString( const String& sFormatString,
+                                          const String& sPreviewString,
+                                          String& sOutString,
+                                          Color** ppColor,
+                                          LanguageType eLnge )
+{
+    if (sFormatString.Len() == 0)               // no empty string
+        return FALSE;
+
+    xub_StrLen nCheckPos = STRING_NOTFOUND;
+    sal_uInt32 nKey;
+    if (eLnge == LANGUAGE_DONTKNOW)
+        eLnge = IniLnge;
+    ChangeIntl(eLnge);                          // switch if needed
+    eLnge = ActLnge;
+    String sTmpString = sFormatString;
+    SvNumberformat* p_Entry = new SvNumberformat( sTmpString,
+                                                  pFormatScanner,
+                                                  pStringScanner,
+                                                  nCheckPos,
+                                                  eLnge);
+    if (nCheckPos == 0)                          // String ok
+    {
+        String aNonConstPreview( sPreviewString);
+        // May have to create standard formats for this locale.
+        sal_uInt32 CLOffset = ImpGenerateCL(eLnge);
+        nKey = ImpIsEntry( p_Entry->GetFormatstring(), CLOffset, eLnge);
+        if (nKey != NUMBERFORMAT_ENTRY_NOT_FOUND)       // already present
+            GetOutputString( aNonConstPreview, nKey, sOutString, ppColor);
+        else
+        {
+            // If the format is valid but not a text format and does not
+            // include a text subformat, an empty string would result. Same as
+            // in SvNumberFormatter::GetOutputString()
+            if (p_Entry->IsTextFormat() || p_Entry->HasTextFormat())
+                p_Entry->GetOutputString( aNonConstPreview, sOutString, ppColor);
+            else
+            {
+                *ppColor = NULL;
+                sOutString = sPreviewString;
+            }
+        }
+        delete p_Entry;
+        return TRUE;
+    }
+    else
+    {
+        delete p_Entry;
+        return FALSE;
+    }
+}
+
 sal_uInt32 SvNumberFormatter::TestNewString(const String& sFormatString,
                                       LanguageType eLnge)
 {
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 707b2362f0ed..97f06171a4fc 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2057,7 +2057,7 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
             OutString = rScan.GetFalseString();
         return FALSE;
     }
-    if (eType & NUMBERFORMAT_TEXT && bStandard)
+    if (eType & NUMBERFORMAT_TEXT)
     {
         ImpGetOutputStandard(fNumber, OutString);
         return FALSE;
@@ -2086,7 +2086,9 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
                         if (!nLen)
                             return false;
 
-                        if (nLen > 11)
+                        // #i112250# With the 10-decimal limit, small numbers are formatted as "0".
+                        // Switch to scientific in that case, too:
+                        if (nLen > 11 || (OutString.EqualsAscii("0") && fNumber != 0.0))
                         {
                             sal_uInt16 nStandardPrec = rScan.GetStandardPrec();
                             nStandardPrec = ::std::min(nStandardPrec, static_cast<sal_uInt16>(14)); // limits to 14 decimals
diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index ba67d451be34..369306c22874 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -41,10 +41,6 @@
 
 #include <osl/thread.h>
 
-#if defined( WIN ) && defined( MSC )
-#pragma code_seg( "SVDDE_MISC_CODE" )
-#endif
-
 // --- DdeData::DdeData() ------------------------------------------
 
 DdeData::DdeData()
@@ -164,10 +160,10 @@ ULONG DdeData::GetExternalFormat( ULONG nFmt )
 
     default:
         {
-#if defined(WNT) || defined(WIN) || defined( PM2 )
+#if defined(WNT) || defined( PM2 )
             String aName( SotExchange::GetFormatName( nFmt ) );
 
-#if defined(WNT) || defined(WIN)
+#if defined(WNT)
 
             if( aName.Len() )
                 nFmt = RegisterClipboardFormat( reinterpret_cast<LPCWSTR>(aName.GetBuffer()) );
@@ -203,7 +199,7 @@ ULONG DdeData::GetInternalFormat( ULONG nFmt )
         break;
 
     default:
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
         if( nFmt >= CF_MAX )
         {
             TCHAR szName[ 256 ];
diff --git a/svl/source/svdde/ddedll.cxx b/svl/source/svdde/ddedll.cxx
deleted file mode 100644
index a71662dd5e63..000000000000
--- a/svl/source/svdde/ddedll.cxx
+++ /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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-#ifdef WIN
-
-
-#include <sysdep.hxx>   // included svwin.h
-
-// Statische DLL-Verwaltungs-Variablen
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-/***************************************************************************
-|*    LibMain()
-|*    Beschreibung       Initialisierungsfunktion der DLL
-***************************************************************************/
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-/***************************************************************************
-|*    WEP()
-|*    Beschreibung      DLL-Deinitialisierung
-***************************************************************************/
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx
index 4f0e2464a276..007c9f56c544 100644
--- a/svl/source/svdde/ddestrg.cxx
+++ b/svl/source/svdde/ddestrg.cxx
@@ -33,10 +33,6 @@
 #include "ddeimp.hxx"
 #include <svl/svdde.hxx>
 
-#if defined( WIN ) && defined( MSC )
-#pragma code_seg( "SVDDE_MISC_CODE" )
-#endif
-
 // --- DdeString::DdeString() --------------------------------------
 
 DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p ) :
diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/fltdefs.hxx
index 8ef3f2ab3740..86462c2faa33 100644
--- a/svtools/inc/fltdefs.hxx
+++ b/svtools/inc/fltdefs.hxx
@@ -34,7 +34,7 @@
 #define _FLTDEFS_HXX
 
 
-#if defined ( WIN ) || defined ( WNT )
+#if defined ( WNT )
 
 #define RGBQUAD RGBQUADWIN
 
@@ -53,21 +53,6 @@ typedef struct RGBQUAD
 } RGBQUAD;
 
 
-#ifdef WIN
-typedef BYTE huge* PDIBBYTE;
-#define MEMCPY hmemcpy
-#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize))))
-#define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1))))
-#define GLOBALFREE(pPointer) (GlobalUnlock(GLOBALHANDLE((pPointer))))
-#define MEMSET( pDst, cByte, nCount )   \
-{                                       \
-    PDIBBYTE pTmp = (PDIBBYTE) pDst;    \
-    for ( ULONG i = 0; i < nCount; i++ )\
-        *pTmp++ = cByte;                \
-}
-
-#else
-
 typedef BYTE* PDIBBYTE;
 #define MEMCPY memcpy
 #define MEMSET memset
@@ -75,7 +60,6 @@ typedef BYTE* PDIBBYTE;
 #define GLOBALFREE(pPointer) (GlobalFree((HGLOBAL)pPointer))
 #define GLOBALHANDLE(pPointer) ((HGLOBAL)(pPointer))
 
-#endif
 #else
 
 typedef BYTE* PDIBBYTE;
diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx
index 12a125635132..b9bfbc901848 100644
--- a/svtools/inc/rtfout.hxx
+++ b/svtools/inc/rtfout.hxx
@@ -41,7 +41,7 @@ class SvStream;
 class SVT_DLLPUBLIC RTFOutFuncs
 {
 public:
-#if defined(MAC) || defined(UNX)
+#if defined(UNX)
     static const sal_Char sNewLine;     // nur \012 oder \015
 #else
     static const sal_Char __FAR_DATA sNewLine[];    // \015\012
diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx
index 888286b231ee..1a21f1154602 100644
--- a/svtools/inc/svtools/htmlout.hxx
+++ b/svtools/inc/svtools/htmlout.hxx
@@ -60,7 +60,7 @@ struct SVT_DLLPUBLIC HTMLOutContext
 
 struct HTMLOutFuncs
 {
-#if defined(MAC) || defined(UNX)
+#if defined(UNX)
     static const sal_Char sNewLine;     // nur \012 oder \015
 #else
     static const sal_Char __FAR_DATA sNewLine[];    // \015\012
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index 9faadaff7305..1501afbb6157 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -40,11 +40,10 @@ class ImpSvtData
 public:
     SfxItemDesruptorList_Impl * pItemDesruptList;
     ResMgr *        pResMgr;
-    ResMgr *        pPatchResMgr;
 
 private:
     ImpSvtData():
-        pItemDesruptList(0), pResMgr(0), pPatchResMgr(0)
+        pItemDesruptList(0), pResMgr(0)
     {}
 
     ~ImpSvtData();
@@ -52,25 +51,12 @@ private:
 public:
     ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale);
     ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL!
-    ResMgr * GetPatchResMgr();
-    ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale);
 
     static ImpSvtData & GetSvtData();
 };
 
 //============================================================================
 
-class SvpResId: public ResId
-{
-public:
-    SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ):
-        ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {}
-
-     // VCL dependant, only available in SVT, not in SVL!
-    SvpResId( USHORT nId );
-};
-
-
 class SvtResId: public ResId
 {
 public:
diff --git a/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx
index 25deba4d091c..a4a920e692be 100644
--- a/svtools/inc/svtools/svxbox.hxx
+++ b/svtools/inc/svtools/svxbox.hxx
@@ -129,11 +129,7 @@ enum SvxComboBoxStyle
     SVX_CBS_LOWER       = 0x02,
     SVX_CBS_ALL         = 0x04,
     SVX_CBS_FILENAME    = 0x08,
-#ifdef WIN
-    SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME | SVX_CBS_LOWER
-#else
     SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME
-#endif
 };
 
 // class SvxComboBox -----------------------------------------------------
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 70d9d1623ef2..e33251050b81 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -314,8 +314,16 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
     // We need values from ALL notified configuration keys.
     DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
 
-    sal_Bool bMenuIcons = true;
-    sal_Bool bSystemMenuIcons = true;
+    sal_Bool bMenuSettingsChanged = sal_False;
+    sal_Bool bMenuIcons = sal_True;
+    sal_Bool bSystemMenuIcons = sal_True;
+    if (m_nMenuIcons == 2)
+        bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
+    else
+    {
+        bSystemMenuIcons = sal_False;
+        bMenuIcons = m_nMenuIcons ? sal_True : sal_False;
+    }
 
     // Step over list of property names and get right value from coreesponding value list to set it on internal members!
     sal_Int32 nCount = seqPropertyNames.getLength();
@@ -334,12 +342,12 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
         else if( seqPropertyNames[nProperty] == PROPERTYNAME_SHOWICONSINMENUES )
         {
             DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
-            seqValues[nProperty] >>= bMenuIcons;
+            bMenuSettingsChanged = seqValues[nProperty] >>= bMenuIcons;
         }
         else if( seqPropertyNames[nProperty] == PROPERTYNAME_SYSTEMICONSINMENUES )
         {
             DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
-            seqValues[nProperty] >>= bSystemMenuIcons;
+            bMenuSettingsChanged = seqValues[nProperty] >>= bSystemMenuIcons;
         }
 
         #if OSL_DEBUG_LEVEL > 1
@@ -347,7 +355,8 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
         #endif
     }
 
-    m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
+    if ( bMenuSettingsChanged )
+        m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
 
     for ( USHORT n=0; n<aList.Count(); n++ )
         aList.GetObject(n)->Call( this );
@@ -377,11 +386,13 @@ void SvtMenuOptions_Impl::Commit()
                                                             break;
             //Output cache of current setting as possibly modified by System Theme for older version
             case PROPERTYHANDLE_SHOWICONSINMENUES       :   {
-                                                                seqValues[nProperty] <<=(sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
+                                                                sal_Bool bValue = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
+                                                                seqValues[nProperty] <<= bValue;
                                                             }
                                                             break;
             case PROPERTYHANDLE_SYSTEMICONSINMENUES     :   {
-                                                                seqValues[nProperty] <<= (m_nMenuIcons == 2 ? sal_True : sal_False) ;
+                                                                sal_Bool bValue = (m_nMenuIcons == 2 ? sal_True : sal_False) ;
+                                                                seqValues[nProperty] <<= bValue;
                                                             }
                                                             break;
         }
diff --git a/svtools/source/contnr/ctrdll.cxx b/svtools/source/contnr/ctrdll.cxx
deleted file mode 100644
index 463c6ccc8b35..000000000000
--- a/svtools/source/contnr/ctrdll.cxx
+++ /dev/null
@@ -1,79 +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_svtools.hxx"
-
-#ifdef WIN
-#include <svwin.h>
-
-#ifndef _SYSDEP_HXX
-#include <sysdep.hxx>
-#endif
-
-// Statische DLL-Verwaltungs-Variablen
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-
-/***************************************************************************
-|*
-|*    LibMain()
-|*
-|*    Beschreibung       Initialisierungsfunktion der DLL
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-/***************************************************************************
-|*
-|*    WEP()
-|*
-|*    Beschreibung      DLL-Deinitialisierung
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
index 20bcfe0fe33a..b16cd67d12a5 100644
--- a/svtools/source/contnr/svicnvw.cxx
+++ b/svtools/source/contnr/svicnvw.cxx
@@ -550,9 +550,6 @@ void SvIconView::EditItemText( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
 
     aRect.Bottom() += 2; // sieht huebscher aus
 
-#ifdef WIN
-    aRect.Bottom() += 4;
-#endif
 #ifdef OS2
 
 #if OS2_SINGLE_LINE_EDIT
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index 2d4c9cf2df0e..d1e471953663 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.cxx
@@ -1702,11 +1702,6 @@ void SvImpIconView::PositionScrollBars( long nRealWidth, long nRealHeight )
     Point aPos( 0, nRealHeight );
     aPos.Y() -= nHorSBarHeight;
 
-#ifdef WIN
-    // vom linken und unteren Rand ein Pixel abschneiden
-    aPos.Y()++;
-    aPos.X()--;
-#endif
 #ifdef OS2
     aPos.Y()++;
 #endif
@@ -1717,7 +1712,7 @@ void SvImpIconView::PositionScrollBars( long nRealWidth, long nRealHeight )
     aPos.X() = nRealWidth; aPos.Y() = 0;
     aPos.X() -= nVerSBarWidth;
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     aPos.X()++;
     aPos.Y()--;
 #endif
@@ -1809,7 +1804,7 @@ void SvImpIconView::AdjustScrollBars()
     // size ver scrollbar
     long nThumb = aVerSBar.GetThumbPos();
     Size aSize( nVerSBarWidth, nRealHeight );
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     aSize.Height() += 2;
 #endif
 #ifdef OS2
@@ -1834,7 +1829,7 @@ void SvImpIconView::AdjustScrollBars()
     nThumb = aHorSBar.GetThumbPos();
     aSize.Width() = nRealWidth;
     aSize.Height() = nHorSBarHeight;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     aSize.Width()++;
 #endif
 #ifdef OS2
@@ -1842,7 +1837,7 @@ void SvImpIconView::AdjustScrollBars()
     if( nResult & 0x0001 ) // vertikale Scrollbar ?
         aSize.Width()--;
 #endif
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     if( nResult & 0x0001 ) // vertikale Scrollbar ?
     {
         aSize.Width()++;
@@ -1868,7 +1863,7 @@ void SvImpIconView::AdjustScrollBars()
     nRealWidth++;
 #endif
     aOutputSize.Width() = nRealWidth;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     if( nResult & 0x0002 ) // hor scrollbar ?
         nRealHeight++; // weil unterer Rand geclippt wird
 #endif
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index fb71f64772ad..a69253c69629 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -1518,6 +1518,13 @@ void SvLBox::MakeVisible( SvLBoxEntry* )
 void SvLBox::Command( const CommandEvent& i_rCommandEvent )
 {
     DBG_CHKTHIS(SvLBox,0);
+
+    if ( COMMAND_STARTDRAG == i_rCommandEvent.GetCommand() )
+    {
+        Point aEventPos( i_rCommandEvent.GetMousePosPixel() );
+        MouseEvent aMouseEvt( aEventPos, 1, MOUSE_SELECT, MOUSE_LEFT );
+        MouseButtonUp( aMouseEvt );
+    }
     Control::Command( i_rCommandEvent );
 }
 
@@ -1775,6 +1782,10 @@ void SvLBox::StartDrag( sal_Int8, const Point& rPosPixel )
 {
     DBG_CHKTHIS(SvLBox,0);
 
+    Point aEventPos( rPosPixel );
+    MouseEvent aMouseEvt( aEventPos, 1, MOUSE_SELECT, MOUSE_LEFT );
+    MouseButtonUp( aMouseEvt );
+
     nOldDragMode = GetDragDropMode();
     if ( !nOldDragMode )
         return;
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 3395dffc28f5..1b96f1ac89e4 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -139,16 +139,6 @@ void SvTreeEntryList::DestroyAll()
 }
 
 
-
-
-#if defined (WIN) && defined (MSC)
-// siehe BugId 42896: Die Funktionen Prev, PrevVisible, Next, NextVisible
-// (andere?) funktionieren nicht mit Optimierung.
-#pragma optimize ("", off)
-#endif
-
-
-
 /*************************************************************************
 |*
 |*    SvTreeList::
diff --git a/svtools/source/control/ctrldll.cxx b/svtools/source/control/ctrldll.cxx
deleted file mode 100644
index 2f3ff037be31..000000000000
--- a/svtools/source/control/ctrldll.cxx
+++ /dev/null
@@ -1,78 +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_svtools.hxx"
-
-#ifdef WIN
-#include <svwin.h>
-
-#ifndef _SYSDEP_HXX
-#include <sysdep.hxx>
-#endif
-
-// Statische DLL-Verwaltungs-Variablen
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-/***************************************************************************
-|*
-|*    LibMain()
-|*
-|*    Beschreibung       Initialisierungsfunktion der DLL
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-/***************************************************************************
-|*
-|*    WEP()
-|*
-|*    Beschreibung      DLL-Deinitialisierung
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index b0e77d658931..798ff87e02ac 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -347,7 +347,7 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn )
     if ( pBtn == pHomeBtn )
     {
         ::rtl::OUString aHomeDir;
-        NAMESPACE_VOS( OSecurity ) aSecurity;
+        vos:: OSecurity  aSecurity;
         if ( aSecurity.getHomeDir( aHomeDir ) )
         {
             DirEntry aFile ( aHomeDir );
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
index 038930ef80ee..8ca6ba2b124e 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
@@ -49,7 +49,7 @@
 #include <unotools/syslocale.hxx>
 #include "vcl/svapp.hxx"
 
-#if defined WIN || (defined OS2 && !defined ICC)
+#if (defined OS2 && !defined ICC)
 #define EXPDLG_FUNCTION_NAME    "_DoExportDialog"
 #else
 #define EXPDLG_FUNCTION_NAME    "DoExportDialog"
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index c8a79d3a35cd..db1f4c11cf94 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -79,7 +79,7 @@
 
 #define PMGCHUNG_msOG       0x6d734f47      // Microsoft Office Animated GIF
 
-#if defined WIN || (defined OS2 && !defined ICC)
+#if (defined OS2 && !defined ICC)
 
 #define IMPORT_FUNCTION_NAME    "_GraphicImport"
 #define EXPORT_FUNCTION_NAME    "_GraphicExport"
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx
index de2bef64ba6e..6abab2626516 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter.vcl/filter/filter2.cxx
@@ -1201,7 +1201,7 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL )
         nFormat = GFF_PCT;
     else
     {
-        BYTE sBuf[4];
+        BYTE sBuf[3]={0};
 
         rStm.Seek( nStmPos + 522 );
         rStm.Read( sBuf, 3 );
diff --git a/svtools/source/filter.vcl/filter/fldll.cxx b/svtools/source/filter.vcl/filter/fldll.cxx
deleted file mode 100644
index b44e08835f34..000000000000
--- a/svtools/source/filter.vcl/filter/fldll.cxx
+++ /dev/null
@@ -1,76 +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_svtools.hxx"
-
-#ifdef WIN
-#include <svwin.h>
-
-// Statische DLL-Verwaltungs-Variablen
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-
-/***************************************************************************
-|*
-|*    LibMain()
-|*
-|*    Beschreibung       Initialisierungsfunktion der DLL
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-/***************************************************************************
-|*
-|*    WEP()
-|*
-|*    Beschreibung      DLL-Deinitialisierung
-|*    Ersterstellung     TH 05.05.93
-|*    Letzte Aenderung   TH 05.05.93
-|*
-***************************************************************************/
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx
index 43cf0fbbacd3..3d1a71f5a2db 100644
--- a/svtools/source/filter.vcl/filter/sgfbram.cxx
+++ b/svtools/source/filter.vcl/filter/sgfbram.cxx
@@ -37,10 +37,6 @@
 #include "sgffilt.hxx"
 #include "sgfbram.hxx"
 
-#if defined( WIN ) && defined( MSC )
-#pragma code_seg( "SVTOOLS_FILTER4", "SVTOOLS_CODE" )
-#endif
-
 /*************************************************************************
 |*
 |*    operator>>( SvStream&, SgfHeader& )
diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx
index e175380244b3..293c6dab7964 100644
--- a/svtools/source/filter.vcl/filter/sgvmain.cxx
+++ b/svtools/source/filter.vcl/filter/sgvmain.cxx
@@ -110,20 +110,11 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#if defined( WIN ) && defined( MSC )
-#pragma code_seg( "svtools", "AUTO_CODE" )
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Fuer Fontuebersetzung ///////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 SgfFontLst* pSgfFonts = 0;
 
-#if defined( WIN ) && defined( MSC )
-#pragma code_seg( "SVTOOLS_FILTER3", "SVTOOLS_CODE" )
-static void AntiMscBug() {}
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Fuer Kreisunterarten, Text und gedrehte Rechtecke ///////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1137,7 +1128,3 @@ for n:=0 to 63 do
 end;
 */
 
-#if defined( WIN ) && defined( MSC )
-#pragma code_seg( "svtools", "AUTO_CODE" )
-#endif
-
diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx
index 7a23e85f4dbe..d695e171a194 100644
--- a/svtools/source/filter.vcl/filter/sgvspln.cxx
+++ b/svtools/source/filter.vcl/filter/sgvspln.cxx
@@ -33,11 +33,6 @@
 
 #include <tools/poly.hxx>
 
-#if defined( WIN ) && defined( MSC )
-#pragma code_seg( "SVTOOLS_FILTER2", "SVTOOLS_CODE" )
-#pragma optimize( "", off )
-#endif
-
 #if defined( PM2 ) && defined( __BORLANDC__ )
 #pragma option -Od
 #endif
diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx
index 4a0be80b55be..9a82cd486599 100644
--- a/svtools/source/filter.vcl/filter/sgvtext.cxx
+++ b/svtools/source/filter.vcl/filter/sgvtext.cxx
@@ -38,10 +38,6 @@
 
 extern SgfFontLst* pSgfFonts;
 
-#if defined( WIN ) && defined( MSC )
-#pragma code_seg( "SVTOOLS_FILTER1", "SVTOOLS_CODE" )
-#endif
-
 #ifndef abs
 #define abs(x) ((x)<0 ? -(x) : (x))
 #endif
@@ -621,7 +617,7 @@ USHORT SetTextContext(OutputDevice& rOut, ObjTextType& Atr, BOOL Kapt, USHORT Dr
         switch (Atr.GetFont()) {
           case 92500: case 92501: case 92504: case 92505:
           {
-#if defined(WIN) || defined(WNT) || defined(PM2)
+#if defined(WNT) || defined(PM2)
               FNam=String::CreateFromAscii( "Times New Roman" );  // CG Times ist unter Windows und OS/2 Times New Roman
 #else
               FNam=String::CreateFromAscii( "Times" );            // ansonsten ist das einfach Times
@@ -630,7 +626,7 @@ USHORT SetTextContext(OutputDevice& rOut, ObjTextType& Atr, BOOL Kapt, USHORT Dr
               aFont.SetFamily(FAMILY_ROMAN);
           } break;
           case 94021: case 94022: case 94023: case 94024: {
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
               FNam=String::CreateFromAscii( "Arial", 5 );            // Univers ist unter Windows Arial
 #else
               FNam=String::CreateFromAscii( "Helvetica" );        // und ansonsten Helvetica
@@ -639,7 +635,7 @@ USHORT SetTextContext(OutputDevice& rOut, ObjTextType& Atr, BOOL Kapt, USHORT Dr
               StdBrei=47;
           } break;
           case 93950: case 93951: case 93952: case 93953: {
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
               FNam=String::CreateFromAscii( "Courier New" );      // Der Vector-Courierfont unter Windows heisst Courier New
 #else
               FNam=String::CreateFromAscii( "Courier" );          // ansonsten ist und bleibt Courier immer Courier
diff --git a/svtools/source/filter.vcl/jpeg/jpeg.h b/svtools/source/filter.vcl/jpeg/jpeg.h
index deb06600474c..82a2f80a838c 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.h
+++ b/svtools/source/filter.vcl/jpeg/jpeg.h
@@ -51,11 +51,7 @@ struct JPEGCreateBitmapParam
 
 typedef struct my_error_mgr*    my_error_ptr;
 typedef unsigned char           BYTE;
-#ifdef WIN
-typedef unsigned char _huge*    HPBYTE;
-#else
 typedef unsigned char*          HPBYTE;
-#endif
 
 void*   JPEGMalloc( size_t size );
 void    JPEGFree( void *ptr );
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index f7c4f51ce1e2..cea1ab490b04 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.cxx
@@ -1081,6 +1081,8 @@ void WMFReader::ReadWMF()
     nEMFRec         = 0;
     nEMFSize        = 0;
 
+    sal_Bool bEMFAvailable = sal_False;
+
     pOut->SetMapMode( MM_ANISOTROPIC );
     pOut->SetWinOrg( Point() );
     pOut->SetWinExt( Size( 1, 1 ) );
@@ -1117,50 +1119,53 @@ void WMFReader::ReadWMF()
 
                     break;
                 }
-                if( aBmpSaveList.Count() &&
-                    ( nFunction != W_META_STRETCHDIB ) &&
-                    ( nFunction != W_META_DIBBITBLT ) &&
-                    ( nFunction != W_META_DIBSTRETCHBLT ) )
-                {
-                    pOut->ResolveBitmapActions( aBmpSaveList );
-                }
-                if ( !nSkipActions )
-                    ReadRecordParams( nFunction );
-                else
-                    nSkipActions--;
-
-                if( pEMFStream && nEMFRecCount == nEMFRec )
+                if ( !bEMFAvailable )
                 {
-                    GDIMetaFile aMeta;
-                    pEMFStream->Seek( 0 );
-                    EnhWMFReader* pEMFReader = new EnhWMFReader ( *pEMFStream, aMeta );
-                    BOOL bRead = pEMFReader->ReadEnhWMF();
-                    delete pEMFReader; // destroy first!!!
-
-                    if( bRead )
+                    if( aBmpSaveList.Count() &&
+                        ( nFunction != W_META_STRETCHDIB ) &&
+                        ( nFunction != W_META_DIBBITBLT ) &&
+                        ( nFunction != W_META_DIBSTRETCHBLT ) )
                     {
-                       pOut->AddFromGDIMetaFile( aMeta );
-                       pOut->SetrclFrame( Rectangle(0, 0, aMeta.GetPrefSize().Width(), aMeta.GetPrefSize().Height() ));
-                       // we have successfully read the embedded EMF data
-                       // no need to process WMF data further
-                       break;
+                        pOut->ResolveBitmapActions( aBmpSaveList );
                     }
+                    if ( !nSkipActions )
+                        ReadRecordParams( nFunction );
                     else
+                        nSkipActions--;
+
+                    if( pEMFStream && nEMFRecCount == nEMFRec )
                     {
-                        // something went wrong
-                        // continue with WMF, don't try this again
-                        delete pEMFStream;
-                        pEMFStream = NULL;
-                    }
+                        GDIMetaFile aMeta;
+                        pEMFStream->Seek( 0 );
+                        EnhWMFReader* pEMFReader = new EnhWMFReader ( *pEMFStream, aMeta );
+                        bEMFAvailable = pEMFReader->ReadEnhWMF();
+                        delete pEMFReader; // destroy first!!!
 
+                        if( bEMFAvailable )
+                        {
+                            pOut->AddFromGDIMetaFile( aMeta );
+                            pOut->SetrclFrame( Rectangle(0, 0, aMeta.GetPrefSize().Width(), aMeta.GetPrefSize().Height() ));
+
+                            // the stream needs to be set to the wmf end position,
+                            // otherwise the GfxLink that is created will be incorrect
+                            // (leading to graphic loss after swapout/swapin).
+                            // so we will proceed normally, but are ignoring further wmf
+                            // records
+                        }
+                        else
+                        {
+                            // something went wrong
+                            // continue with WMF, don't try this again
+                            delete pEMFStream;
+                            pEMFStream = NULL;
+                        }
+                    }
                 }
-
                 nPos += nRecSize * 2;
                 if ( nPos <= nEndPos )
                     pWMF->Seek( nPos  );
                 else
                     pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
-
             }
         }
         else
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index ec34ed07f25d..dc01de750b06 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -147,24 +147,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
            // No suitable JRE found
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bJavaNotFound_Handled = true;
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idWBX = SvtResId(WARNINGBOX_JAVANOTFOUND);
-            SvpResId pidPatchWBX(WARNINGBOX_JAVANOTFOUND);
-            pidPatchWBX.SetRT(RSC_WARNINGBOX);
-            ResMgr *pMgrWB = pidPatchWBX.GetResMgr();
-            if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX))
-                idWBX = pidPatchWBX;
-            WarningBox aWarningBox( NULL, idWBX);
-
-            String aTitle;
-            SvpResId pidString(STR_WARNING_JAVANOTFOUND);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND ));
+            WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) );
+            String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) );
 
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
@@ -182,24 +166,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
            // javavendors.xml was updated and Java has not been configured yet
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bInvalidSettings_Handled = true;
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idWBX = SvtResId(WARNINGBOX_INVALIDJAVASETTINGS);
-            SvpResId pidPatchWBX(WARNINGBOX_INVALIDJAVASETTINGS);
-            pidPatchWBX.SetRT(RSC_WARNINGBOX);
-            ResMgr *pMgrWB = pidPatchWBX.GetResMgr();
-            if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX))
-                idWBX = pidPatchWBX;
-            WarningBox aWarningBox( NULL, idWBX);
-
-            String aTitle;
-            SvpResId pidString(STR_WARNING_INVALIDJAVASETTINGS);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
+            WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
+            String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
 
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
@@ -216,27 +184,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bJavaDisabled_Handled = true;
             // Java disabled. Give user a chance to enable Java inside Office.
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idQBX = SvtResId( QBX_JAVADISABLED );
-            SvpResId pidPatchQBX(QBX_JAVADISABLED);
-            pidPatchQBX.SetRT(RSC_QUERYBOX);
-            ResMgr *pMgrQB = pidPatchQBX.GetResMgr();
-
-            if (pMgrQB && pMgrQB->IsAvailable(pidPatchQBX))
-                idQBX = pidPatchQBX;
-
-            QueryBox aQueryBox(NULL, idQBX);
-
-            String aTitle;
-
-            SvpResId pidString(STR_QUESTION_JAVADISABLED);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED ));
+            QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) );
+            String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) );
 
             aQueryBox.SetText( aTitle );
             nResult = aQueryBox.Execute();
@@ -260,24 +209,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             // Java not correctly installed, or damaged
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bVMCreationFailure_Handled = true;
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idEBX = SvtResId(ERRORBOX_JVMCREATIONFAILED);
-            SvpResId pidPatchEBX(ERRORBOX_JVMCREATIONFAILED);
-            pidPatchEBX.SetRT(RSC_ERRORBOX);
-            ResMgr *pMgrEB = pidPatchEBX.GetResMgr();
-            if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX))
-                idEBX = pidPatchEBX;
-            ErrorBox aErrorBox( NULL, idEBX);
-
-            String aTitle;
-            SvpResId pidString(STR_ERROR_JVMCREATIONFAILED);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED));
+            ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) );
+            String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) );
 
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
@@ -295,24 +228,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             //before it can be used.
             vos::OGuard aSolarGuard( Application::GetSolarMutex() );
             m_bRestartRequired_Handled = true;
-            //We first try to get the patch resource svp680xxx.res
-            //If the resource is not found then svt680xxx.res is used
-            ResId idEBX = SvtResId(ERRORBOX_RESTARTREQUIRED);
-            SvpResId pidPatchEBX(ERRORBOX_RESTARTREQUIRED);
-            pidPatchEBX.SetRT(RSC_ERRORBOX);
-            ResMgr *pMgrEB = pidPatchEBX.GetResMgr();
-            if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX))
-                idEBX = pidPatchEBX;
-            ErrorBox aErrorBox(NULL, idEBX);
-
-            String aTitle;
-            SvpResId pidString(STR_ERROR_RESTARTREQUIRED);
-            pidString.SetRT(RSC_STRING);
-            ResMgr *pmgr = pidString.GetResMgr();
-            if ( pmgr && pmgr->IsAvailable(pidString))
-                aTitle = String(pidString);
-            else
-                aTitle = String( SvtResId(STR_ERROR_RESTARTREQUIRED));
+            ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) );
+            String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) );
 
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index bf9e87d33a74..8834f5497e5a 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -64,7 +64,7 @@ static USHORT aWndFunc(
 
 
 {
-    NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() );
+    vos:: OGuard  aGuard( Application::GetSolarMutex() );
 
     // aus den Flags die benoetigten WinBits ermitteln
     WinBits eBits=0;
@@ -377,7 +377,7 @@ BOOL SfxErrorHandler::GetErrorString(
     */
 
 {
-    NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() );
+    vos:: OGuard  aGuard( Application::GetSolarMutex() );
 
     BOOL bRet = FALSE;
     rStr=String(SvtResId(RID_ERRHDL_CLASS));
@@ -454,7 +454,7 @@ BOOL SfxErrorContext::GetString(ULONG nErrId, String &rStr)
     }
     if( pMgr )
     {
-        NAMESPACE_VOS( OGuard ) aGuard( Application::GetSolarMutex() );
+        vos:: OGuard  aGuard( Application::GetSolarMutex() );
 
         ResId aResId( nResId, *pMgr );
 
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 25f23e2ef00b..4378e0acd234 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -57,10 +57,6 @@ UINT16 IMapObject::nActualTextEncoding = (UINT16) RTL_TEXTENCODING_DONTKNOW;
 /******************************************************************************/
 
 
-#ifdef WIN
-#pragma optimize ( "", off )
-#endif
-
 IMapObject::IMapObject()
     : bActive( false )
     , nReadVersion( 0 )
@@ -1224,9 +1220,3 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
     rIStm.SetNumberFormatInt( nOldFormat );
 }
 
-
-#ifdef WIN
-#pragma optimize ( "", on )
-#endif
-
-
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 9834fe0fcb76..587a31d4f098 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -28,9 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifdef WIN
-#include <sysdep.hxx>
-#endif
 #include <string.h>
 // #include <math.h>
 #include <vcl/svapp.hxx>
@@ -48,9 +45,6 @@
 #include <svtools/imapcirc.hxx>
 #include <svtools/imappoly.hxx>
 
-#ifdef WIN
-#include <sysdep.hxx>
-#endif
 #include <string.h>
 #include <math.h>
 
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 65715f635883..7a04b3276c9f 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.cxx
@@ -61,25 +61,6 @@ ResMgr * ImpSvtData::GetResMgr()
     return GetResMgr(Application::GetSettings().GetUILocale());
 }
 
-ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale)
-{
-    if (!pPatchResMgr)
-    {
-        pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale);
-    }
-    return pPatchResMgr;
-}
-
-ResMgr * ImpSvtData::GetPatchResMgr()
-{
-    return GetPatchResMgr(Application::GetSettings().GetUILocale());
-}
-
-SvpResId::SvpResId( USHORT nId ) :
-    ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() )
-{
-}
-
 //============================================================================
 // static
 ImpSvtData & ImpSvtData::GetSvtData()
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index 62753a36136d..bb1c35078055 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx
@@ -58,7 +58,7 @@ class TOOLKIT_DLLPUBLIC VCLXDevice :    public ::com::sun::star::awt::XDevice,
     friend class VCLXGraphics;
 
 private:
-    NAMESPACE_VOS(IMutex)&  mrMutex;    // Reference to SolarMutex
+    vos::IMutex&    mrMutex;    // Reference to SolarMutex
     OutputDevice*           mpOutputDevice;
 
 public:
@@ -66,7 +66,7 @@ public:
     sal_uInt32              nFlags;
 
 protected:
-    NAMESPACE_VOS(IMutex)&  GetMutex() { return mrMutex; }
+    vos::IMutex&    GetMutex() { return mrMutex; }
     void                    DestroyOutputDevice();
 
 public:
diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
index 5fda9ac947ee..6a076a5339b8 100644
--- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx
+++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
@@ -60,7 +60,7 @@ class VCLXGraphics :    public ::com::sun::star::awt::XGraphics,
                         public ::cppu::OWeakObject
 {
 private:
-    NAMESPACE_VOS(IMutex)&  mrMutex;    // Reference to SolarMutex
+    vos::IMutex&    mrMutex;    // Reference to SolarMutex
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben
 
     OutputDevice*   mpOutputDevice;
@@ -73,7 +73,7 @@ private:
     Region*         mpClipRegion;
 
 protected:
-    NAMESPACE_VOS(IMutex)&  GetMutex() { return mrMutex; }
+    vos::IMutex&    GetMutex() { return mrMutex; }
 
 public:
                     VCLXGraphics();
diff --git a/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx
index 5ca6ec83d330..b944a74b65d2 100644
--- a/toolkit/inc/toolkit/helper/throbberimpl.hxx
+++ b/toolkit/inc/toolkit/helper/throbberimpl.hxx
@@ -43,7 +43,7 @@ namespace toolkit
     class Throbber_Impl
     {
     private:
-        NAMESPACE_VOS(IMutex)&  mrMutex;    // Reference to SolarMutex
+        vos::IMutex&    mrMutex;    // Reference to SolarMutex
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > maImageList;
         ::com::sun::star::uno::Reference< VCLXWindow > mxParent;
 
@@ -55,7 +55,7 @@ namespace toolkit
 
         DECL_LINK( TimeOutHdl, Throbber_Impl* );
 
-        NAMESPACE_VOS(IMutex)&  GetMutex() { return mrMutex; }
+        vos::IMutex&    GetMutex() { return mrMutex; }
 
     public:
              Throbber_Impl( ::com::sun::star::uno::Reference< VCLXWindow > xParent,
diff --git a/toolkit/qa/unoapi/knownissues.xcl b/toolkit/qa/unoapi/knownissues.xcl
index 429d7693c833..7f8896a35597 100644
--- a/toolkit/qa/unoapi/knownissues.xcl
+++ b/toolkit/qa/unoapi/knownissues.xcl
@@ -241,9 +241,6 @@ toolkit.AccessibleMenu::com::sun::star::accessibility::XAccessibleValue
 toolkit.AccessibleMenuBar::com::sun::star::accessibility::XAccessibleEventBroadcaster
 toolkit.AccessibleMenuBar::com::sun::star::accessibility::XAccessibleSelection
 
-### i111076 ###
-toolkit.Toolkit::com::sun::star::awt::XDataTransferProviderAccess
-
 ### i111113 ###
 toolkit.AccessibleStatusBarItem::com::sun::star::accessibility::XAccessibleComponent
 toolkit.AccessibleStatusBarItem::com::sun::star::accessibility::XAccessibleContext
diff --git a/toolkit/qa/unoapi/toolkit.sce b/toolkit/qa/unoapi/toolkit.sce
index 5a148feee573..00af010d23d6 100644
--- a/toolkit/qa/unoapi/toolkit.sce
+++ b/toolkit/qa/unoapi/toolkit.sce
@@ -8,10 +8,10 @@
 #i86110 -o toolkit.AccessibleList
 #i86110 -o toolkit.AccessibleListBox
 #i86110 -o toolkit.AccessibleListItem
-#i111047# -o toolkit.AccessibleMenu
-#i111047# -o toolkit.AccessibleMenuBar
+-o toolkit.AccessibleMenu
+-o toolkit.AccessibleMenuBar
 #i86009 -o toolkit.AccessibleMenuItem
-#i111047# -o toolkit.AccessibleMenuSeparator
+-o toolkit.AccessibleMenuSeparator
 #i52607 -o toolkit.AccessiblePopupMenu
 #i86107,i86110 -o toolkit.AccessibleRadioButton
 -o toolkit.AccessibleScrollBar
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index bfbdb531e8d2..edaf64799d43 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -109,7 +109,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
 {
     if(mpOutputDevice)
     {
-        NAMESPACE_VOS(OGuard) aVclGuard( Application::GetSolarMutex()  );
+        vos::OGuard aVclGuard( Application::GetSolarMutex()  );
 
         if ( nFlags & INITOUTDEV_FONT )
         {
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index f85e29c21099..1af422bf7f00 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -659,7 +659,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
 
     if ( nType )
     {
-        NAMESPACE_VOS(OGuard) aVclGuard( Application::GetSolarMutex()  );
+        vos::OGuard aVclGuard( Application::GetSolarMutex()  );
         switch ( (WindowType)nType )
         {
             case WINDOW_CANCELBUTTON:
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index daea557d241a..3572607772dc 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -93,7 +93,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
     // create system parent data
     SystemParentData aSysParentData;
     aSysParentData.nSize = sizeof ( SystemParentData );
-#if defined( WIN ) || defined( WNT ) || defined ( OS2 )
+#if defined( WNT ) || defined ( OS2 )
     aSysParentData.hWnd = (HWND) nHandle;
 #elif defined( QUARTZ )
     aSysParentData.pView = reinterpret_cast<NSView*>(nHandle);
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index eb45dd521d9a..075080906900 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -653,7 +653,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
         // #82300# - 2000-12-21 - fs@openoffice.org
         if (bNeedNewPeer && xParent.is())
         {
-            NAMESPACE_VOS(OGuard) aVclGuard( Application::GetSolarMutex() );
+            vos::OGuard aVclGuard( Application::GetSolarMutex() );
                 // and now this is the final withdrawal:
                 // With 83561, I have no other idea than locking the SolarMutex here ....
                 // I really hate the fact that VCL is not theadsafe ....
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 2d7664b8b69f..994418bae4b5 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -264,7 +264,7 @@ private:
 
     static Link aDBNotFoundHdl;
 protected:
-    NAMESPACE_VOS( OMutex ) aMutex;
+    vos:: OMutex  aMutex;
 
     USHORT          nStarMode;
     SolarFileList   aFileList;
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index e6678e071f28..9228715b8da7 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -39,15 +39,8 @@
 class ImplPolygonData
 {
 public:
-#ifdef WIN
-    Point huge*     mpPointAry;
-    BYTE*           mpFlagAry;
-    GLOBALHANDLE    mhPoints;
-#else
     Point*          mpPointAry;
     BYTE*           mpFlagAry;
-#endif
-
     USHORT          mnPoints;
     ULONG           mnRefCount;
 };
diff --git a/tools/inc/tools/agapi.hxx b/tools/inc/tools/agapi.hxx
deleted file mode 100644
index 9c71bd35c6cc..000000000000
--- a/tools/inc/tools/agapi.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 _AGAPI_HXX
-#define _AGAPI_HXX
-
-#include <tools/solar.h>
-
-class INetURLObject;
-class ChannelList;
-class AgentItem;
-class String;
-
-class AgentApi
-{
-protected:
-    friend class ChannelList;
-
-    AgentItem*          pChannelAgent;
-    virtual BOOL        StartAgent() = 0;
-
-    AgentApi(AgentItem* pAgent) { pChannelAgent = pAgent; }
-
-public:
-    virtual ~AgentApi() {}
-
-    virtual void    InitAgent() = 0;
-    virtual void    ShutDownAgent() = 0;
-
-    virtual BOOL    NewDataPermission(const String& rChannelName) = 0;
-    virtual void    NewData(const String& rChannelName,
-                        const INetURLObject& rURL) = 0;
-    virtual void    NotifyChannelObjFile(const INetURLObject& rURL,
-                        const String& rFileName) = 0;
-    virtual void    NotifyChannelObjData(const INetURLObject& rURL,
-                        void* pBuffer, long nOffset, long nLen, long nTotalLen) = 0;
-
-    virtual void    RegisterChannels() = 0;
-    virtual void    RegisterUpdateTransmitter() = 0;
-};
-
-#endif //_AGAPI_HXX
-
diff --git a/tools/inc/tools/agitem.hxx b/tools/inc/tools/agitem.hxx
deleted file mode 100644
index 3177bdffa0a8..000000000000
--- a/tools/inc/tools/agitem.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 _AGITEM_HXX
-#define _AGITEM_HXX
-
-#include <tools/solar.h>
-
-class String;
-class INetURLObject;
-class AgentApi;
-class ChApi;
-
-class AgentItem
-{
-public:
-    virtual const String&           GetChAgentName() const = 0;
-    virtual const INetURLObject&    GetLocation() const = 0;
-    virtual AgentApi*               GetApi() const = 0;
-    virtual ChApi*                  GetChApi() const = 0;
-
-    virtual void                    SetIsActive(BOOL bNew) = 0;
-    virtual BOOL                    IsActive() const = 0;
-};
-
-#endif //_AGITEM_HXX
-
diff --git a/tools/inc/tools/chapi.hxx b/tools/inc/tools/chapi.hxx
deleted file mode 100644
index 0acfe4cb2ca5..000000000000
--- a/tools/inc/tools/chapi.hxx
+++ /dev/null
@@ -1,68 +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 _CHAPI_HXX
-#define _CHAPI_HXX
-
-#include <tools/solar.h>
-
-class ChannelAgentItem;
-class INetURLObject;
-class String;
-
-enum RequestType {
-    REQTYP_LOCAL_FILE   = 1,
-    REQTYP_MEMORY       = 2
-};
-
-class ChApi
-{
-public:
-    virtual ~ChApi() {}
-
-    virtual void    ShutDownAgent() = 0;
-    virtual void    SetLastSuccUpd() = 0;
-
-    virtual void    GetChannelObject( const INetURLObject& rURL, RequestType eStreamType,
-                            const String& rFileName ) = 0;
-    virtual void    AddChannelItem( const String& aChName, const INetURLObject& aTransmitter,
-                            const String& aChannel, USHORT nUpdPeriode,
-                            const String& rChAgentName ) = 0;
-    virtual void    DelChannelItem( const String& aChName ) = 0;
-    virtual void    SetChTransmitter( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChannel( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChannelName( const String& aChName, const String& rNewVal ) = 0;
-    virtual void    SetChUpdPeriode( const String& aChName, USHORT nUpdPeriode ) = 0;
-    virtual void    SetChannelAgentName( const String& aChName, const String& rNewVal ) = 0;
-
-    virtual void    SetUpdateTransmitter(ChannelAgentItem* pAgent, const INetURLObject& rTransmitter) = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//
-
-#endif //_CHAPI_HXX
diff --git a/tools/inc/tools/download.hxx b/tools/inc/tools/download.hxx
deleted file mode 100644
index b187433927cd..000000000000
--- a/tools/inc/tools/download.hxx
+++ /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.
- *
- ************************************************************************/
-
-#ifndef _DOWNLOAD_HXX
-#define _DOWNLOAD_HXX
-
-// Forward declarations
-class String;
-class Link;
-
-#define DOWNLOAD_SUCCESS    0
-#define DOWNLOAD_CONNECT    1
-#define DOWNLOAD_LOCATION   2
-#define DOWNLOAD_ABORT      3
-#define DOWNLOAD_FILEACCESS 4
-#define DOWNLOAD_INSTALL    5
-#define DOWNLOAD_ERROR      6
-
-class Downloader
-/* ***************************************************************************
-Purpose: Abstract base class for a file downloader
-*************************************************************************** */
-{
-public:
-    Downloader() {};
-
-    virtual void Download(const String &rDestLocation,
-                          const String &rSourceLocation,
-                          const Link &rFinishedLink) = 0;
-};
-
-#endif
diff --git a/tools/inc/tools/eacopier.hxx b/tools/inc/tools/eacopier.hxx
deleted file mode 100644
index c80eeb0d35cc..000000000000
--- a/tools/inc/tools/eacopier.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 _EACOPIER_HXX
-#define _EACOPIER_HXX
-
-#include <tools/solar.h>
-
-class SvFileStream;
-
-class EA_Copier
-{
-    static EA_Copier*   _pCopier;
-
-public:
-    static void         Register( EA_Copier* pCopier );
-    static EA_Copier*   Get();
-
-    virtual             ~EA_Copier();
-    virtual BOOL        Copy( const SvFileStream& rFrom, const SvFileStream& rTo ) const = 0;
-};
-
-#endif
-
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 880768c89d8c..5ef51803734b 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -159,21 +159,10 @@ enum FSysExact
 // - Char-Set -
 // ------------
 
-#if defined(WIN) || defined(W30)
-
-// MS-Windows has different char-sets for file-system and user-interface
-String Gui2FSys( const String& rStr );
-String FSys2Gui( const String& rStr );
-#define GUI2FSYS(s) Gui2FSys( s )
-#define FSYS2GUI(s) FSys2Gui( s )
-
-#else
-
-// all other OS have the same char-set for both
+// Was different for WIN, no longer needed...
 #define GUI2FSYS(s) s
 #define FSYS2GUI(s) s
 
-#endif
 
 // ------------
 // - FileStat -
diff --git a/tools/inc/tools/postextstl.h b/tools/inc/tools/postextstl.h
deleted file mode 100644
index 81a21e25c15b..000000000000
--- a/tools/inc/tools/postextstl.h
+++ /dev/null
@@ -1,36 +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.
- *
- ************************************************************************/
-
-#ifdef std_was_redefined_as_stlport
-//  put things back the way they were
-#   define std std_was_redefined_as_stlport
-#   undef _STLP_OUTERMOST_HEADER_ID
-//  force config to be re-read
-#   undef _STLP_NOTHROW_INHERENTLY
-#   undef _STLP_CONFIG_H
-#   include <stddef.h>
-#endif
diff --git a/tools/inc/tools/preextstl.h b/tools/inc/tools/preextstl.h
deleted file mode 100644
index 27aed38686f0..000000000000
--- a/tools/inc/tools/preextstl.h
+++ /dev/null
@@ -1,71 +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.
- *
- ************************************************************************/
-//1. Force inclusion of a std:: using header to ensure the stlport define
-//of std as "stlport"
-#include <algorithm>
-#if defined(ADAPT_EXT_STL)
-//2. Force inclusion of stlport headers to get their stlport:: definitions
-#   include <ostream>
-#   include <istream>
-#   include <fstream>
-#   include <iostream>
-#   include <vector>
-#   include <list>
-#   include <map>
-//3. Now force inclusion of native headers to get their std:: definitions
-#   if defined(std)
-#       define std_was_redefined_as_stlport std
-#       undef std
-#       define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
-#       if defined(_GNUC__)
-#           pragma GCC visibility push(default)
-#       endif
-#       include _STLP_NATIVE_HEADER(exception_defines.h)
-#       include _STLP_NATIVE_HEADER(limits)
-#       include _STLP_NATIVE_HEADER(memory)
-#       include _STLP_NATIVE_HEADER(exception)
-#       include _STLP_NATIVE_HEADER(iosfwd)
-#       include _STLP_NATIVE_HEADER(algorithm)
-#       include _STLP_NATIVE_HEADER(string)
-#       include _STLP_NATIVE_HEADER(streambuf)
-#       include _STLP_NATIVE_HEADER(ios)
-#       include _STLP_NATIVE_HEADER(locale)
-#       include _STLP_NATIVE_HEADER(stdexcept)
-#       include _STLP_NATIVE_HEADER(ostream)
-#       include _STLP_NATIVE_HEADER(istream)
-#       include _STLP_NATIVE_HEADER(iostream)
-#       include _STLP_NATIVE_HEADER(vector)
-#       include _STLP_NATIVE_HEADER(list)
-#       include _STLP_NATIVE_HEADER(map)
-#       if defined(_GNUC__)
-#           pragma GCC visibility pop
-#       endif
-#   endif
-#endif
-//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
-//against regardless of whether that is stlport or system stl
-namespace ext_std = std;
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index 0d14385e5f08..2575ccae8f3e 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -60,16 +60,7 @@ public:
 };
 
 /************************** S v R t t i B a s e **************************/
-/*
-#if defined (DOS) && defined (STC)
-#ifdef WIN
-#error Fuer Win muss der Kram virtual sein (MM/MH)
-#endif
-class SvRttiBase : public SvRefBase
-#else
-class SvRttiBase : virtual public SvRefBase
-#endif
-*/
+
 class TOOLS_DLLPUBLIC SvRttiBase : public SvRefBase
 {
 public:
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index c16fe41abc0b..6b8f31147f96 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -46,7 +46,7 @@ class InternalResMgr;
 class TOOLS_DLLPUBLIC SimpleResMgr
 {
 protected:
-    NAMESPACE_VOS(OMutex)   m_aAccessSafety;
+    vos::OMutex m_aAccessSafety;
     InternalResMgr*         m_pResImpl;
 
 public:
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 096d34d05b9e..cc7c189fbf84 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -275,42 +275,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 
 /* dll file extensions *******************************************************/
 
-/* many of these platforms are historic */
-#define SYSTEM_WINMSCI       1
-#define SYSTEM_WNTMSCI       2
-#define SYSTEM_WNTMSCA       3
-#define SYSTEM_WNTMSCP       4
-#define SYSTEM_WNTMSCM       5
-#define SYSTEM_OS2BLCI       6
-#define SYSTEM_OS2ICCI       7
-#define SYSTEM_OS2ICCI3      8
-#define SYSTEM_UNXLNXI       9
-#define SYSTEM_UNXSOLS      10
-#define SYSTEM_UNXBSDI      11
-#define SYSTEM_UNXBSDA      12
-#define SYSTEM_UNXSCOI      13
-#define SYSTEM_UNXAIXP      14
-#define SYSTEM_UNXHPXR      15
-#define SYSTEM_UNXSNIM      16
-#define SYSTEM_UNXMVSG      17
-#define SYSTEM_UNXIRXM      18
-// #define SYSTEM_MACOSP        19
-#define SYSTEM_UNXFBSDI     20
-#define SYSTEM_UNXSOLI      21
-#define SYSTEM_WINBLCI      22
-#define SYSTEM_UNXMACXP     23
-#define SYSTEM_UNXLNXP      24
-#define SYSTEM_UNXBSDS      25
-#define SYSTEM_UNXLNXR      26
-#define SYSTEM_UNXLNX3      28
-#define SYSTEM_UNXLNXS      29
-#define SYSTEM_UNXLNXX      30
-#define SYSTEM_UNXSOGS      31
-#define SYSTEM_UNXSOGI      32
-#define SYSTEM_UNXMACXI     33
-#define SYSTEM_OS2GCCI      34
-#define SYSTEM_WNTGCCI      99
-
 #if defined WNT
 #if defined(__MINGW32__)
   #define __DLLEXTENSION    "gi"
@@ -383,7 +347,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 
 // -----------------------------------------------------------------------
 
-#define NOOLDSTRING
 #ifndef NOREPLACESTRING
 #define UniString       String
 #define XubString       String
@@ -409,7 +372,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 #define LIBRARY_CONCAT4( s1, s2, s3, s4 ) \
     s1 s2 s3 s4
 
-#if defined WIN || defined WNT || defined OS2
+#if defined WNT || defined OS2
 #define SVLIBRARY( Base ) \
     LIBRARY_CONCAT3( Base, __DLLEXTENSION, ".DLL" )
 #define SVLIBRARYLANG( Base, Lang ) \
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 8b86a1835596..1e438a1296b6 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -441,14 +441,6 @@ typedef struct _UniStringData
 #pragma pack()
 #endif
 
-// -------------------
-// - UniString-Types -
-// -------------------
-
-#ifndef NOOLDSTRING
-#define WSTRING_MAXLEN      STRING_MAXLEN
-#endif
-
 // -------------
 // - UniString -
 // -------------
diff --git a/tools/inc/tools/urlkeys.hxx b/tools/inc/tools/urlkeys.hxx
deleted file mode 100644
index 28122657b7d4..000000000000
--- a/tools/inc/tools/urlkeys.hxx
+++ /dev/null
@@ -1,77 +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 __URLKEYS_HXX
-#define __URLKEYS_HXX
-
-// Defines for common keys in URL files
-
-// ANSI version
-
-#define A_URLSECTION_SHORTCUT   "InternetShortcut"
-#define A_URLKEY_URL            "URL"
-#define A_URLKEY_TITLE          "Title"
-#define A_URLKEY_TARGET         "Target"
-#define A_URLKEY_FRAME          "Frame"
-#define A_URLKEY_OPENAS         "OpenAs"
-#define A_URLKEY_SOICON         "SOIcon"
-#define A_URLKEY_WIN_ICONFILE   "IconFile"
-#define A_URLKEY_WIN_ICONINDEX  "IconIndex"
-#define A_URLKEY_WORKDIR        "WorkingDirectory"
-#define A_URLKEY_ARGUMENTS      "Arguments"
-#define A_URLKEY_INTERN_ORIGURL "[URL]"
-
-// Unicode version
-
-#define U_URLSECTION_SHORTCUT   L"InternetShortcut"
-#define U_URLKEY_URL            L"URL"
-#define U_URLKEY_TITLE          L"Title"
-#define U_URLKEY_TARGET         L"Target"
-#define U_URLKEY_FRAME          L"Frame"
-#define U_URLKEY_OPENAS         L"OpenAs"
-#define U_URLKEY_SOICON         L"SOIcon"
-#define U_URLKEY_WIN_ICONFILE   L"IconFile"
-#define U_URLKEY_WIN_ICONINDEX  L"IconIndex"
-#define U_URLKEY_WORKDIR        L"WorkingDirectory"
-#define U_URLKEY_ARGUMENTS      L"Arguments"
-#define U_URLKEY_INTERN_ORIGURL L"[URL]"
-
-#   define URLSECTION_SHORTCUT  U_URLSECTION_SHORTCUT
-#   define URLKEY_URL           U_URLKEY_URL
-#   define URLKEY_TITLE         U_URLKEY_TITLE
-#   define URLKEY_TARGET        U_URLKEY_TARGET
-#   define URLKEY_FRAME         U_URLKEY_FRAME
-#   define URLKEY_OPENAS        U_URLKEY_OPENAS
-#   define URLKEY_SOICON        U_URLKEY_SOICON
-#   define URLKEY_WIN_ICONFILE  U_URLKEY_WIN_ICONFILE
-#   define URLKEY_WIN_ICONINDEX U_URLKEY_WIN_ICONINDEX
-#   define URLKEY_WORKDIR       U_URLKEY_WORKDIR
-#   define URLKEY_ARGUMENTS     U_URLKEY_ARGUMENTS
-#   define URLKEY_INTERN_ORIGURL U_URLKEY_INTERN_ORIGURL
-
-#endif // __URLKEYS_HXX
-
diff --git a/tools/prj/d.lst b/tools/prj/d.lst
index e0291c2f8ad0..f2c508342015 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -34,9 +34,6 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp
 ..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
 ..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h
 
-..\inc\tools\postextstl.h %_DEST%\inc%_EXT%\tools\postextstl.h
-..\inc\tools\preextstl.h %_DEST%\inc%_EXT%\tools\preextstl.h
-
 ..\inc\tools\svlibrary.hxx %_DEST%\inc%_EXT%\tools\svlibrary.hxx
 ..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx
 ..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx
@@ -48,7 +45,6 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp
 ..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx
 ..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx
 ..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx
-..\inc\tools\chapi.hxx %_DEST%\inc%_EXT%\tools\chapi.hxx
 ..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx
 ..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx
 ..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 1bd43bffc4e7..74a2142db692 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -136,13 +136,13 @@ BOOL bInRedirection = TRUE;
 #else
 BOOL bInRedirection = FALSE;
 #endif
-static NAMESPACE_VOS( OMutex )* pRedirectMutex = 0;
+static vos:: OMutex * pRedirectMutex = 0;
 
 //------------------------------------------------------------------------
 void FSysRedirector::Register( FSysRedirector *pRedirector )
 {
         if ( pRedirector )
-                pRedirectMutex = new NAMESPACE_VOS( OMutex );
+                pRedirectMutex = new vos:: OMutex ;
         else
                 DELETEZ( pRedirectMutex );
         _pRedirector = pRedirector;
@@ -165,7 +165,7 @@ void FSysRedirector::DoRedirect( String &rPath )
         // Redirection is acessible only by one thread per time
         // dont move the guard behind the bInRedirection check!!!
         // think of nested calls (when called from callback)
-        NAMESPACE_VOS( OGuard ) aGuard( pRedirectMutex );
+        vos:: OGuard  aGuard( pRedirectMutex );
 
         // if already in redirection, dont redirect
         if ( bInRedirection )
@@ -1040,8 +1040,8 @@ DirEntry* DirEntry::ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize )
 BOOL DirEntry::Exists( FSysAccess nAccess ) const
 {
 #ifndef BOOTSTRAP
-    static NAMESPACE_VOS(OMutex) aLocalMutex;
-    NAMESPACE_VOS(OGuard) aGuard( aLocalMutex );
+    static vos::OMutex aLocalMutex;
+    vos::OGuard aGuard( aLocalMutex );
 #endif
         if ( !IsValid() )
                 return FALSE;
diff --git a/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index acdbe6bae510..a55c56b6efbb 100644
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.cxx
@@ -28,11 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_tools.hxx"
 
-#if defined( WIN)
-#include <stdio.h>
-#include <dos.h>
-#endif
-
 #ifdef UNX
 #include <errno.h>
 #endif
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 37e9dedf9259..5dc41f292668 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -244,8 +244,8 @@ ColorData Color::HSBtoRGB( USHORT nHue, USHORT nSat, USHORT nBri )
         f = dH - n;
 
         UINT8 a = (UINT8) ( nB * ( 100 - nSat ) / 100 );
-        UINT8 b = (UINT8) ( nB * ( 100 - ( (double)nSat * f + 0.5 ) ) / 100 );
-        UINT8 c = (UINT8) ( nB * ( 100 - ( (double)nSat * ( 1.0 - f ) + 0.5 ) ) / 100 );
+        UINT8 b = (UINT8) ( nB * ( 100 - ( (double)nSat * f ) ) / 100 );
+        UINT8 c = (UINT8) ( nB * ( 100 - ( (double)nSat * ( 1.0 - f ) ) ) / 100 );
 
         switch( n )
         {
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index daeaf8e4c3a5..d05fcac331f2 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -837,18 +837,18 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
 
 static void RscException_Impl()
 {
-    switch ( NAMESPACE_VOS(OSignalHandler)::raise( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) )
+    switch ( vos::OSignalHandler::raise( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) )
     {
-        case NAMESPACE_VOS(OSignalHandler)::TAction_CallNextHandler:
+        case vos::OSignalHandler::TAction_CallNextHandler:
             abort();
 
-        case NAMESPACE_VOS(OSignalHandler)::TAction_Ignore:
+        case vos::OSignalHandler::TAction_Ignore:
             return;
 
-        case NAMESPACE_VOS(OSignalHandler)::TAction_AbortApplication:
+        case vos::OSignalHandler::TAction_AbortApplication:
             abort();
 
-        case NAMESPACE_VOS(OSignalHandler)::TAction_KillApplication:
+        case vos::OSignalHandler::TAction_KillApplication:
             exit(-1);
     }
 }
@@ -1919,7 +1919,7 @@ SimpleResMgr* SimpleResMgr::Create( const sal_Char* pPrefixName, com::sun::star:
 // -----------------------------------------------------------------------
 bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId )
 {
-    NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety);
+    vos::OGuard aGuard(m_aAccessSafety);
 
     if ( ( RSC_STRING != _resourceType ) && ( RSC_RESOURCE != _resourceType ) )
         return false;
@@ -1931,7 +1931,7 @@ bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourc
 // -----------------------------------------------------------------------
 UniString SimpleResMgr::ReadString( sal_uInt32 nId )
 {
-    NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety);
+    vos::OGuard aGuard(m_aAccessSafety);
 
     DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadString : have no impl class !" );
     // perhaps constructed with an invalid filename ?
@@ -2002,7 +2002,7 @@ const ::com::sun::star::lang::Locale& SimpleResMgr::GetLocale() const
 
 sal_uInt32 SimpleResMgr::ReadBlob( sal_uInt32 nId, void** pBuffer )
 {
-    NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety);
+    vos::OGuard aGuard(m_aAccessSafety);
 
     DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadBlob : have no impl class !" );
 
diff --git a/tools/source/solar/solar.c b/tools/source/solar/solar.c
deleted file mode 100644
index 608f0baf5129..000000000000
--- a/tools/source/solar/solar.c
+++ /dev/null
@@ -1,562 +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.
- *
- ************************************************************************/
-
-/* POSIX defines that a program is undefined after a SIG_SEGV.  The
- * code stopped working on Linux Kernel 2.6 so I have moved this back to
- * use FORK.
- * If at a later time the signals work correctly with the Linux Kernel 2.6
- * then this change may be reverted although not strictly posix safe. */
-#define USE_FORK_TO_CHECK 1
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-
-#define I_STDARG
-#ifdef I_STDARG
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#define NO_USE_FORK_TO_CHECK
-#ifdef USE_FORK_TO_CHECK
-#include <sys/wait.h>
-#else
-#include <signal.h>
-#include <setjmp.h>
-#endif
-
-#define printTypeSize(Type,Name)    printf( "sizeof(%s)\t= %d\n", Name, sizeof (Type) )
-
-#define isSignedType(Type)  (((Type)-1) < 0)
-#define printTypeSign(Type,Name)    printf( "%s\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name )
-
-
-/*************************************************************************
-|*
-|*  IsBigEndian()
-|*
-|*  Beschreibung        True, wenn CPU BigEndian ist
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int IsBigEndian()
-{
-  long l = 1;
-  return ! *(char*)&l;
-}
-
-/*************************************************************************
-|*
-|*  IsStackGrowingDown()
-|*
-|*  Beschreibung        True, wenn der Stack nach unten waechst
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int IsStackGrowingDown_2( int * pI )
-{
-  int i = 1;
-  return ((unsigned long)&i) < (unsigned long)pI;
-}
-
-int IsStackGrowingDown()
-{
-  int i = 1;
-  return IsStackGrowingDown_2(&i);
-}
-
-/*************************************************************************
-|*
-|*  GetStackAlignment()
-|*
-|*  Beschreibung        Alignment von char Parametern, die (hoffentlich)
-|*                      ueber den Stack uebergeben werden
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int GetStackAlignment_3( char*p, long l, int i, short s, char b, char c, ... )
-{
-  if ( IsStackGrowingDown() )
-    return &c - &b;
-  else
-    return &b - &c;
-}
-
-int GetStackAlignment_2( char*p, long l, int i, short s, char b, char c )
-{
-  if ( IsStackGrowingDown() )
-    return &c - &b;
-  else
-    return &b - &c;
-}
-
-int GetStackAlignment()
-{
-  int nStackAlignment = GetStackAlignment_3(0,1,2,3,4,5);
-  if ( nStackAlignment != GetStackAlignment_2(0,1,2,3,4,5) )
-    printf( "Pascal calling convention\n" );
-  return nStackAlignment;
-}
-
-
-/*************************************************************************
-|*
-|*  Typdeclarations for memory access test functions
-|*
-*************************************************************************/
-typedef enum { t_char, t_short, t_int, t_long, t_double } Type;
-typedef int (*TestFunc)( Type, void* );
-
-
-/*************************************************************************
-|*
-|*  PrintArgs()
-|*
-|*  Beschreibung        Testfunktion fuer variable Parameter
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-#ifdef I_STDARG
-void PrintArgs( int p, ... )
-#else
-void PrintArgs( p, va_alist )
-int p;
-va_dcl
-#endif
-{
-    int value;
-    va_list ap;
-
-#ifdef I_STDARG
-    va_start( ap, p );
-#else
-    va_start( ap );
-#endif
-
-    printf( "value = %d", p );
-
-    while ( ( value = va_arg(ap, int) ) != 0 )
-      printf( " %d", value );
-
-    printf( "\n" );
-    va_end(ap);
-}
-
-#ifndef USE_FORK_TO_CHECK
-/*************************************************************************
-|*
-|*  SignalHdl()
-|*
-|*  Beschreibung        faengt SIGBUS und SIGSEGV in check() ab
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-static jmp_buf check_env;
-static int bSignal;
-void SignalHdl( int sig )
-{
-  bSignal = 1;
-
-  fprintf( stderr, "Signal %d caught\n", sig );
-  signal( SIGSEGV,  SIG_DFL );
-  signal( SIGBUS,   SIG_DFL );
-  siglongjmp( check_env, sig );
-}
-#endif
-
-/*************************************************************************
-|*
-|*  check()
-|*
-|*  Beschreibung        Testet MemoryZugriff (read/write)
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int check( TestFunc func, Type eT, void* p )
-{
-#ifdef USE_FORK_TO_CHECK
-  pid_t nChild = fork();
-  if ( nChild )
-  {
-    int exitVal;
-    wait( &exitVal );
-    if ( exitVal & 0xff )
-      return -1;
-    else
-      return exitVal >> 8;
-  }
-  else
-  {
-    exit( func( eT, p ) );
-  }
-#else
-  int result;
-
-  bSignal = 0;
-
-  if ( !sigsetjmp( check_env, 1 ) )
-  {
-    signal( SIGSEGV,    SignalHdl );
-    signal( SIGBUS,     SignalHdl );
-    result = func( eT, p );
-    signal( SIGSEGV,    SIG_DFL );
-    signal( SIGBUS,     SIG_DFL );
-  }
-
-  if ( bSignal )
-    return -1;
-  else
-    return 0;
-#endif
-}
-
-/*************************************************************************
-|*
-|*  GetAtAddress()
-|*
-|*  Beschreibung        memory read access
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int GetAtAddress( Type eT, void* p )
-{
-  switch ( eT )
-  {
-  case t_char:      return *((char*)p);
-  case t_short:     return *((short*)p);
-  case t_int:       return *((int*)p);
-  case t_long:      return *((long*)p);
-  case t_double:    return *((double*)p);
-  }
-  abort();
-}
-
-/*************************************************************************
-|*
-|*  SetAtAddress()
-|*
-|*  Beschreibung        memory write access
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int SetAtAddress( Type eT, void* p )
-{
-  switch ( eT )
-  {
-  case t_char:      return *((char*)p)  = 0;
-  case t_short:     return *((short*)p) = 0;
-  case t_int:       return *((int*)p)   = 0;
-  case t_long:      return *((long*)p)  = 0;
-  case t_double:    return *((double*)p)= 0;
-  }
-  abort();
-}
-
-char* TypeName( Type eT )
-{
-  switch ( eT )
-  {
-  case t_char:      return "char";
-  case t_short:     return "short";
-  case t_int:       return "int";
-  case t_long:      return "long";
-  case t_double:    return "double";
-  }
-  abort();
-}
-
-/*************************************************************************
-|*
-|*  Check(Get|Set)Access()
-|*
-|*  Beschreibung        Testet MemoryZugriff (read/write)
-|*                      Zugriffsverletzungen werden abgefangen
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int CheckGetAccess( Type eT, void* p )
-{
-  int b;
-  b = -1 != check( (TestFunc)GetAtAddress, eT, p );
-#if OSL_DEBUG_LEVEL > 1
-  fprintf( stderr,
-           "%s read %s at %p\n",
-           (b? "can" : "can not" ), TypeName(eT), p );
-#endif
-  return b;
-}
-int CheckSetAccess( Type eT, void* p )
-{
-  int b;
-
-  b = -1 != check( (TestFunc)SetAtAddress, eT, p );
-#if OSL_DEBUG_LEVEL > 1
-  fprintf( stderr,
-           "%s write %s at %p\n",
-           (b? "can" : "can not" ), TypeName(eT), p );
-#endif
-  return b;
-}
-
-/*************************************************************************
-|*
-|*  GetAlignment()
-|*
-|*  Beschreibung        Bestimmt das Alignment verschiedener Typen
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-int GetAlignment( Type eT )
-{
-  char  a[ 16*8 ];
-  long  p = (long)(void*)a;
-  int   i;
-
-  /* clear a[...] to set legal value for double access */
-  for ( i = 0; i < 16*8; i++ )
-    a[i] = 0;
-
-  p = ( p + 0xF ) & ~0xF;
-  for ( i = 1; i < 16; i++ )
-    if ( CheckGetAccess( eT, (void*)(p+i) ) )
-      return i;
-  return 0;
-}
-
-/*************************************************************************
-|*
-|*  struct Description
-|*
-|*  Beschreibung        Beschreibt die Parameter der Architektur
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-struct Description
-{
-  int   bBigEndian;
-  int   bStackGrowsDown;
-  int   nStackAlignment;
-  int   nAlignment[3];  /* 2,4,8 */
-};
-
-/*************************************************************************
-|*
-|*  Description_Ctor()
-|*
-|*  Beschreibung        Bestimmt die Parameter der Architektur
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-void Description_Ctor( struct Description* pThis )
-{
-  pThis->bBigEndian         = IsBigEndian();
-  pThis->bStackGrowsDown    = IsStackGrowingDown();
-  pThis->nStackAlignment    = GetStackAlignment();
-
-  if ( sizeof(short) != 2 )
-    abort();
-  pThis->nAlignment[0] = GetAlignment( t_short );
-  if ( sizeof(int) != 4 )
-    abort();
-  pThis->nAlignment[1] = GetAlignment( t_int );
-
-  if      ( sizeof(long) == 8 )
-    pThis->nAlignment[2] = GetAlignment( t_long );
-  else if ( sizeof(double) == 8 )
-    pThis->nAlignment[2] = GetAlignment( t_double );
-  else
-    abort();
-}
-
-/*************************************************************************
-|*
-|*  Description_Print()
-|*
-|*  Beschreibung        Schreibt die Parameter der Architektur als Header
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-void Description_Print( struct Description* pThis, char* name )
-{
-  int i;
-  FILE* f = fopen( name, "w" );
-  if( ! f ) {
-      fprintf( stderr, "Unable to open file %s: %s\n", name, strerror( errno ) );
-      exit( 99 );
-  }
-  fprintf( f, "#define __%s\n",
-           pThis->bBigEndian ? "BIGENDIAN" : "LITTLEENDIAN" );
-  for ( i = 0; i < 3; i++ )
-    fprintf( f, "#define __ALIGNMENT%d\t%d\n",
-             1 << (i+1), pThis->nAlignment[i] );
-  fprintf( f, "/* Stack alignment is not used... */\n" );
-  fprintf( f, "#define __STACKALIGNMENT\t%d\n", pThis->nStackAlignment );
-  fprintf( f, "#define __STACKDIRECTION\t%d\n",
-           pThis->bStackGrowsDown ? -1 : 1 );
-  fprintf( f, "#define __SIZEOFCHAR\t%d\n", sizeof( char ) );
-  fprintf( f, "#define __SIZEOFSHORT\t%d\n", sizeof( short ) );
-  fprintf( f, "#define __SIZEOFINT\t%d\n", sizeof( int ) );
-  fprintf( f, "#define __SIZEOFLONG\t%d\n", sizeof( long ) );
-  fprintf( f, "#define __SIZEOFPOINTER\t%d\n", sizeof( void* ) );
-  fprintf( f, "#define __SIZEOFDOUBLE\t%d\n", sizeof( double ) );
-  fprintf( f, "#define __IEEEDOUBLE\n" );
-  fclose( f );
-}
-
-/*************************************************************************
-|*
-|*  InfoMemoryAccess()
-|*
-|*  Beschreibung        Informeller Bytezugriffstest
-|*
-|*  Ersterstellung      EG 26.06.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-void InfoMemoryAccess( char* p )
-{
-  if ( CheckGetAccess( t_char, p ) )
-    printf( "can read address %p\n", p );
-  else
-    printf( "can not read address %p\n", p );
-
-  if ( CheckSetAccess( t_char, p ) )
-    printf( "can write address %p\n", p );
-  else
-    printf( "can not write address %p\n", p );
-}
-
-/*************************************************************************
-|*
-|*  InfoMemoryTypeAccess()
-|*
-|*  Beschreibung        Informeller Zugriffstest verschiedener Typen
-|*
-|*  Ersterstellung      EG 15.08.96
-|*  Letzte Aenderung
-|*
-*************************************************************************/
-void InfoMemoryTypeAccess( Type eT )
-{
-  char  a[64];
-  int   i;
-
-  /* clear a[...] to set legal value for double access */
-  for ( i = 0; i < 64; i++ )
-    a[i] = 0;
-
-  for ( i = 56; i >= 7; i >>= 1 )
-  {
-    printf( "Zugriff %s auf %i-Aligned Adresse : ", TypeName( eT ), i / 7 );
-    printf( ( CheckGetAccess( eT, (long*)&a[i] ) ? "OK\n" : "ERROR\n" ) );
-  }
-}
-/************************************************************************
- *
- *  Use C code to determine the characteristics of the building platform.
- *
- ************************************************************************/
-int main( int argc, char* argv[] )
-{
-  printTypeSign( char, "char" );
-  printTypeSign( short, "short" );
-  printTypeSign( int, "int" );
-  printTypeSign( long, "long" );
-
-  printTypeSize( char, "char" );
-  printTypeSize( short, "short" );
-  printTypeSize( int, "int" );
-  printTypeSize( long, "long" );
-  printTypeSize( float, "float" );
-  printTypeSize( double, "double" );
-  printTypeSize( void *, "void *" );
-
-  if ( IsBigEndian() )
-    printf( "BIGENDIAN (Sparc, MC680x0, RS6000, IP22, IP32, g3)\n" );
-  else
-    printf( "LITTLEENDIAN (Intel, VAX, PowerPC)\n" );
-
-  if( IsStackGrowingDown() )
-    printf( "Stack waechst nach unten\n" );
-  else
-    printf( "Stack waechst nach oben\n" );
-
-  printf( "STACKALIGNMENT   : %d\n", GetStackAlignment() );
-
-  /* PrintArgs( 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 ); */
-
-  if ( argc > 1 )
-  {
-    struct Description description;
-    Description_Ctor( &description );
-    Description_Print( &description, argv[1] );
-  }
-  {
-    char* p = NULL;
-    InfoMemoryAccess( p );
-    p = (char*)&p;
-    InfoMemoryAccess( p );
-    InfoMemoryTypeAccess( t_short );
-    InfoMemoryTypeAccess( t_int );
-    InfoMemoryTypeAccess( t_long );
-    InfoMemoryTypeAccess( t_double );
-  }
-
-  exit( 0 );
-}
diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx
index d211d7790b08..a35fc7731767 100644
--- a/tools/source/stream/strmos2.cxx
+++ b/tools/source/stream/strmos2.cxx
@@ -757,108 +757,4 @@ void SvFileStream::SetSize( ULONG nSize )
     }
 }
 
-#if 0
-/*************************************************************************
-|*
-|*    SvSharedMemoryStream::AllocateMemory()
-|*
-|*    Beschreibung      STREAM.SDW
-|*    Ersterstellung    CL 05.05.95
-|*    Letzte Aenderung  CL 05.05.95
-|*
-*************************************************************************/
-
-sal_Bool SvSharedMemoryStream::AllocateMemory( ULONG nNewSize )
-{
-        DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
-        DBG_ASSERT(nNewSize,"Cannot allocate zero Bytes");
-        APIRET nRet = DosAllocSharedMem( (void**)&pBuf, (PSZ)NULL, nNewSize,
-                                     PAG_READ | PAG_WRITE | PAG_COMMIT |
-                                     OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_ANY);
-    return( nRet == 0 );
-}
-
-/*************************************************************************
-|*
-|*    SvSharedMemoryStream::ReAllocateMemory()   (Bozo-Algorithmus)
-|*
-|*    Beschreibung      STREAM.SDW
-|*    Ersterstellung    CL 05.05.95
-|*    Letzte Aenderung  CL 05.05.95
-|*
-*************************************************************************/
-
-sal_Bool SvSharedMemoryStream::ReAllocateMemory( long nDiff )
-{
-    DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
-    sal_Bool bRetVal    = FALSE;
-    ULONG nNewSize  = nSize + nDiff;
-        if( nNewSize )
-        {
-                // neuen Speicher nicht ueber AllocateMemory holen, da wir den
-                // alten Speicher behalten wollen, falls nicht genuegend Platz
-                // fuer den neuen Block da ist
-                char* pNewBuf;
-            APIRET nRet = DosAllocSharedMem( (void**)&pNewBuf,(PSZ)NULL,nNewSize,
-                                PAG_READ | PAG_WRITE | PAG_COMMIT |
-                                OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_ANY);
-            DBG_ASSERT(!nRet,"DosAllocSharedMem failed");
-
-            if( !nRet )
-            {
-                bRetVal = TRUE; // Success!
-                if( nNewSize < nSize )      // Verkleinern ?
-                {
-                    memcpy( pNewBuf, pBuf, (size_t)nNewSize );
-                    if( nPos > nNewSize )
-                        nPos = 0L;
-                    if( nEndOfData >= nNewSize )
-                        nEndOfData = nNewSize-1L;
-                }
-                else
-                    memcpy( pNewBuf, pBuf, (size_t)nSize );
-
-                FreeMemory(); // den alten Block loeschen ...
 
-                // und den neuen Block in Dienst stellen
-                pBuf  = (sal_uInt8*)pNewBuf;
-                nSize = nNewSize;
-            }
-        }
-        else
-        {
-                bRetVal = TRUE;
-                FreeMemory();
-                pBuf = 0;
-                nSize = 0;
-                nEndOfData = 0;
-        }
-    return bRetVal;
-}
-
-void SvSharedMemoryStream::FreeMemory()
-{
-    DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
-    DosFreeMem( pBuf );
-}
-
-/*************************************************************************
-|*
-|*    SvSharedMemoryStream::SetHandle()
-|*
-|*    Beschreibung      STREAM.SDW
-|*    Ersterstellung    OV 05.10.95
-|*    Letzte Aenderung  OV 05.10.95
-|*
-*************************************************************************/
-
-void* SvSharedMemoryStream::SetHandle( void* aNewHandle, sal_Size nSize,
-                                       sal_Bool bOwnsData, sal_Size nEOF )
-{
-    DBG_ERROR("OS/2 does not support memory handles");
-    // return SetBuffer(aNewHandle, nSize, bOwnsData, nEOF );
-    return 0;
-}
-
-
-#endif // 0
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 88ccb2113e0d..f3c5d642ed6e 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -60,7 +60,7 @@ DECLARE_LIST( InternalStreamLockList, InternalStreamLock* )
 namespace { struct LockList : public rtl::Static< InternalStreamLockList, LockList > {}; }
 
 #ifndef BOOTSTRAP
-namespace { struct LockMutex : public rtl::Static< NAMESPACE_VOS(OMutex), LockMutex > {}; }
+namespace { struct LockMutex : public rtl::Static< vos::OMutex, LockMutex > {}; }
 #endif
 
 class InternalStreamLock
@@ -111,7 +111,7 @@ InternalStreamLock::~InternalStreamLock()
 sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream )
 {
 #ifndef BOOTSTRAP
-    NAMESPACE_VOS( OGuard ) aGuard( LockMutex::get() );
+    vos:: OGuard  aGuard( LockMutex::get() );
 #endif
     ByteString aFileName(pStream->GetFileName(), osl_getThreadTextEncoding());
     struct stat aStat;
@@ -161,7 +161,7 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr
 void InternalStreamLock::UnlockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream )
 {
 #ifndef BOOTSTRAP
-    NAMESPACE_VOS( OGuard ) aGuard( LockMutex::get() );
+    vos:: OGuard  aGuard( LockMutex::get() );
 #endif
     InternalStreamLock* pLock = NULL;
     InternalStreamLockList &rLockList = LockList::get();
diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx
index ca269ef6eea2..21a1a715dc08 100644
--- a/tools/source/testtoolloader/testtoolloader.cxx
+++ b/tools/source/testtoolloader/testtoolloader.cxx
@@ -56,16 +56,16 @@ static bool bLoggerStarted = false;
 
 sal_uInt32 GetCommandLineParamCount()
 {
-    NAMESPACE_VOS( OStartupInfo ) aStartInfo;
+    vos:: OStartupInfo  aStartInfo;
     return aStartInfo.getCommandArgCount();
 }
 
 String GetCommandLineParam( sal_uInt32 nParam )
 {
-    NAMESPACE_VOS( OStartupInfo ) aStartInfo;
+    vos:: OStartupInfo  aStartInfo;
     ::rtl::OUString aParam;
-    NAMESPACE_VOS( OStartupInfo )::TStartupError eError = aStartInfo.getCommandArg( nParam, aParam );
-    if ( eError == NAMESPACE_VOS( OStartupInfo )::E_None )
+    vos:: OStartupInfo ::TStartupError eError = aStartInfo.getCommandArg( nParam, aParam );
+    if ( eError == vos:: OStartupInfo ::E_None )
         return String( aParam );
     else
     {
diff --git a/tools/win/inc/dll.hxx b/tools/win/inc/dll.hxx
index 2a91aefc0fa9..f28b07974c61 100644
--- a/tools/win/inc/dll.hxx
+++ b/tools/win/inc/dll.hxx
@@ -28,31 +28,6 @@
 #ifndef _DLL_HXX
 #define _DLL_HXX
 
-#ifdef WIN
-
-#include <tools/svwin.h>
-
-// ----------------------
-// - Zugriffsfunktionen -
-// ----------------------
-
-struct SVDATA;
-
-extern "C"
-{
-// IN APPDATA.ASM
-SVDATA* FAR PASCAL GetSVData();
-}
-
-// IN TOOLSDLL.CXX
-void SetSVData( SVDATA* pSVData );
-
-#endif
-
-// -------------------------------
-// - Sonstige Funktionen fuer SV -
-// -------------------------------
-
 // Um Resourcen wieder freizugeben
 inline void ImpDeInitWinTools() {}
 
diff --git a/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx
deleted file mode 100644
index a6b1546763bc..000000000000
--- a/tools/win/inc/toolsdll.hxx
+++ /dev/null
@@ -1,88 +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 _TOOLSDLL_HXX
-#define _TOOLSDLL_HXX
-
-#ifdef WIN
-
-#ifndef _STRING_H
-#include <string.h>
-#endif
-#include <tools/svwin.h>
-#include <tools/solar.h>
-#include <tools/shl.hxx>
-
-// ----------------
-// - MemMgr-Daten -
-// ----------------
-
-// Anzahl Freispeicherlisten
-#define MEM_FREELIST_COUNT  15
-
-
-// --------------
-// - Tools-Data -
-// --------------
-
-struct SVDATA;
-struct FreeBlock;
-
-struct MemData
-{
-    FreeBlock*  pFirstBlocks[MEM_FREELIST_COUNT];   // Erste Bloecke in Freispeicherlisten
-    void*       pNewHandler;                        // New-Handler
-    int         nMultiThread;                       // MultiThread an/aus
-};
-
-struct ToolsData
-{
-    // !!! SVDATA muss in jedem Fall ganz vorne in der Struktur stehen !!!
-    SVDATA*     pSVData;                // Pointer auf StarView-Daten
-    HANDLE      hMem;                   // Handler der Tools-Daten
-    MemData     aMemD;                  // Daten der Speicherverwaltung
-    void*       aAppData[SHL_COUNT];    // Daten fuer andere Shared Libs
-};
-
-
-// ----------------------
-// - Zugriffsfunktionen -
-// ----------------------
-
-// IN APPDATA.ASM
-extern "C"
-{
-ToolsData*  FAR PASCAL ImpGetAppData();
-void        FAR PASCAL ImpSetAppData( ToolsData* pData );
-}
-
-// IN TOOLSDLL.CXX
-ToolsData* ImpGetToolsData();
-
-#endif
-
-#endif // _DLL_HXX
diff --git a/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx
index 8fc9888021bb..3d934edfe71d 100644
--- a/tools/win/source/dll/toolsdll.cxx
+++ b/tools/win/source/dll/toolsdll.cxx
@@ -29,7 +29,6 @@
 #include "precompiled_tools.hxx"
 #include <tools/svwin.h>
 #include <dll.hxx>
-#include <toolsdll.hxx>
 #include <tools/shl.hxx>
 
 // =======================================================================
diff --git a/transex3/java/jpropex/build.xml b/transex3/java/jpropex/build.xml
deleted file mode 100755
index d74fb3975d0f..000000000000
--- a/transex3/java/jpropex/build.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  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.
-
--->
-<project name="jpropex" default="main" basedir=".">
-
-    <!-- ================================================================= -->
-    <!-- settings                                                          -->
-    <!-- ================================================================= -->
-
-    <!-- name of this sub target used in recursive builds -->
-    <property name="target" value="jpropex"/>
-
-    <!-- name of jar file created, without .jar extension -->
-    <property name="jarname" value="jpropex"/>
-
-    <!-- relative path to project directory -->
-    <property name="prj" value="."/>
-
-    <!-- build output directory -->
-    <property name="out" value="build"/>
-
-    <!-- build directories -->
-    <property name="build.dir" value="${out}"/>
-    <property name="build.class" value="${build.dir}/class/jpropex"/>
-    <property name="build.misc"  value="${build.dir}/misc/jpropex"/>
-
-    <!-- start of java source code package structure -->
-    <property name="java.dir" value="java"/>
-
-    <!-- define how to handle CLASSPATH environment -->
-    <property name="build.sysclasspath" value="ignore"/>
-
-    <!-- classpath settings for compile and javadoc tasks -->
-    <path id="classpath">
-        <pathelement location="."/>
-        <pathelement location="${build.class}"/>
-    </path>
-
-    <!-- name to display in documentation -->
-    <!--    <property name="docname" value="l10n converter"/> -->
-
-    <!-- set "modern" java compiler -->
-    <property name="build.compiler" value="modern"/>
-
-    <!-- set wether we want to compile with debug information -->
-    <property name="debug" value="on"/>
-
-    <!-- set wether we want to compile with optimisation -->
-    <property name="optimize" value="off"/>
-
-    <!-- set wether we want to compile with or without deprecation -->
-    <property name="deprecation" value="on"/>
-
-    <target name="info">
-        <echo message="--------------------"/>
-        <echo message="${target}"/>
-        <echo message="--------------------"/>
-    </target>
-
-    <!-- ================================================================= -->
-    <!-- custom targets                                                    -->
-    <!-- ================================================================= -->
-
-    <!-- the main target, called in recursive builds -->
-    <target name="main" depends="info,prepare,compile,jar"/>
-
-    <!-- prepare output directories -->
-    <target name="prepare">
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${build.class}"/>
-        <mkdir dir="${build.misc}"/>
-    </target>
-
-
-    <target name="res" depends="prepare">
-        <copy todir="${build.class}">
-             <fileset dir="${java.dir}">
-                 <include name="**/*.properties"/>
-                 <include name="**/*.css"/>
-                 <include name="**/*.dtd"/>
-                 <include name="**/*.form"/>
-                 <include name="**/*.gif "/>
-                 <include name="**/*.htm"/>
-                 <include name="**/*.html"/>
-                 <include name="**/*.js"/>
-                 <include name="**/*.mod"/>
-                 <include name="**/*.sql"/>
-                 <include name="**/*.xml"/>
-                 <include name="**/*.xsl"/>
-                 <include name="**/*.map"/>
-
-             </fileset>
-        </copy>
-    </target>
-
-
-    <target name="compile" depends="prepare,res">
-    <javac destdir="${build.class}"
-           debug="${debug}"
-               deprecation="${deprication}"
-           optimize="${optimize}"
-           classpathref="classpath">
-            <src path="${java.dir}"/>
-        <include name="**/*.java"/>
-    </javac>
-    </target>
-
-    <!-- clean up -->
-    <target name="clean" depends="prepare">
-        <delete includeEmptyDirs="true">
-            <fileset dir="${build.class}">
-                <patternset>
-                    <include name="${package}/**/*.class"/>
-                </patternset>
-            </fileset>
-        </delete>
-    </target>
-
-    <!-- create jar file -->
-    <target name="jar" depends="prepare,compile" if="build.class">
-        <jar jarfile="${build.class}/${jarname}.jar"
-             basedir="${build.class}"
-             manifest="${jarname}.MF">
-                 <include name="**/*.class"/>
-                 <include name="**/*.properties"/>
-                 <include name="**/*.css"/>
-                 <include name="**/*.dtd"/>
-                 <include name="**/*.form"/>
-                 <include name="**/*.gif "/>
-                 <include name="**/*.htm"/>
-                 <include name="**/*.html"/>
-                 <include name="**/*.js"/>
-                 <include name="**/*.mod"/>
-                 <include name="**/*.sql"/>
-                 <include name="**/*.xml"/>
-                 <include name="**/*.xsl"/>
-                 <include name="**/*.map"/>
-        </jar>
-    </target>
-
-    <target name="test" depends="prepare">
-    </target>
-
-</project>
-
diff --git a/transex3/java/jpropex/java/JPropEx.java b/transex3/java/jpropex/java/JPropEx.java
deleted file mode 100644
index 20175febe5d5..000000000000
--- a/transex3/java/jpropex/java/JPropEx.java
+++ /dev/null
@@ -1,400 +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.
- *
- ************************************************************************/
-
-
-import java.util.*;
-import java.io.*;
-
-public class JPropEx
-{
-    private String inputFileArg;
-    private String outputFileArg;
-    private String pathPrefixArg;
-    private String pathPostfixArg;
-    private String projectArg;
-    private String rootArg;
-    private Vector forcedLangsArg;
-    private Vector langsArg;
-    private String inputSdfFileArg;
-    private boolean isQuiet             = false;
-    private final String resourceType   = "javaproperties";
-    private final String sourceLanguage = "en-US";
-    //private SdfData data;
-
-    public JPropEx()
-    {
-        //data = new SdfData();
-    }
-
-    public JPropEx( String args[] )
-    {
-        super();
-        parseArguments( args );
-        testArguments();
-        if( inputSdfFileArg != null && inputSdfFileArg.length() > 0 )
-            merge();
-        else
-            extract();
-    }
-
-    private String getSimpleArg( String[] args , int x )
-    {
-        if( x < args.length ) x++;
-        else
-        {
-            System.err.println("ERROR: Missing arg for "+args[ x ]+"\n");
-            help();
-        }
-        return args[ x ];
-    }
-    private Vector getComplexArg( String[] args , int x )
-    {
-        if( x < args.length ) x++;
-        else
-        {
-            System.err.println("ERROR: Missing arg for "+args[ x ]+"\n");
-            help();
-        }
-        String value = args[ x ];
-        Vector values = new Vector( Arrays.asList( value.split(",") ) );
-        return values;
-    }
-
-    private void help()
-    {
-        System.out.println("jpropex       extract / merge java properties files");
-        System.exit( -1 );
-    }
-
-    private void extract()
-    {
-        SdfData data = new SdfData();
-        java.util.Properties prop = loadProp( inputFileArg );
-
-        // Get a prototype that already contains the most common settings
-        SdfEntity dolly = prepareSdfObj();
-        String key;
-        SdfEntity currentStr;
-        String value;
-        for( Enumeration e = prop.propertyNames() ; e.hasMoreElements() ; )
-        {
-            key         = (String)      e.nextElement();
-            currentStr  = (SdfEntity)   dolly.clone();
-            // Set the new LID and the string text
-            currentStr.setLid( key );
-            value            = prop.getProperty( key , "" );
-            //if( value.equals("") )  System.err.println("Warning: in file "+inputFileArg+" the string with the key "+key+" has a empty string!");
-            currentStr.setText( (prop.getProperty( key )).replaceAll("\t" , " " ) );     // TODO: Quoting!!!!
-            data.add( currentStr );
-        }
-        data.write( outputFileArg );
-    }
-
-    private SdfEntity prepareSdfObj()
-    {
-        String path = makeAbs( inputFileArg );
-        path = path.replace( rootArg + "/" , "" );
-        path = path.replace("/","\\");
-        return new SdfEntity( projectArg , path , "" /* dummy1 */ , resourceType , "", "" , "" , "" , "" /* dummy2 */ ,
-                              sourceLanguage , "",  "" , ""  , "" , "2002-02-02 02:02:02" );
-    }
-
-    private void merge()
-    {
-        SdfData data = getSdfData();
-        if( inputFileArg.startsWith("@") )
-        {
-            // Read files
-            Vector fileList = readFileList( inputFileArg );
-            for( Enumeration e = fileList.elements(); e.hasMoreElements(); )
-                mergeFile( (String) e.nextElement() , data );
-        }
-        else
-        {
-            // Single file
-            mergeFile( inputFileArg , data );
-        }
-    }
-
-    private Vector readFileList( String filename )
-    {
-        Vector lines = new Vector();
-        try
-        {
-            BufferedReader in = new BufferedReader( new FileReader( filename.substring( 1 ) ) );
-            while( in.ready() )
-                lines.add( in.readLine() );
-        }
-        catch( IOException e )
-        {
-            System.out.println("ERROR: Can't open file '"+filename.substring( 1 )+"'");
-            System.exit( -1 );
-        }
-        return lines;
-    }
-
-    private void mergeFile( String filename , SdfData data )
-    {
-        java.util.Properties sourceProp = loadProp( filename );
-        Vector langs = getLanguages( data );
-        HashMap props = new HashMap();
-        // Create a properties object for every language
-        for( Enumeration e = langs.elements(); e.hasMoreElements();)
-        {
-
-            props.put( (String)e.nextElement() , new java.util.Properties() );
-        }
-        // Get a prototype that already contains the most common settings
-
-        SdfEntity dolly = prepareSdfObj();
-        String key;
-        String sourceString;
-        SdfEntity curStr;
-        SdfEntity curEntity;
-        SdfEntity mergedEntity;
-        String curLang;
-        for( Enumeration e = sourceProp.propertyNames() ; e.hasMoreElements() ; )     // For all property keys
-        {
-            key          = (String) e.nextElement();
-            sourceString = sourceProp.getProperty( key );
-            curStr       = (SdfEntity) dolly.clone();
-            curStr.setLid( key );
-            for( Enumeration lang = langs.elements(); lang.hasMoreElements(); ) // merge in every language
-            {
-                curEntity   = (SdfEntity) curStr.clone();
-                curLang     = (String)    lang.nextElement();
-                curEntity.setLangid( curLang );
-                mergedEntity = data.get( curEntity );
-                if( mergedEntity == null )
-                {
-                    // if case there is not translation the fallback to the en-US source string
-                    ( (java.util.Properties) props.get( curLang )).setProperty( curEntity.getLid() , sourceString  );
-                }
-                else
-                {
-                    // Set the merged text from the sdf file
-                    ( (java.util.Properties) props.get( curLang )).setProperty( mergedEntity.getLid() , mergedEntity.getText() );  // TODO: Quoting ???
-                }
-            }
-
-        }
-        // Now write them out
-        String lang;
-        for( Iterator i = props.keySet().iterator() ; i.hasNext() ; )
-        {
-            lang = (String) i.next();
-            writeSinglePropertiesFile( filename , (java.util.Properties) props.get( lang ) , lang );
-        }
-    }
-    private void writeSinglePropertiesFile( String filename , java.util.Properties prop , String lang )
-    {
-        // Prepare path to file
-        int filenameIdx = filename.lastIndexOf( "/" ) > 0 ? filename.lastIndexOf( "/" )+1 : 0 ;
-        String path = new String();
-        String name = new String();
-        if( pathPrefixArg != null && pathPrefixArg.length()>0 && pathPostfixArg != null && pathPostfixArg.length()>0 )
-        {
-            path = new StringBuffer().append( pathPrefixArg ).append( "/" ).append( lang ).append( "/" ).append( pathPostfixArg ).append( "/" ).toString();
-            name = new StringBuffer().append( filename.substring( filenameIdx , filename.lastIndexOf( ".properties" ) ) )
-                                        .append( "_" ).append( lang.replaceAll("-","_") ).append( ".properties" ).toString();
-        }
-        else if( outputFileArg != null && outputFileArg.length()>0 )
-        {
-            name = outputFileArg;
-            name += new StringBuffer().append( inputFileArg.substring( filenameIdx , filename.lastIndexOf( ".properties" ) ) )
-                                     .append( "_" ).append( lang.replaceAll("-","_") ).append( ".properties" ).toString();
-
-            //name = outputFileArg;
-        }
-        else
-        {
-            System.err.println("ERROR: No outputfile specified .. either -o or -x -y !");
-            System.exit( -1 );
-        }
-
-        File dir = new File( path );
-        try
-        {
-            if( !dir.exists() && path.length()>0 )
-            {
-                if( !dir.mkdirs() )
-                {
-                    System.out.println("ERROR: Can't create directory '"+path+"' !!!");
-                    System.exit( -1 );
-                }
-            }
-        }
-        catch( SecurityException e )
-        {
-            System.out.println("ERROR: Can't create directory '"+path+"'!!!Wrong Permissions?");
-            System.exit( -1 );
-        }
-        path += name;
-        // Write the properties file
-        System.out.println("DBG: Writing to "+path);
-        try{
-            BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream( path ) );
-            if( prop == null )
-                System.out.println("DBG: prop == null!!!");
-            prop.store( out , "" );     // Legal headers?
-        }
-        catch( IOException e )
-        {
-            System.out.println("ERROR: Can't write file '"+path+"' !!!!");
-            System.exit( -1 );
-        }
-    }
-
-    private SdfData getSdfData()
-    {
-        SdfData data = new SdfData( inputSdfFileArg );
-        data.read();
-        return data;
-    }
-    private Vector getLanguages( SdfData data )
-    {
-        Vector langs = new Vector();
-
-        if( ((String)langsArg.get( 0 )).equalsIgnoreCase( "all" ) ) // for "-l all" use all languages found in the -m sdf file
-            langs.addAll( data.getLanguages() );
-        else
-            langs.addAll( langsArg );              // use the langs giving by -l
-
-        if( forcedLangsArg != null )
-            langs.addAll( forcedLangsArg );
-
-        return removeDupes( langs );
-    }
-    private Vector removeDupes( Vector vec )
-    {
-        Collection coll = new LinkedHashSet( vec );
-        return new Vector( coll );
-    }
-    private java.util.Properties loadProp( String filename )
-    {
-        java.util.Properties prop = new java.util.Properties();
-        try
-        {
-            prop.load( new BufferedInputStream( new NoLocalizeFilter( new FileInputStream( filename ) ) ) );
-        }
-        catch( IOException e )
-        {
-            System.err.println("ERROR: Can't read file '"+filename+"'!!!");
-        }
-        return prop;
-    }
-    private void parseArguments( String[] args )
-    {
-
-        if( args.length == 0 )
-        {
-            System.out.println("ERROR: No args???");
-            help();
-            System.exit( -1 );
-        }
-        for( int x = 0; x < args.length ; x++ )
-        {
-            if( args[ x ].equalsIgnoreCase("-i") )
-            {
-                // Input resource file
-                inputFileArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-o") )
-            {
-                // Output sdf file
-                outputFileArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-x") )
-            {
-                // path prefix
-                pathPrefixArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-y") )
-            {
-                // path postfix
-                pathPostfixArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-p") )
-            {
-                // project
-                projectArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-r") )
-            {
-                // root
-                rootArg = getSimpleArg( args , x );
-                rootArg = makeAbs( rootArg );
-            }
-            else if( args[ x ].equalsIgnoreCase("-lf") )
-            {
-                // forced langs
-                forcedLangsArg = getComplexArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-l") )
-            {
-                // langs
-                langsArg = getComplexArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-m") )
-            {
-                // input sdf file
-                inputSdfFileArg = getSimpleArg( args , x );
-            }
-            else if( args[ x ].equalsIgnoreCase("-qq") )
-            {
-                isQuiet = true;
-            }
-        }
-    }
-    private String makeAbs( String path )
-    {
-        File file;
-        try
-        {
-            file = new File( path );
-            return file.getCanonicalPath();
-        }catch( IOException e )
-        {
-            e.printStackTrace();
-            System.exit( -1 );
-        }
-        return null;
-    }
-    private boolean testArguments()
-    {
-        // nice merge
-        if( inputSdfFileArg != null && inputSdfFileArg.length()>0 )
-            // nice merge
-            return  projectArg != null  && rootArg != null && inputFileArg != null && pathPrefixArg != null && pathPostfixArg != null && langsArg != null &&
-                    projectArg.length()>0 && rootArg.length()>0 && inputFileArg.length()>0 && pathPrefixArg.length()>0 && pathPostfixArg.length()>0 && langsArg.size()>0 ;
-        else
-            // nice extract
-            return  projectArg != null && rootArg != null && inputFileArg != null && outputFileArg != null && langsArg != null &&
-                    projectArg.length()>0 && rootArg.length()>0 && inputFileArg.length()>0 && outputFileArg.length()>0 && langsArg.size()>0;
-    }
-
-}
diff --git a/transex3/java/jpropex/java/Main.java b/transex3/java/jpropex/java/Main.java
deleted file mode 100644
index 23dc477ddec3..000000000000
--- a/transex3/java/jpropex/java/Main.java
+++ /dev/null
@@ -1,38 +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.
- *
- ************************************************************************/
-
-
-class Main
-{
-
-    public static void main( String args[] )
-    {
-        JPropEx jpropex = new JPropEx( args );
-        //jpropex.init();
-    }
-}
-
diff --git a/transex3/java/jpropex/java/NoLocalizeFilter.java b/transex3/java/jpropex/java/NoLocalizeFilter.java
deleted file mode 100644
index c1e62fc951a8..000000000000
--- a/transex3/java/jpropex/java/NoLocalizeFilter.java
+++ /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.
- *
- ************************************************************************/
-
-
-import java.io.*;
-import java.util.regex.*;
-
-// exit if the sequence x-no-localize is found in stream!
-public class NoLocalizeFilter extends FilterInputStream
-{
-    InputStream in;
-//    Pattern p = Pattern.compile("[\\s]*#[\\s]*x-no-translate");
-
-    public NoLocalizeFilter( InputStream in ) {
-        super(in);
-        this.in = in;
-    }
-    public int read(byte[] b, int off, int len) throws IOException
-    {
-        String search = new String( b );
-//        Matcher m = p.matcher( search );
-        if( search.contains("x-no-translate" ) )  // TODO: fixme!
-        {
-//            System.out.println("found x-no-translate");
-            in.close();
-            close();
-            System.exit( 0 );
-        }
-        return in.read( b , off , len );
-    }
-}
diff --git a/transex3/java/jpropex/java/OrderedHashMap.java b/transex3/java/jpropex/java/OrderedHashMap.java
deleted file mode 100644
index a462d598b307..000000000000
--- a/transex3/java/jpropex/java/OrderedHashMap.java
+++ /dev/null
@@ -1,96 +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.
- *
- ************************************************************************/
-
-
-import java.util.*;
-
-// LinkedHashMap implrementation
-public class OrderedHashMap
-{
-    private HashMap hm = new HashMap();
-    private LinkedList list  = new LinkedList();
-
-    public Iterator    iterator()   { return list.iterator(); }
-
-    public boolean isEmpty()        { return hm.isEmpty(); }
-    public Object get( Object key ) { return hm.get( key ); }
-    public Object get( int index )  { return hm.get( list.get( index ) ); }
-    public Iterator keys()       { return list.iterator(); }
-    public Object add( Object key , Object value )
-    {
-        list.add( key );
-        return hm.put( key, value );
-    }
-    public Object add( int index , Object key , Object value )
-    {
-        list.add( index , key );
-        return hm.put( key, value );
-    }
-    public Object remove( Object key )
-    {
-        list.remove( list.indexOf( key ) );
-        return hm.remove( key );
-    }
-    public void move( int idxFrom , int idxTo )
-    {
-        Object key = list.get( idxFrom );
-        list.remove( idxFrom );
-        list.add( idxTo , key );
-    }
-    public void move( Object key , int idxTo )
-    {
-       move( list.indexOf( key ) , idxTo );
-    }
-    public int size()
-    {
-        return hm.size();
-    }
-    public Enumeration elements()
-    {
-        return new OHMenum( this );
-    }
-}
-
-final class OHMenum implements Enumeration
-{
-    OrderedHashMap ohm;
-    int index = 0;
-
-    private OHMenum(){};
-    public OHMenum( OrderedHashMap ohm ){
-        this.ohm = ohm ;
-    }
-
-    public boolean hasMoreElements()
-    {
-        return index < ohm.size();
-    }
-    public Object nextElement()
-    {
-        return ohm.get( index++ );
-    }
-}
diff --git a/transex3/java/jpropex/java/SdfData.java b/transex3/java/jpropex/java/SdfData.java
deleted file mode 100644
index 60f218c0ae15..000000000000
--- a/transex3/java/jpropex/java/SdfData.java
+++ /dev/null
@@ -1,108 +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.
- *
- ************************************************************************/
-
-
-import java.util.*;
-import java.io.*;
-
-public class SdfData
-{
-    private String filename;
-    private OrderedHashMap ohm;
-    private LinkedHashSet languagesFound;
-
-    public SdfData()
-    {
-        languagesFound = new LinkedHashSet();
-        ohm = new OrderedHashMap();
-        languagesFound = new LinkedHashSet();
-    }
-    public SdfData( String filename ){
-        this();
-        this.filename = filename;
-    }
-
-    public LinkedHashSet getLanguages()
-    {
-        return languagesFound;
-    }
-    public SdfEntity get( SdfEntity obj )
-    {
-        return (SdfEntity) ohm.get( (String)obj.getId() );
-    }
-    public SdfEntity get( String key ){
-        return (SdfEntity) ohm.get( key );
-    }
-    public void add( SdfEntity obj )
-    {
-        ohm.add( obj.getId() , obj );
-    }
-
-    public void read()
-    {
-        BufferedReader in;
-        try
-        {
-            in = new BufferedReader( new FileReader( filename ) );
-            SdfEntity entity;
-            while( in.ready() )
-            {
-                String line = in.readLine();
-                if( line.length() > 0 )
-                {
-                    entity = new SdfEntity( line );
-                    ohm.add( entity.getId() , entity );        // test if is valid
-                    languagesFound.add( entity.getLangid() );
-                }
-            }
-            in.close();
-        }
-        catch( IOException e )
-        {
-            System.out.println("Error: reading file " + filename);
-            System.exit( -1 );
-        }
-    }
-    public void write( String filename )
-    {
-        FileWriter out;
-        try
-        {
-            out = new FileWriter( filename , true );  // Always append
-            for( Enumeration e = ohm.elements(); e.hasMoreElements(); )
-            {
-                out.write( ( (SdfEntity) e.nextElement() ).toString() + "\n" );
-            }
-            out.close();
-        }
-        catch( IOException e )
-        {
-            System.out.println("Error: Can't write to file " + filename);
-            System.exit( -1 );
-        }
-    }
-}
diff --git a/transex3/java/jpropex/java/SdfEntity.java b/transex3/java/jpropex/java/SdfEntity.java
deleted file mode 100644
index e2c1606ee7c2..000000000000
--- a/transex3/java/jpropex/java/SdfEntity.java
+++ /dev/null
@@ -1,254 +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.
- *
- ************************************************************************/
-
-
-public class SdfEntity implements Cloneable{
-    private String project      = new String("");
-    private String source_file  = new String("");
-    private String dummy1       = new String("");
-    private String resource_type= new String("");
-    private String gid          = new String("");
-    private String lid          = new String("");
-    private String helpid       = new String("");
-    private String platform     = new String("");
-    private String dummy2       = new String("");
-    private String langid       = new String("");
-    private String text         = new String("");
-    private String helptext     = new String("");
-    private String quickhelptext= new String("");
-    private String title        = new String("");
-    private String date         = new String("");
-
-    public static int PROJECT_POS       = 0;
-    public static int SOURCE_FILE_POS   = 1;
-    public static int DUMMY1_POS        = 2;
-    public static int RESOURCE_TYPE_POS = 3;
-    public static int GID_POS           = 4;
-    public static int LID_POS           = 5;
-    public static int HELPID_POS        = 6;
-    public static int PLATFORM_POS      = 7;
-    public static int DUMMY2_POS        = 8;
-    public static int LANGID_POS        = 9;
-    public static int TEXT_POS          = 10;
-    public static int HELPTEXT_POS      = 11;
-    public static int QUICKHELPTEXT_POS = 12;
-    public static int TITLE_POS         = 13;
-    public static int DATE_POS          = 14;
-
-    public Object clone()
-    {
-        try
-        {
-            return super.clone();
-        }
-        catch( CloneNotSupportedException e )
-        {
-            System.out.println("ERROR: Can not clone, soemthing is broken here ....");
-            System.exit( -1 );
-        }
-        return null; // dummy
-    }
-
-    public SdfEntity( String line ){
-        // isValid?
-        setProperties( line ) ;
-    }
-    public SdfEntity(String project, String source_file, String dummy1, String resource_type, String gid, String lid, String helpid, String platform, String dummy2, String langid, String text, String helptext, String quickhelptext, String title , String date) {
-        super();
-        this.project        = project;
-        this.source_file    = source_file;
-        this.dummy1         = dummy1;
-        this.resource_type  = resource_type;
-        this.gid            = gid;
-        this.lid            = lid;
-        this.helpid         = helpid;
-        this.platform       = platform;
-        this.dummy2         = dummy2;
-        this.langid         = langid;
-        this.text           = text;
-        this.helptext       = helptext;
-        this.quickhelptext  = quickhelptext;
-        this.title          = title;
-        this.date           = date;
-    }
-
-    public void setProperties( String line ){
-
-        String[] splitted       = line.split("\t");
-
-        setProject(         splitted[ SdfEntity.PROJECT_POS ]       );
-        setSource_file(     splitted[ SdfEntity.SOURCE_FILE_POS ]   );
-        setDummy1(          splitted[ SdfEntity.DUMMY1_POS ]        );
-        setResource_type(   splitted[ SdfEntity.RESOURCE_TYPE_POS ] );
-        setGid(             splitted[ SdfEntity.GID_POS ]           );
-        setLid(             splitted[ SdfEntity.LID_POS ]           );
-        setHelpid(          splitted[ SdfEntity.HELPID_POS ]        );
-        setPlatform(        splitted[ SdfEntity.PLATFORM_POS ]      );
-        setDummy2(          splitted[ SdfEntity.DUMMY2_POS ]        );
-        setLangid(          splitted[ SdfEntity.LANGID_POS ]        );
-        setText(            splitted[ SdfEntity.TEXT_POS ]          );
-        setHelptext(        splitted[ SdfEntity.HELPTEXT_POS ]      );
-        setQuickhelptext(   splitted[ SdfEntity.QUICKHELPTEXT_POS ] );
-        setTitle(           splitted[ SdfEntity.TITLE_POS ]         );
-        setDate(            splitted[ SdfEntity.DATE_POS ]          );
-    }
-
-    public String getFileId(){
-        return project+"\\"+source_file;
-    }
-    public String getResourcePath(){
-        return source_file.substring(0 , source_file.lastIndexOf( "\\" )-1 );
-    }
-    public String toString(){
-        return project+"\t"+source_file+"\t"+dummy1+"\t"+resource_type+"\t"+gid+"\t"
-              +lid+"\t"+helpid+"\t"+platform+"\t"+dummy2+"\t"+langid+"\t"
-              +text+"\t"+helptext+"\t"+quickhelptext+"\t"+title+"\t"+date;
-    }
-    public String getId(){
-        return project+gid+lid+source_file+resource_type+platform+helpid;
-    }
-
-    public String getDummy1() {
-        return dummy1;
-    }
-
-    public void setDummy1(String dummy1) {
-        this.dummy1 = dummy1;
-    }
-
-    public String getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(String platform) {
-        this.platform = platform;
-    }
-
-    public String getDummy2() {
-        return dummy2;
-    }
-
-    public void setDummy2(String dummy2) {
-        this.dummy2 = dummy2;
-    }
-
-    public String getGid() {
-        return gid;
-    }
-
-    public void setGid(String gid) {
-        this.gid = gid;
-    }
-
-    public String getHelpid() {
-        return helpid;
-    }
-
-    public void setHelpid(String helpid) {
-        this.helpid = helpid;
-    }
-
-    public String getHelptext() {
-        return helptext;
-    }
-
-    public void setHelptext(String helptext) {
-        this.helptext = helptext;
-    }
-
-    public String getLangid() {
-        return langid;
-    }
-
-    public void setLangid(String langid) {
-        this.langid = langid;
-    }
-
-    public String getLid() {
-        return lid;
-    }
-
-    public void setLid(String lid) {
-        this.lid = lid;
-    }
-
-    public String getProject() {
-        return project;
-    }
-
-    public void setProject(String project) {
-        this.project = project;
-    }
-
-    public String getQuickhelptext() {
-        return quickhelptext;
-    }
-
-    public void setQuickhelptext(String quickhelptext) {
-        this.quickhelptext = quickhelptext;
-    }
-
-    public String getResource_type() {
-        return resource_type;
-    }
-
-    public void setResource_type(String resource_type) {
-        this.resource_type = resource_type;
-    }
-
-    public String getSource_file() {
-        return source_file;
-    }
-
-    public void setSource_file(String source_file) {
-        this.source_file = source_file;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    public String getDate() {
-        return date;
-    }
-    public void setDate(String date) {
-        this.date = date;
-    }
-
-
-}
diff --git a/transex3/java/jpropex/jpropex b/transex3/java/jpropex/jpropex
deleted file mode 100755
index 2d62d13b093e..000000000000
--- a/transex3/java/jpropex/jpropex
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-if [ x${JAVA_HOME}x = xx ]; then
-    echo No Java found!
-    exit 1
-fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/jpropex.jar "$@"
diff --git a/transex3/java/jpropex/jpropex.MF b/transex3/java/jpropex/jpropex.MF
deleted file mode 100755
index 3e22e7e9bfbf..000000000000
--- a/transex3/java/jpropex/jpropex.MF
+++ /dev/null
@@ -1 +0,0 @@
-Main-Class: Main
diff --git a/unotools/inc/unotools/configpathes.hxx b/unotools/inc/unotools/configpathes.hxx
index 2a1e76abf1fc..4e537193b22f 100644
--- a/unotools/inc/unotools/configpathes.hxx
+++ b/unotools/inc/unotools/configpathes.hxx
@@ -76,6 +76,9 @@ namespace utl
             If this is not a valid configuration path, it is interpreted as
             a single name of a node.
 
+        @param _sOutPath
+            If non-null, contains the remainder of the path upon return.
+
         @returns
             The plain (non-escaped) name of the node that is the first step
             when traversing <var>_sInPath</var>.<BR/>
@@ -83,7 +86,8 @@ namespace utl
             configuration path, it is returned unaltered.
 
     */
-    UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath(::rtl::OUString const& _sInPath);
+    UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath(
+        ::rtl::OUString const& _sInPath, ::rtl::OUString* _sOutPath = 0);
 
 //----------------------------------------------------------------------------
     /** check whether a path is to a nested node with respect to a parent path.
diff --git a/unotools/source/config/configpathes.cxx b/unotools/source/config/configpathes.cxx
index dc66854a8d43..5e7a4c80813e 100644
--- a/unotools/source/config/configpathes.cxx
+++ b/unotools/source/config/configpathes.cxx
@@ -154,7 +154,7 @@ sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath,
 }
 
 //----------------------------------------------------------------------------
-OUString extractFirstFromConfigurationPath(OUString const& _sInPath)
+OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _sOutPath)
 {
     sal_Int32 nSep      = _sInPath.indexOf('/');
     sal_Int32 nBracket  = _sInPath.indexOf('[');
@@ -179,8 +179,7 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath)
                 nBracket = nEnd;
             }
             OSL_ENSURE(nEnd > nStart && _sInPath[nBracket] == ']', "Invalid config path: improper mismatch of quote or bracket");
-            OSL_DEBUG_ONLY(nSep = nBracket+1);
-            OSL_ENSURE(nSep == _sInPath.getLength() || _sInPath[nSep] == '/', "Invalid config path: brackets not followed by slash");
+            OSL_ENSURE((nBracket+1 == _sInPath.getLength() && nSep == -1) || (_sInPath[nBracket+1] == '/' && nSep == nBracket+1), "Invalid config path: brackets not followed by slash");
         }
         else // ... but our initial element name is in simple form
             nStart = 0;
@@ -188,6 +187,12 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath)
 
     OUString sResult = (nEnd >= 0) ? _sInPath.copy(nStart, nEnd-nStart) : _sInPath;
     lcl_resolveCharEntities(sResult);
+
+    if (_sOutPath != 0)
+    {
+        *_sOutPath = (nSep >= 0) ? _sInPath.copy(nSep + 1) : OUString();
+    }
+
     return sResult;
 }
 
diff --git a/vcl/aqua/inc/salframeview.h b/vcl/aqua/inc/salframeview.h
index 0174c1a68832..996ca54cdfce 100755
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/aqua/inc/salframeview.h
@@ -37,6 +37,7 @@
 }
 -(id)initWithSalFrame: (AquaSalFrame*)pFrame;
 -(MacOSBOOL)canBecomeKeyWindow;
+-(void)displayIfNeeded;
 -(void)windowDidBecomeKey: (NSNotification*)pNotification;
 -(void)windowDidResignKey: (NSNotification*)pNotification;
 -(void)windowDidChangeScreen: (NSNotification*)pNotification;
diff --git a/vcl/aqua/inc/salsys.h b/vcl/aqua/inc/salsys.h
index 6f5c45880e68..ae20706a1756 100644
--- a/vcl/aqua/inc/salsys.h
+++ b/vcl/aqua/inc/salsys.h
@@ -55,11 +55,6 @@ public:
     virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
 
     virtual rtl::OUString GetScreenName( unsigned int nScreen );
-    // overload pure virtual methods
-    virtual int ShowNativeDialog( const String& rTitle,
-                                  const String& rMessage,
-                                  const std::list< String >& rButtons,
-                                  int nDefButton );
     virtual int ShowNativeMessageBox( const String& rTitle,
                                       const String& rMessage,
                                       int nButtonCombination,
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index a90488b98b46..cce018ac6229 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -371,13 +371,13 @@ SalYieldMutex::SalYieldMutex()
 void SalYieldMutex::acquire()
 {
     OMutex::acquire();
-    mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier();
+    mnThreadId = vos::OThread::getCurrentIdentifier();
     mnCount++;
 }
 
 void SalYieldMutex::release()
 {
-    if ( mnThreadId == NAMESPACE_VOS(OThread)::getCurrentIdentifier() )
+    if ( mnThreadId == vos::OThread::getCurrentIdentifier() )
     {
         if ( mnCount == 1 )
             mnThreadId = 0;
@@ -390,7 +390,7 @@ sal_Bool SalYieldMutex::tryToAcquire()
 {
     if ( OMutex::tryToAcquire() )
     {
-        mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier();
+        mnThreadId = vos::OThread::getCurrentIdentifier();
         mnCount++;
         return sal_True;
     }
@@ -537,7 +537,7 @@ ULONG AquaSalInstance::ReleaseYieldMutex()
 {
     SalYieldMutex* pYieldMutex = mpSalYieldMutex;
     if ( pYieldMutex->GetThreadId() ==
-         NAMESPACE_VOS(OThread)::getCurrentIdentifier() )
+         vos::OThread::getCurrentIdentifier() )
     {
         ULONG nCount = pYieldMutex->GetAcquireCount();
         ULONG n = nCount;
@@ -976,6 +976,9 @@ void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
 
 XubString AquaSalInstance::GetDefaultPrinter()
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( ! maDefaultPrinter.getLength() )
     {
         NSPrintInfo* pPI = [NSPrintInfo sharedPrintInfo];
@@ -1000,6 +1003,9 @@ XubString AquaSalInstance::GetDefaultPrinter()
 SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                 ImplJobSetup* pSetupData )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     SalInfoPrinter* pNewInfoPrinter = NULL;
     if( pQueueInfo )
     {
@@ -1015,6 +1021,9 @@ SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueI
 
 void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     delete pPrinter;
 }
 
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 3b548099feef..cf5cf00b7fe4 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -30,9 +30,11 @@
 
 #include "tools/rc.hxx"
 #include "vcl/svids.hrc"
+#include "vcl/button.hxx"
 
 #include "salsys.h"
 #include "saldata.hxx"
+#include "salinst.h"
 #include "rtl/ustrbuf.hxx"
 
 using namespace rtl;
@@ -114,12 +116,22 @@ rtl::OUString AquaSalSystem::GetScreenName( unsigned int nScreen )
    return aRet;
 }
 
-int AquaSalSystem::ShowNativeDialog( const String& rTitle,
-                                    const String& rMessage,
-                                    const std::list< String >& rButtons,
-                                    int nDefButton )
+static NSString* getStandardString( int nButtonId )
 {
-    return 0;
+    rtl::OUString aText( Button::GetStandardText( nButtonId ) );
+    if( ! aText.getLength() ) // this is for bad cases, we might be missing the vcl resource
+    {
+        switch( nButtonId )
+        {
+        case BUTTON_OK:         aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OK" ) );break;
+        case BUTTON_ABORT:      aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Abort" ) );break;
+        case BUTTON_CANCEL:     aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cancel" ) );break;
+        case BUTTON_RETRY:      aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Retry" ) );break;
+        case BUTTON_YES:        aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Yes" ) );break;
+        case BUTTON_NO :        aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No" ) );break;
+        }
+    }
+    return aText.getLength() ? CreateNSString( aText) : nil;
 }
 
 int AquaSalSystem::ShowNativeMessageBox( const String& rTitle,
@@ -127,5 +139,82 @@ int AquaSalSystem::ShowNativeMessageBox( const String& rTitle,
                                         int nButtonCombination,
                                         int nDefaultButton)
 {
-    return 0;
+    NSString* pTitle = CreateNSString( rTitle );
+    NSString* pMessage = CreateNSString( rMessage );
+
+    struct id_entry
+    {
+        int nCombination;
+        int nDefaultButton;
+        int nTextIds[3];
+    } aButtonIds[] =
+    {
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK, { BUTTON_OK, -1, -1 } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK, { BUTTON_OK, BUTTON_CANCEL, -1 } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_OK_CANCEL, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL, { BUTTON_CANCEL, BUTTON_OK, -1 } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_ABORT_RETRY_IGNORE, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_ABORT, { BUTTON_ABORT, BUTTON_IGNORE, BUTTON_RETRY } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_ABORT_RETRY_IGNORE, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_RETRY, { BUTTON_RETRY, BUTTON_IGNORE, BUTTON_ABORT } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_ABORT_RETRY_IGNORE, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_IGNORE, { BUTTON_IGNORE, BUTTON_IGNORE, BUTTON_ABORT } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO_CANCEL, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES, { BUTTON_YES, BUTTON_NO, BUTTON_CANCEL } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO_CANCEL, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO, { BUTTON_NO, BUTTON_YES, BUTTON_CANCEL } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO_CANCEL, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL, { BUTTON_CANCEL, BUTTON_YES, BUTTON_NO } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES, { BUTTON_YES, BUTTON_NO, -1 } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_YES_NO, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO, { BUTTON_NO, BUTTON_YES, -1 } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_RETRY, { BUTTON_RETRY, BUTTON_CANCEL, -1 } },
+        { SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_RETRY_CANCEL, SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL, { BUTTON_CANCEL, BUTTON_RETRY, -1 } }
+    };
+
+    NSString* pDefText = nil;
+    NSString* pAltText = nil;
+    NSString* pOthText = nil;
+
+    unsigned int nC;
+    for( nC = 0; nC < sizeof(aButtonIds)/sizeof(aButtonIds[0]); nC++ )
+    {
+        if( aButtonIds[nC].nCombination == nButtonCombination )
+        {
+            if( aButtonIds[nC].nDefaultButton == nDefaultButton )
+            {
+                if( aButtonIds[nC].nTextIds[0] != -1 )
+                    pDefText = getStandardString( aButtonIds[nC].nTextIds[0] );
+                if( aButtonIds[nC].nTextIds[1] != -1 )
+                    pAltText = getStandardString( aButtonIds[nC].nTextIds[1] );
+                if( aButtonIds[nC].nTextIds[2] != -1 )
+                    pOthText = getStandardString( aButtonIds[nC].nTextIds[2] );
+                break;
+            }
+        }
+    }
+
+
+    int nResult = NSRunAlertPanel( pTitle, pMessage, pDefText, pAltText, pOthText );
+
+    if( pTitle )
+        [pTitle release];
+    if( pMessage )
+        [pMessage release];
+    if( pDefText )
+        [pDefText release];
+    if( pAltText )
+        [pAltText release];
+    if( pOthText )
+        [pOthText release];
+
+    int nRet = 0;
+    if( nC < sizeof(aButtonIds)/sizeof(aButtonIds[0]) && nResult >= 1 && nResult <= 3 )
+    {
+        int nPressed = aButtonIds[nC].nTextIds[nResult-1];
+        switch( nPressed )
+        {
+        case BUTTON_NO:     nRet = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO; break;
+        case BUTTON_YES:    nRet = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES; break;
+        case BUTTON_OK:     nRet = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK; break;
+        case BUTTON_CANCEL: nRet = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_CANCEL; break;
+        case BUTTON_ABORT:  nRet = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_ABORT; break;
+        case BUTTON_RETRY:  nRet = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_RETRY; break;
+        case BUTTON_IGNORE: nRet = SALSYSTEM_SHOWNATIVEMSGBOX_BTN_IGNORE; break;
+        }
+    }
+
+    return nRet;
 }
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index adb247d70711..1a8f950e50d4 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -38,6 +38,7 @@
 #include "DragSourceContext.hxx"
 #include "aqua_clipboard.hxx"
 #include "DragActionConversion.hxx"
+#include "salframe.h"
 
 #include <rtl/ustring.h>
 #include <memory>
@@ -158,6 +159,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
 DragSource::DragSource():
   WeakComponentImplHelper3<XDragSource, XInitialization, XServiceInfo>(m_aMutex),
   mView(NULL),
+  mpFrame(NULL),
   mLastMouseEventBeforeStartDrag(nil),
   m_MouseButton(0)
 {
@@ -166,8 +168,9 @@ DragSource::DragSource():
 
 DragSource::~DragSource()
 {
-  [(id <MouseEventListener>)mView unregisterMouseEventListener: mDragSourceHelper];
-  [mDragSourceHelper release];
+    if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
+        [(id <MouseEventListener>)mView unregisterMouseEventListener: mDragSourceHelper];
+    [mDragSourceHelper release];
 }
 
 
@@ -197,6 +200,13 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
       throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view doesn't support mouse listener")),
                       static_cast<OWeakObject*>(this));
     }
+  NSWindow* pWin = [mView window];
+  if( ! pWin || ![pWin respondsToSelector: @selector(getSalFrame)] )
+  {
+      throw Exception(OUString(RTL_CONSTASCII_USTRINGPARAM("DragSource::initialize: Provided view is not attached to a vcl frame")),
+                      static_cast<OWeakObject*>(this));
+  }
+  mpFrame = (AquaSalFrame*)[pWin performSelector: @selector(getSalFrame)];
 
   mDragSourceHelper = [[DragSourceHelper alloc] initWithDragSource: this];
 
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 5d02b9874149..f8f55176a308 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.hxx
@@ -46,6 +46,7 @@
 
 
 class DragSource;
+class AquaSalFrame;
 
 /* The functions declared in this protocol are actually
    declared in vcl/aqua/inc/salframe.h. Because we want
@@ -120,6 +121,7 @@ public:
   com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDragSourceContext > mXCurrentContext;
 
   id mView;
+  AquaSalFrame* mpFrame;
   NSEvent* mLastMouseEventBeforeStartDrag;
   DragSourceHelper* mDragSourceHelper;
   com::sun::star::awt::MouseEvent mMouseEvent;
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index d00fc9a6cd0e..d19290d8320a 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -112,7 +112,7 @@ class ControllerProperties
       maLocalizedStrings( VclResId( SV_PRINT_NATIVE_STRINGS ) )
     {
         mpState->bNeedRestart = false;
-        DBG_ASSERT( maLocalizedStrings.Count() >= 4, "resources not found !" );
+        DBG_ASSERT( maLocalizedStrings.Count() >= 5, "resources not found !" );
     }
     
     rtl::OUString getMoreString()
@@ -122,6 +122,13 @@ class ControllerProperties
                : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "More" ) );
     }
     
+    rtl::OUString getPrintSelectionString()
+    {
+        return maLocalizedStrings.Count() >= 5
+               ? rtl::OUString( maLocalizedStrings.GetString( 4 ) )
+               : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Print selection only" ) );
+    }
+    
     void updatePrintJob()
     {
         // TODO: refresh page count etc from mpController 
@@ -246,7 +253,11 @@ class ControllerProperties
             PropertyValue* pVal = mpController->getValue( name_it->second );
             if( pVal )
             {
-                pVal->Value <<= i_bValue;
+                // ugly
+                if( name_it->second.equalsAscii( "PrintContent" ) )
+                   pVal->Value <<= i_bValue ? sal_Int32(2) : sal_Int32(0);
+               else
+                   pVal->Value <<= i_bValue;
                 updatePrintJob(); 
             }
         }
@@ -283,7 +294,7 @@ class ControllerProperties
                        -1;
             
             std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( nTag );
-            if( name_it != maTagToPropertyName.end() )
+            if( name_it != maTagToPropertyName.end() && ! name_it->second.equalsAscii( "PrintContent" ) )
             {
                 MacOSBOOL bEnabled = mpController->isUIOptionEnabled( name_it->second ) ? YES : NO;
                 if( pCtrl )
@@ -768,6 +779,319 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
     }
 }
 
+static void addSubgroup( NSView* pCurParent, long& rCurY, const rtl::OUString& rText )
+{
+    NSControl* pTextView = createLabel( rText );
+    [pCurParent addSubview: [pTextView autorelease]];                
+    NSRect aTextRect = [pTextView frame];
+    // move to nCurY
+    aTextRect.origin.y = rCurY - aTextRect.size.height;
+    [pTextView setFrame: aTextRect];
+    
+    NSRect aSepRect = { { aTextRect.size.width + 1, aTextRect.origin.y }, { 100, 6 } };
+    NSBox* pBox = [[NSBox alloc] initWithFrame: aSepRect];
+    [pBox setBoxType: NSBoxSeparator];
+    [pCurParent addSubview: [pBox autorelease]];
+    
+    // update nCurY
+    rCurY = aTextRect.origin.y - 5;
+}
+
+static void addBool( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+                    const rtl::OUString& rText, sal_Bool bEnabled,
+                    const rtl::OUString& rProperty, sal_Bool bValue,
+                    std::vector<ColumnItem >& rRightColumn,
+                    ControllerProperties* pControllerProperties,
+                    ControlTarget* pCtrlTarget
+                    )
+{
+    NSRect aCheckRect = { { rCurX + nAttachOffset, 0 }, { 0, 15 } };
+    NSButton* pBtn = [[NSButton alloc] initWithFrame: aCheckRect];
+    [pBtn setButtonType: NSSwitchButton];                
+    [pBtn setState: bValue ? NSOnState : NSOffState];
+    if( ! bEnabled )
+        [pBtn setEnabled: NO];
+    linebreakCell( [pBtn cell], rText );
+    [pBtn sizeToFit];
+    [pCurParent addSubview: [pBtn autorelease]];
+    
+    rRightColumn.push_back( ColumnItem( pBtn ) );
+    
+    // connect target
+    [pBtn setTarget: pCtrlTarget];
+    [pBtn setAction: @selector(triggered:)];
+    int nTag = pControllerProperties->addNameTag( rProperty );
+    pControllerProperties->addObservedControl( pBtn );
+    [pBtn setTag: nTag];
+    
+    aCheckRect = [pBtn frame];
+    
+    // move to rCurY
+    aCheckRect.origin.y = rCurY - aCheckRect.size.height;
+    [pBtn setFrame: aCheckRect];
+    
+    // update rCurY
+    rCurY = aCheckRect.origin.y - 5;
+}
+
+static void addRadio( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+                     const rtl::OUString& rText,
+                     const rtl::OUString& rProperty, Sequence< rtl::OUString > rChoices, sal_Int32 nSelectValue,
+                     std::vector<ColumnItem >& rLeftColumn,
+                     std::vector<ColumnItem >& rRightColumn,
+                     ControllerProperties* pControllerProperties,
+                     ControlTarget* pCtrlTarget
+                     )
+{
+    sal_Int32 nOff = 0;
+    if( rText.getLength() )
+    {
+        // add a label
+        NSControl* pTextView = createLabel( rText );
+        NSRect aTextRect = [pTextView frame];
+        aTextRect.origin.x = rCurX + nAttachOffset;
+        [pCurParent addSubview: [pTextView autorelease]];
+        
+        rLeftColumn.push_back( ColumnItem( pTextView ) );
+        
+        // move to nCurY
+        aTextRect.origin.y = rCurY - aTextRect.size.height;
+        [pTextView setFrame: aTextRect];
+        
+        // update nCurY
+        rCurY = aTextRect.origin.y - 5;
+        
+        // indent the radio group relative to the text
+        // nOff = 20;
+    }
+    
+    // setup radio matrix
+    NSButtonCell* pProto = [[NSButtonCell alloc] init];
+    
+    NSRect aRadioRect = { { rCurX + nOff, 0 }, { 280 - rCurX, 5*rChoices.getLength() } };
+    [pProto setTitle: @"RadioButtonGroup"];
+    [pProto setButtonType: NSRadioButton];
+    NSMatrix* pMatrix = [[NSMatrix alloc] initWithFrame: aRadioRect
+                                          mode: NSRadioModeMatrix
+                                          prototype: (NSCell*)pProto
+                                          numberOfRows: rChoices.getLength()
+                                          numberOfColumns: 1];
+    // set individual titles
+    NSArray* pCells = [pMatrix cells];
+    for( sal_Int32 m = 0; m < rChoices.getLength(); m++ )
+    {
+        NSCell* pCell = [pCells objectAtIndex: m];
+        filterAccelerator( rChoices[m] );
+        linebreakCell( pCell, rChoices[m] );
+        // connect target and action
+        [pCell setTarget: pCtrlTarget];
+        [pCell setAction: @selector(triggered:)];
+        int nTag = pControllerProperties->addNameAndValueTag( rProperty, m );
+        pControllerProperties->addObservedControl( pCell );
+        [pCell setTag: nTag];
+        // set current selection
+        if( nSelectValue == m )
+            [pMatrix selectCellAtRow: m column: 0];
+    }
+    [pMatrix sizeToFit];
+    aRadioRect = [pMatrix frame];
+    
+    // move it down, so it comes to the correct position
+    aRadioRect.origin.y = rCurY - aRadioRect.size.height;
+    [pMatrix setFrame: aRadioRect];
+    [pCurParent addSubview: [pMatrix autorelease]];
+    
+    rRightColumn.push_back( ColumnItem( pMatrix ) );
+    
+    // update nCurY
+    rCurY = aRadioRect.origin.y - 5;
+    
+    [pProto release];
+}
+
+static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+                    const rtl::OUString& rText,
+                    const rtl::OUString& rProperty, const Sequence< rtl::OUString > rChoices, sal_Int32 nSelectValue,
+                    std::vector<ColumnItem >& rLeftColumn,
+                    std::vector<ColumnItem >& rRightColumn,
+                    ControllerProperties* pControllerProperties,
+                    ControlTarget* pCtrlTarget
+                    )
+{
+    // don't indent attached lists, looks bad in the existing cases
+    NSControl* pTextView = createLabel( rText );
+    [pCurParent addSubview: [pTextView autorelease]];
+    rLeftColumn.push_back( ColumnItem( pTextView ) );
+    NSRect aTextRect = [pTextView frame];
+    aTextRect.origin.x = rCurX /* + nAttachOffset*/;
+
+    // don't indent attached lists, looks bad in the existing cases
+    NSRect aBtnRect = { { rCurX /*+ nAttachOffset*/ + aTextRect.size.width, 0 }, { 0, 15 } };
+    NSPopUpButton* pBtn = [[NSPopUpButton alloc] initWithFrame: aBtnRect pullsDown: NO];
+
+    // iterate options
+    for( sal_Int32 m = 0; m < rChoices.getLength(); m++ )
+    {
+        NSString* pItemText = CreateNSString( rChoices[m] );
+        [pBtn addItemWithTitle: pItemText];
+        NSMenuItem* pItem = [pBtn itemWithTitle: pItemText];
+        int nTag = pControllerProperties->addNameAndValueTag( rProperty, m );
+        [pItem setTag: nTag];
+        [pItemText release];
+    }
+
+    [pBtn selectItemAtIndex: nSelectValue];
+    
+    // add the button to observed controls for enabled state changes
+    // also add a tag just for this purpose
+    pControllerProperties->addObservedControl( pBtn );
+    [pBtn setTag: pControllerProperties->addNameTag( rProperty )];
+
+    [pBtn sizeToFit];
+    [pCurParent addSubview: [pBtn autorelease]];
+    
+    rRightColumn.push_back( ColumnItem( pBtn ) );
+
+    // connect target and action
+    [pBtn setTarget: pCtrlTarget];
+    [pBtn setAction: @selector(triggered:)];
+    
+    // move to nCurY
+    aBtnRect = [pBtn frame];
+    aBtnRect.origin.y = rCurY - aBtnRect.size.height;
+    [pBtn setFrame: aBtnRect];
+    
+    // align label
+    aTextRect.origin.y = aBtnRect.origin.y + (aBtnRect.size.height - aTextRect.size.height)/2;
+    [pTextView setFrame: aTextRect];
+
+    // update rCurY
+    rCurY = aBtnRect.origin.y - 5;
+}
+
+static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+                    const rtl::OUString rCtrlType,
+                    const rtl::OUString& rText,
+                    const rtl::OUString& rProperty, const PropertyValue* pValue,
+                    sal_Int64 nMinValue, sal_Int64 nMaxValue,
+                    std::vector<ColumnItem >& rLeftColumn,
+                    std::vector<ColumnItem >& rRightColumn,
+                    ControllerProperties* pControllerProperties,
+                    ControlTarget* pCtrlTarget
+                    )
+{
+    sal_Int32 nOff = 0;
+    if( rText.getLength() )
+    {
+        // add a label
+        NSControl* pTextView = createLabel( rText );
+        [pCurParent addSubview: [pTextView autorelease]];
+        
+        rLeftColumn.push_back( ColumnItem( pTextView ) );
+        
+        // move to nCurY
+        NSRect aTextRect = [pTextView frame];
+        aTextRect.origin.x = rCurX + nAttachOffset;
+        aTextRect.origin.y = rCurY - aTextRect.size.height;
+        [pTextView setFrame: aTextRect];
+        
+        // update nCurY
+        rCurY = aTextRect.origin.y - 5;
+        
+        // and set the offset for the real edit field
+        nOff = aTextRect.size.width + 5;
+    }
+    
+    NSRect aFieldRect = { { rCurX + nOff +  nAttachOffset, 0 }, { 100, 25 } };
+    NSTextField* pFieldView = [[NSTextField alloc] initWithFrame: aFieldRect];
+    [pFieldView setEditable: YES];
+    [pFieldView setSelectable: YES];
+    [pFieldView setDrawsBackground: YES];
+    [pFieldView sizeToFit]; // FIXME: this does nothing
+    [pCurParent addSubview: [pFieldView autorelease]];
+    
+    rRightColumn.push_back( ColumnItem( pFieldView ) );
+    
+    // add the field to observed controls for enabled state changes
+    // also add a tag just for this purpose
+    pControllerProperties->addObservedControl( pFieldView );
+    int nTag = pControllerProperties->addNameTag( rProperty );
+    [pFieldView setTag: nTag];
+    // pControllerProperties->addNamedView( pFieldView, aPropertyName );
+
+    // move to nCurY
+    aFieldRect.origin.y = rCurY - aFieldRect.size.height;
+    [pFieldView setFrame: aFieldRect];
+
+    if( rCtrlType.equalsAscii( "Range" ) )
+    {
+        // add a stepper control
+        NSRect aStepFrame = { { aFieldRect.origin.x + aFieldRect.size.width + 5,
+                                aFieldRect.origin.y },
+                            { 15, aFieldRect.size.height } };
+        NSStepper* pStep = [[NSStepper alloc] initWithFrame: aStepFrame];
+        [pStep setIncrement: 1];
+        [pStep setValueWraps: NO];
+        [pStep setTag: nTag];
+        [pCurParent addSubview: [pStep autorelease]];
+        
+        rRightColumn.back().pSubControl = pStep;
+        
+        pControllerProperties->addObservedControl( pStep );
+        [pStep setTarget: pCtrlTarget];
+        [pStep setAction: @selector(triggered:)];
+        
+        // constrain the text field to decimal numbers
+        NSNumberFormatter* pFormatter = [[NSNumberFormatter alloc] init];
+        [pFormatter setFormatterBehavior: NSNumberFormatterBehavior10_4];
+        [pFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
+        [pFormatter setAllowsFloats: NO];
+        [pFormatter setMaximumFractionDigits: 0];
+        if( nMinValue != nMaxValue )
+        {
+            [pFormatter setMinimum: [[NSNumber numberWithInt: nMinValue] autorelease]];
+            [pStep setMinValue: nMinValue];
+            [pFormatter setMaximum: [[NSNumber numberWithInt: nMaxValue] autorelease]];
+            [pStep setMaxValue: nMaxValue];
+        }
+        [pFieldView setFormatter: pFormatter];
+
+        sal_Int64 nSelectVal = 0;
+        if( pValue && pValue->Value.hasValue() )
+            pValue->Value >>= nSelectVal;
+        
+        [pFieldView setIntValue: nSelectVal];
+        [pStep setIntValue: nSelectVal];
+
+        pControllerProperties->addViewPair( pFieldView, pStep );
+        // connect target and action
+        [pFieldView setTarget: pCtrlTarget];
+        [pFieldView setAction: @selector(triggeredNumeric:)];
+        [pStep setTarget: pCtrlTarget];
+        [pStep setAction: @selector(triggeredNumeric:)];
+    }
+    else
+    {
+        // connect target and action
+        [pFieldView setTarget: pCtrlTarget];
+        [pFieldView setAction: @selector(triggered:)];
+
+        if( pValue && pValue->Value.hasValue() )
+        {
+            rtl::OUString aValue;
+            pValue->Value >>= aValue;
+            if( aValue.getLength() )
+            {
+                NSString* pText = CreateNSString( aValue );
+                [pFieldView setStringValue: pText];
+                [pText release];
+            }
+        }
+    }
+
+    // update nCurY
+    rCurY = aFieldRect.origin.y - 5;
+}
 
 @implementation AquaPrintAccessoryView
 +(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController  withState: (PrintAccessoryViewState*)pState;
@@ -792,6 +1116,54 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
     ControlTarget* pCtrlTarget = [[ControlTarget alloc] initWithControllerMap: pControllerProperties];
     
     std::vector< ColumnItem > aLeftColumn, aRightColumn;
+    
+    // ugly:
+    // prepend a "selection" checkbox if the properties have such a selection in PrintContent
+    bool bAddSelectionCheckBox = false, bSelectionBoxEnabled = false, bSelectionBoxChecked = false;
+    for( int i = 0; i < rOptions.getLength(); i++ )
+    {
+        Sequence< beans::PropertyValue > aOptProp;
+        rOptions[i].Value >>= aOptProp;
+
+        rtl::OUString aCtrlType;
+        rtl::OUString aPropertyName;
+        Sequence< rtl::OUString > aChoices;
+        Sequence< sal_Bool > aChoicesDisabled;
+        sal_Int32 aSelectionChecked = 0;
+        for( int n = 0; n < aOptProp.getLength(); n++ )
+        {
+            const beans::PropertyValue& rEntry( aOptProp[ n ] );
+            if( rEntry.Name.equalsAscii( "ControlType" ) )
+            {
+                rEntry.Value >>= aCtrlType;
+            }
+            else if( rEntry.Name.equalsAscii( "Choices" ) )
+            {
+                rEntry.Value >>= aChoices;
+            }
+            else if( rEntry.Name.equalsAscii( "ChoicesDisabled" ) )
+            {
+                rEntry.Value >>= aChoicesDisabled;
+            }
+            else if( rEntry.Name.equalsAscii( "Property" ) )
+            {
+                PropertyValue aVal;
+                rEntry.Value >>= aVal;
+                aPropertyName = aVal.Name;
+                if( aPropertyName.equalsAscii( "PrintContent" ) )
+                    aVal.Value >>= aSelectionChecked;
+            }
+        }
+        if( aCtrlType.equalsAscii( "Radio" ) &&
+            aPropertyName.equalsAscii( "PrintContent" ) &&
+            aChoices.getLength() > 2 )
+        {
+            bAddSelectionCheckBox = true;
+            bSelectionBoxEnabled = aChoicesDisabled.getLength() < 2 || ! aChoicesDisabled[2];
+            bSelectionBoxChecked = (aSelectionChecked==2);
+            break;
+        }
+    }
 
     for( int i = 0; i < rOptions.getLength(); i++ )
     {
@@ -803,6 +1175,7 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
         rtl::OUString aCtrlType;
         rtl::OUString aText;
         rtl::OUString aPropertyName;
+        rtl::OUString aGroupHint;
         Sequence< rtl::OUString > aChoices;
         sal_Int64 nMinValue = 0, nMaxValue = 0;
         long nAttachOffset = 0;
@@ -852,6 +1225,10 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
             {
                 rEntry.Value >>= bIgnore;
             }
+            else if( rEntry.Name.equalsAscii( "GroupingHint" ) )
+            {
+                rEntry.Value >>= aGroupHint;
+            }
         }
 
         if( aCtrlType.equalsAscii( "Group" ) ||
@@ -894,6 +1271,15 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
                 // clear columns
                 aLeftColumn.clear();
                 aRightColumn.clear();
+
+                if( bAddSelectionCheckBox )
+                {
+                    addBool( pCurParent, nCurX, nCurY, 0,
+                             pControllerProperties->getPrintSelectionString(), bSelectionBoxEnabled,
+                             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ), bSelectionBoxChecked,
+                             aRightColumn, pControllerProperties, pCtrlTarget );
+                    bAddSelectionCheckBox = false;
+                }
             }
             
             if( aCtrlType.equalsAscii( "Subgroup" ) && pCurParent )
@@ -902,302 +1288,56 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
                 if( bIgnore )
                     continue;
                 
-                NSControl* pTextView = createLabel( aText );
-                [pCurParent addSubview: [pTextView autorelease]];                
-                NSRect aTextRect = [pTextView frame];
-                // move to nCurY
-                aTextRect.origin.y = nCurY - aTextRect.size.height;
-                [pTextView setFrame: aTextRect];
-
-                NSRect aSepRect = { { aTextRect.size.width + 1, aTextRect.origin.y }, { 100, 6 } };
-                NSBox* pBox = [[NSBox alloc] initWithFrame: aSepRect];
-                [pBox setBoxType: NSBoxSeparator];
-                [pCurParent addSubview: [pBox autorelease]];
-                
-                // update nCurY
-                nCurY = aTextRect.origin.y - 5;
+                addSubgroup( pCurParent, nCurY, aText );
             }
             else if( bIgnoreSubgroup || bIgnore )
+            {
                 continue;
+            }
             else if( aCtrlType.equalsAscii( "Bool" ) && pCurParent )
             {
-                NSRect aCheckRect = { { nCurX + nAttachOffset, 0 }, { 0, 15 } };
-                NSButton* pBtn = [[NSButton alloc] initWithFrame: aCheckRect];
-                [pBtn setButtonType: NSSwitchButton];                
                 sal_Bool bVal = sal_False;                
                 PropertyValue* pVal = pController->getValue( aPropertyName );
                 if( pVal )
                     pVal->Value >>= bVal;
-                [pBtn setState: bVal ? NSOnState : NSOffState];
-                linebreakCell( [pBtn cell], aText );
-                [pBtn sizeToFit];
-                [pCurParent addSubview: [pBtn autorelease]];
-                
-                aRightColumn.push_back( ColumnItem( pBtn ) );
-                
-                // connect target
-                [pBtn setTarget: pCtrlTarget];
-                [pBtn setAction: @selector(triggered:)];
-                int nTag = pControllerProperties->addNameTag( aPropertyName );
-                pControllerProperties->addObservedControl( pBtn );
-                [pBtn setTag: nTag];
-
-                aCheckRect = [pBtn frame];
-
-                // move to nCurY
-                aCheckRect.origin.y = nCurY - aCheckRect.size.height;
-                [pBtn setFrame: aCheckRect];
-
-                // update nCurY
-                nCurY = aCheckRect.origin.y - 5;
+                addBool( pCurParent, nCurX, nCurY, nAttachOffset,
+                         aText, true, aPropertyName, bVal,
+                         aRightColumn, pControllerProperties, pCtrlTarget );
             }
             else if( aCtrlType.equalsAscii( "Radio" ) && pCurParent )
             {
-                sal_Int32 nOff = 0;
-                if( aText.getLength() )
-                {
-                    // add a label
-                    NSControl* pTextView = createLabel( aText );
-                    NSRect aTextRect = [pTextView frame];
-                    aTextRect.origin.x = nCurX + nAttachOffset;
-                    [pCurParent addSubview: [pTextView autorelease]];
-                    
-                    aLeftColumn.push_back( ColumnItem( pTextView ) );
-    
-                    // move to nCurY
-                    aTextRect.origin.y = nCurY - aTextRect.size.height;
-                    [pTextView setFrame: aTextRect];
-                    
-                    // update nCurY
-                    nCurY = aTextRect.origin.y - 5;
-                    
-                    // indent the radio group relative to the text
-                    // nOff = 20;
-                }
-                
-                // setup radio matrix
-                NSButtonCell* pProto = [[NSButtonCell alloc] init];
-                
-                NSRect aRadioRect = { { nCurX + nOff, 0 }, { 280 - nCurX, 5*aChoices.getLength() } };
-                [pProto setTitle: @"RadioButtonGroup"];
-                [pProto setButtonType: NSRadioButton];
-                NSMatrix* pMatrix = [[NSMatrix alloc] initWithFrame: aRadioRect
-                                                      mode: NSRadioModeMatrix
-                                                      prototype: (NSCell*)pProto
-                                                      numberOfRows: aChoices.getLength()
-                                                      numberOfColumns: 1];
                 // get currently selected value
                 sal_Int32 nSelectVal = 0;
                 PropertyValue* pVal = pController->getValue( aPropertyName );
                 if( pVal && pVal->Value.hasValue() )
                     pVal->Value >>= nSelectVal;
-                // set individual titles
-                NSArray* pCells = [pMatrix cells];
-                for( sal_Int32 m = 0; m < aChoices.getLength(); m++ )
-                {
-                    NSCell* pCell = [pCells objectAtIndex: m];
-                    filterAccelerator( aChoices[m] );
-                    linebreakCell( pCell, aChoices[m] );
-                    //NSString* pTitle = CreateNSString( aChoices[m] );
-                    //[pCell setTitle: pTitle];
-                    // connect target and action
-                    [pCell setTarget: pCtrlTarget];
-                    [pCell setAction: @selector(triggered:)];
-                    int nTag = pControllerProperties->addNameAndValueTag( aPropertyName, m );
-                    pControllerProperties->addObservedControl( pCell );
-                    [pCell setTag: nTag];
-                    //[pTitle release];
-                    // set current selection
-                    if( nSelectVal == m )
-                        [pMatrix selectCellAtRow: m column: 0];
-                }
-                [pMatrix sizeToFit];
-                aRadioRect = [pMatrix frame];
 
-                // move it down, so it comes to the correct position
-                aRadioRect.origin.y = nCurY - aRadioRect.size.height;
-                [pMatrix setFrame: aRadioRect];
-                [pCurParent addSubview: [pMatrix autorelease]];
-
-                aRightColumn.push_back( ColumnItem( pMatrix ) );
-
-                // update nCurY
-                nCurY = aRadioRect.origin.y - 5;
-                
-                [pProto release];
+                addRadio( pCurParent, nCurX, nCurY, nAttachOffset,
+                          aText, aPropertyName, aChoices, nSelectVal,
+                          aLeftColumn, aRightColumn,
+                          pControllerProperties, pCtrlTarget );
             }
             else if( aCtrlType.equalsAscii( "List" ) && pCurParent )
             {
-                // don't indent attached lists, looks bad in the existing cases
-                NSControl* pTextView = createLabel( aText );
-                [pCurParent addSubview: [pTextView autorelease]];
-                aLeftColumn.push_back( ColumnItem( pTextView ) );
-                NSRect aTextRect = [pTextView frame];
-                aTextRect.origin.x = nCurX /* + nAttachOffset*/;
-
-                // don't indent attached lists, looks bad in the existing cases
-                NSRect aBtnRect = { { nCurX /*+ nAttachOffset*/ + aTextRect.size.width, 0 }, { 0, 15 } };
-                NSPopUpButton* pBtn = [[NSPopUpButton alloc] initWithFrame: aBtnRect pullsDown: NO];
-
-                // iterate options
-                for( sal_Int32 m = 0; m < aChoices.getLength(); m++ )
-                {
-                    NSString* pItemText = CreateNSString( aChoices[m] );
-                    [pBtn addItemWithTitle: pItemText];
-                    NSMenuItem* pItem = [pBtn itemWithTitle: pItemText];
-                    int nTag = pControllerProperties->addNameAndValueTag( aPropertyName, m );
-                    [pItem setTag: nTag];
-                    [pItemText release];
-                }
-
                 PropertyValue* pVal = pController->getValue( aPropertyName );
                 sal_Int32 aSelectVal = 0;
                 if( pVal && pVal->Value.hasValue() )
                     pVal->Value >>= aSelectVal;
-                [pBtn selectItemAtIndex: aSelectVal];
-                
-                // add the button to observed controls for enabled state changes
-                // also add a tag just for this purpose
-                pControllerProperties->addObservedControl( pBtn );
-                [pBtn setTag: pControllerProperties->addNameTag( aPropertyName )];
-
-                [pBtn sizeToFit];
-                [pCurParent addSubview: [pBtn autorelease]];
-                
-                aRightColumn.push_back( ColumnItem( pBtn ) );
-
-                // connect target and action
-                [pBtn setTarget: pCtrlTarget];
-                [pBtn setAction: @selector(triggered:)];
-                
-                // move to nCurY
-                aBtnRect = [pBtn frame];
-                aBtnRect.origin.y = nCurY - aBtnRect.size.height;
-                [pBtn setFrame: aBtnRect];
-                
-                // align label
-                aTextRect.origin.y = aBtnRect.origin.y + (aBtnRect.size.height - aTextRect.size.height)/2;
-                [pTextView setFrame: aTextRect];
 
-                // update nCurY
-                nCurY = aBtnRect.origin.y - 5;
+                addList( pCurParent, nCurX, nCurY, nAttachOffset,
+                         aText, aPropertyName, aChoices, aSelectVal,
+                         aLeftColumn, aRightColumn,
+                         pControllerProperties, pCtrlTarget );
             }
             else if( (aCtrlType.equalsAscii( "Edit" ) || aCtrlType.equalsAscii( "Range" )) && pCurParent )
             {
-                sal_Int32 nOff = 0;
-                if( aText.getLength() )
-                {
-                    // add a label
-                    NSControl* pTextView = createLabel( aText );
-                    [pCurParent addSubview: [pTextView autorelease]];
-                    
-                    aLeftColumn.push_back( ColumnItem( pTextView ) );
-                    
-                    // move to nCurY
-                    NSRect aTextRect = [pTextView frame];
-                    aTextRect.origin.x = nCurX + nAttachOffset;
-                    aTextRect.origin.y = nCurY - aTextRect.size.height;
-                    [pTextView setFrame: aTextRect];
-                    
-                    // update nCurY
-                    nCurY = aTextRect.origin.y - 5;
-                    
-                    // and set the offset for the real edit field
-                    nOff = aTextRect.size.width + 5;
-                }
-                
-                NSRect aFieldRect = { { nCurX + nOff +  nAttachOffset, 0 }, { 100, 25 } };
-                NSTextField* pFieldView = [[NSTextField alloc] initWithFrame: aFieldRect];
-                [pFieldView setEditable: YES];
-                [pFieldView setSelectable: YES];
-                [pFieldView setDrawsBackground: YES];
-                [pFieldView sizeToFit]; // FIXME: this does nothing
-                [pCurParent addSubview: [pFieldView autorelease]];
-                
-                aRightColumn.push_back( ColumnItem( pFieldView ) );
-                
-                // add the field to observed controls for enabled state changes
-                // also add a tag just for this purpose
-                pControllerProperties->addObservedControl( pFieldView );
-                int nTag = pControllerProperties->addNameTag( aPropertyName );
-                [pFieldView setTag: nTag];
-                // pControllerProperties->addNamedView( pFieldView, aPropertyName );
-
-                // move to nCurY
-                aFieldRect.origin.y = nCurY - aFieldRect.size.height;
-                [pFieldView setFrame: aFieldRect];
-
                 // current value
                 PropertyValue* pVal = pController->getValue( aPropertyName );
-                if( aCtrlType.equalsAscii( "Range" ) )
-                {
-                    // add a stepper control
-                    NSRect aStepFrame = { { aFieldRect.origin.x + aFieldRect.size.width + 5,
-                                            aFieldRect.origin.y },
-                                        { 15, aFieldRect.size.height } };
-                    NSStepper* pStep = [[NSStepper alloc] initWithFrame: aStepFrame];
-                    [pStep setIncrement: 1];
-                    [pStep setValueWraps: NO];
-                    [pStep setTag: nTag];
-                    [pCurParent addSubview: [pStep autorelease]];
-                    
-                    aRightColumn.back().pSubControl = pStep;
-                    
-                    pControllerProperties->addObservedControl( pStep );
-                    [pStep setTarget: pCtrlTarget];
-                    [pStep setAction: @selector(triggered:)];
-                    
-                    // constrain the text field to decimal numbers
-                    NSNumberFormatter* pFormatter = [[NSNumberFormatter alloc] init];
-                    [pFormatter setFormatterBehavior: NSNumberFormatterBehavior10_4];
-                    [pFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
-                    [pFormatter setAllowsFloats: NO];
-                    [pFormatter setMaximumFractionDigits: 0];
-                    if( nMinValue != nMaxValue )
-                    {
-                        [pFormatter setMinimum: [[NSNumber numberWithInt: nMinValue] autorelease]];
-                        [pStep setMinValue: nMinValue];
-                        [pFormatter setMaximum: [[NSNumber numberWithInt: nMaxValue] autorelease]];
-                        [pStep setMaxValue: nMaxValue];
-                    }
-                    [pFieldView setFormatter: pFormatter];
-
-                    sal_Int64 nSelectVal = 0;
-                    if( pVal && pVal->Value.hasValue() )
-                        pVal->Value >>= nSelectVal;
-                    
-                    [pFieldView setIntValue: nSelectVal];
-                    [pStep setIntValue: nSelectVal];
-
-                    pControllerProperties->addViewPair( pFieldView, pStep );
-                    // connect target and action
-                    [pFieldView setTarget: pCtrlTarget];
-                    [pFieldView setAction: @selector(triggeredNumeric:)];
-                    [pStep setTarget: pCtrlTarget];
-                    [pStep setAction: @selector(triggeredNumeric:)];
-                }
-                else
-                {
-                    // connect target and action
-                    [pFieldView setTarget: pCtrlTarget];
-                    [pFieldView setAction: @selector(triggered:)];
-
-                    if( pVal && pVal->Value.hasValue() )
-                    {
-                        rtl::OUString aValue;
-                        pVal->Value >>= aValue;
-                        if( aValue.getLength() )
-                        {
-                            NSString* pText = CreateNSString( aValue );
-                            [pFieldView setStringValue: pText];
-                            [pText release];
-                        }
-                    }
-                }
-
-                // update nCurY
-                nCurY = aFieldRect.origin.y - 5;
-                
+                addEdit( pCurParent, nCurX, nCurY, nAttachOffset,
+                         aCtrlType, aText, aPropertyName, pVal,
+                         nMinValue, nMaxValue,
+                         aLeftColumn, aRightColumn,
+                         pControllerProperties, pCtrlTarget );
             }
         }
         else
@@ -1205,7 +1345,7 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
             DBG_ERROR( "Unsupported UI option" );
         }
     }
-    
+        
     pControllerProperties->updateEnableState();
     adjustViewAndChildren( pCurParent, aMaxTabSize, aLeftColumn, aRightColumn );
     
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 1c0401f769b5..ff4edcbf83f9 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -445,7 +445,7 @@ ULONG AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, USH
         case PRINTER_CAPABILITIES_COPIES:
             return 0xffff;
         case PRINTER_CAPABILITIES_COLLATECOPIES:
-            return 0;
+            return 0xffff;
         case PRINTER_CAPABILITIES_SETORIENTATION:
             return 1;
         case PRINTER_CAPABILITIES_SETDUPLEX:
@@ -634,6 +634,8 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
             }
 
             [pPrintDict setObject: [[NSNumber numberWithInt: nCopies] autorelease] forKey: NSPrintCopies];
+            if( nCopies > 1 )
+                [pPrintDict setObject: [[NSNumber numberWithBool: pPrinter->IsCollateCopy()] autorelease] forKey: NSPrintMustCollate];
             [pPrintDict setObject: [[NSNumber numberWithBool: YES] autorelease] forKey: NSPrintDetailedErrorReporting];
             [pPrintDict setObject: [[NSNumber numberWithInt: 1] autorelease] forKey: NSPrintFirstPage];
             // #i103253# weird: for some reason, autoreleasing the value below like the others above
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index b14354e1b4bd..ce4370c57b9f 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -207,8 +207,6 @@ void AquaSalFrame::initWindowAndView()
 
     UpdateFrameGeometry();
 
-    // setContentView causes a display; in multithreaded use this can deadlock
-    //YieldMutexReleaser aRel;
     [mpWindow setContentView: mpView];
 }
 
@@ -293,6 +291,9 @@ BOOL AquaSalFrame::PostEvent( void *pData )
 // -----------------------------------------------------------------------
 void AquaSalFrame::SetTitle(const XubString& rTitle)
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     NSString* pTitle = CreateNSString( rTitle );
     [mpWindow setTitle: pTitle];
 
@@ -331,6 +332,9 @@ void AquaSalFrame::SetIcon( USHORT )
 
 void AquaSalFrame::SetRepresentedURL( const rtl::OUString& i_rDocURL )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( i_rDocURL.indexOfAsciiL( "file:", 5 ) == 0 )
     {
         rtl::OUString aSysPath;
@@ -356,12 +360,12 @@ void AquaSalFrame::initShow()
         if( mpParent ) // center relative to parent
         {
             // center on parent
-            long nNewX = mpParent->maGeometry.nX + (mpParent->maGeometry.nWidth - maGeometry.nWidth)/2;
+            long nNewX = mpParent->maGeometry.nX + ((long)mpParent->maGeometry.nWidth - (long)maGeometry.nWidth)/2;
             if( nNewX < aScreenRect.Left() )
                 nNewX = aScreenRect.Left();
             if( long(nNewX + maGeometry.nWidth) > aScreenRect.Right() )
                 nNewX = aScreenRect.Right() - maGeometry.nWidth-1;
-            long nNewY = mpParent->maGeometry.nY + (mpParent->maGeometry.nHeight - maGeometry.nHeight)/2;
+            long nNewY = mpParent->maGeometry.nY + ((long)mpParent->maGeometry.nHeight - (long)maGeometry.nHeight)/2;
             if( nNewY < aScreenRect.Top() )
                 nNewY = aScreenRect.Top();
             if( nNewY > aScreenRect.Bottom() )
@@ -401,6 +405,9 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
 
 void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate)
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     mbShown = bVisible;
     if(bVisible)
     {
@@ -411,8 +418,6 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate)
         // trigger filling our backbuffer
         SendPaintEvent();
 
-        //YieldMutexReleaser aRel;
-
         if( bNoActivate || [mpWindow canBecomeKeyWindow] == NO )
             [mpWindow orderFront: NSApp];
         else
@@ -443,8 +448,6 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate)
         if( mpMenu && mpMenu->mbMenuBar && AquaSalMenu::pCurrentMenuBar == mpMenu )
             AquaSalMenu::setDefaultMenu();
 
-        //YieldMutexReleaser aRel;
-
         // #i90440# #i94443# work around the focus going back to some other window
         // if a child gets hidden for a parent window
         if( mpParent && mpParent->mbShown && [mpWindow isKeyWindow] )
@@ -468,6 +471,9 @@ void AquaSalFrame::Enable( BOOL bEnable )
 
 void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     mnMinWidth = nWidth;
     mnMinHeight = nHeight;
 
@@ -490,6 +496,9 @@ void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
 
 void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     mnMaxWidth = nWidth;
     mnMaxHeight = nHeight;
 
@@ -516,6 +525,9 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
 
 void AquaSalFrame::SetClientSize( long nWidth, long nHeight )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( mpWindow )
     {
         NSSize aSize = { nWidth, nHeight };
@@ -548,6 +560,9 @@ void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight )
 
 void AquaSalFrame::SetWindowState( const SalFrameState* pState )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     // set normal state
     NSRect aStateRect = [mpWindow frame];
     aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask];
@@ -565,7 +580,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
 
     // relase and acquire mutex again since this call can block waiting for an internal lock
     {
-        //YieldMutexReleaser aRel;
         [mpWindow setFrame: aStateRect display: NO];
     }
 
@@ -596,8 +610,6 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
         SendPaintEvent();
 
         // tell the system the views need to be updated
-        //YieldMutexReleaser aRel;
-
         [mpWindow display];
     }
 }
@@ -606,6 +618,9 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
 
 BOOL AquaSalFrame::GetWindowState( SalFrameState* pState )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     pState->mnMask = SAL_FRAMESTATE_MASK_X                 |
                      SAL_FRAMESTATE_MASK_Y                 |
                      SAL_FRAMESTATE_MASK_WIDTH             |
@@ -642,6 +657,9 @@ BOOL AquaSalFrame::GetWindowState( SalFrameState* pState )
 
 void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     NSArray* pScreens = [NSScreen screens];
     Rectangle aRet;
     NSScreen* pScreen = nil;
@@ -673,6 +691,9 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
 
 void AquaSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( mbFullScreen == bFullScreen )
         return;
 
@@ -731,7 +752,6 @@ void AquaSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay )
 
         maFullScreenRect = [mpWindow frame];
         {
-            //YieldMutexReleaser aRel;
             [mpWindow setFrame: [NSWindow frameRectForContentRect: aNewContentRect styleMask: mnStyleMask] display: mbShown ? YES : NO];
         }
 
@@ -743,7 +763,6 @@ void AquaSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay )
     else
     {
         {
-            //YieldMutexReleaser aRel;
             [mpWindow setFrame: maFullScreenRect display: mbShown ? YES : NO];
         }
         UpdateFrameGeometry();
@@ -782,6 +801,9 @@ public:
 
 void AquaSalFrame::StartPresentation( BOOL bStart )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( bStart )
     {
         mpActivityTimer.reset( new PreventSleepTimer() );
@@ -806,6 +828,12 @@ void AquaSalFrame::SetAlwaysOnTop( BOOL bOnTop )
 
 void AquaSalFrame::ToTop(USHORT nFlags)
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( ! (nFlags & SAL_FRAME_TOTOP_RESTOREWHENMIN) )
     {
         if( ! [mpWindow isVisible] || [mpWindow isMiniaturized] )
@@ -859,6 +887,9 @@ NSCursor* AquaSalFrame::getCurrentCursor() const
 
 void AquaSalFrame::SetPointer( PointerStyle ePointerStyle )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( ePointerStyle >= POINTER_COUNT || ePointerStyle == mePointerStyle )
         return;
     mePointerStyle = ePointerStyle;
@@ -885,6 +916,10 @@ void AquaSalFrame::Flush( void )
     if( !(mbGraphics && mpGraphics && mpView && mbShown) )
         return;
 
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
+
     [mpView setNeedsDisplay: YES];
 
     // outside of the application's event loop (e.g. IntroWindow)
@@ -903,6 +938,9 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
     if( !(mbGraphics && mpGraphics && mpView && mbShown) )
         return;
 
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     NSRect aNSRect = { {rRect.Left(), rRect.Top()}, { rRect.GetWidth(), rRect.GetHeight() } };
     VCLToCocoa( aNSRect, false );
     [mpView setNeedsDisplayInRect: aNSRect];
@@ -922,7 +960,8 @@ void AquaSalFrame::Sync()
 {
     if( mbGraphics && mpGraphics && mpView && mbShown )
     {
-        //YieldMutexReleaser aRel;
+        // #i113170# may not be the main thread if called from UNO API
+        SalData::ensureThreadAutoreleasePool();
 
         [mpView setNeedsDisplay: YES];
         [mpView display];
@@ -1146,6 +1185,9 @@ void AquaSalFrame::getResolution( long& o_rDPIX, long& o_rDPIY )
 // doesn't make the anything cleaner for now
 void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     [mpView lockFocus];
 
     StyleSettings aStyleSettings = rSettings.GetStyleSettings();
@@ -1257,6 +1299,9 @@ void AquaSalFrame::Beep( SoundType eSoundType )
 
 void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHORT nFlags)
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     USHORT nEvent = 0;
 
     if( [mpWindow isMiniaturized] )
@@ -1321,7 +1366,6 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHOR
 
     // do not display yet, we need to update our backbuffer
     {
-        //YieldMutexReleaser aRel;
         [mpWindow setFrame: [NSWindow frameRectForContentRect: aContentRect styleMask: mnStyleMask] display: NO];
     }
 
@@ -1336,13 +1380,15 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHOR
         SendPaintEvent();
 
         // now inform the system that the views need to be drawn
-        //YieldMutexReleaser aRel;
         [mpWindow display];
     }
 }
 
 void AquaSalFrame::GetWorkArea( Rectangle& rRect )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     NSScreen* pScreen = [mpWindow screen];
     if( pScreen ==  nil )
         pScreen = [NSScreen mainScreen];
@@ -1356,6 +1402,9 @@ void AquaSalFrame::GetWorkArea( Rectangle& rRect )
 
 SalPointerState AquaSalFrame::GetPointerState()
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     SalPointerState state;
     state.mnState = 0;
 
@@ -1463,6 +1512,9 @@ void AquaSalFrame::DrawMenuBar()
 
 void AquaSalFrame::SetMenu( SalMenu* pSalMenu )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     AquaSalMenu* pMenu = static_cast<AquaSalMenu*>(pSalMenu);
     DBG_ASSERT( ! pMenu || pMenu->mbMenuBar, "setting non menubar on frame" );
     mpMenu = pMenu;
@@ -1472,6 +1524,9 @@ void AquaSalFrame::SetMenu( SalMenu* pSalMenu )
 
 void AquaSalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( (mnExtStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) != (nStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) )
         [mpWindow setDocumentEdited: (nStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) ? YES : NO];
     mnExtStyle = nStyle;
@@ -1576,6 +1631,9 @@ void AquaSalFrame::CaptureMouse( BOOL bCapture )
 
 void AquaSalFrame::ResetClipRegion()
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     // release old path and indicate no clipping
     CGPathRelease( mrClippingPath );
     mrClippingPath = NULL;
@@ -1591,6 +1649,9 @@ void AquaSalFrame::ResetClipRegion()
 
 void AquaSalFrame::BeginSetClipRegion( ULONG nRects )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     // release old path
     if( mrClippingPath )
     {
@@ -1609,6 +1670,9 @@ void AquaSalFrame::BeginSetClipRegion( ULONG nRects )
 
 void AquaSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( nWidth && nHeight )
     {
         NSRect aRect = { { nX, nY }, { nWidth, nHeight } };
@@ -1619,6 +1683,9 @@ void AquaSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
 
 void AquaSalFrame::EndSetClipRegion()
 {
+    // #i113170# may not be the main thread if called from UNO API
+    SalData::ensureThreadAutoreleasePool();
+
     if( ! maClippingRects.empty() )
     {
         mrClippingPath = CGPathCreateMutable();
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 25dadf0e592b..935c987f65cc 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -162,6 +162,20 @@ static AquaSalFrame* getMouseContainerFrame()
     return mpFrame;
 }
 
+-(void)displayIfNeeded
+{
+    if( GetSalData() && GetSalData()->mpFirstInstance )
+    {
+        vos::IMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
+        if( pMutex )
+        {
+            pMutex->acquire();
+            [super displayIfNeeded];
+            pMutex->release();
+        }
+    }
+}
+
 -(MacOSBOOL)containsMouse
 {
     // is this event actually inside that NSWindow ?
@@ -572,8 +586,11 @@ private:
 -(void)mouseEntered: (NSEvent*)pEvent
 {
     s_pMouseFrame = mpFrame;
-    
-    [self sendMouseEventToFrame:pEvent button:s_nLastButton eventtype:SALEVENT_MOUSEMOVE];
+ 
+    // #i107215# the only mouse events we get when inactive are enter/exit
+    // actually we would like to have all of them, but better none than some
+    if( [NSApp isActive] )
+        [self sendMouseEventToFrame:pEvent button:s_nLastButton eventtype:SALEVENT_MOUSEMOVE];
 }
 
 -(void)mouseExited: (NSEvent*)pEvent
@@ -581,7 +598,10 @@ private:
     if( s_pMouseFrame == mpFrame )
         s_pMouseFrame = NULL;
 
-    [self sendMouseEventToFrame:pEvent button:s_nLastButton eventtype:SALEVENT_MOUSELEAVE];
+    // #i107215# the only mouse events we get when inactive are enter/exit
+    // actually we would like to have all of them, but better none than some
+    if( [NSApp isActive] )
+        [self sendMouseEventToFrame:pEvent button:s_nLastButton eventtype:SALEVENT_MOUSELEAVE];
 }
 
 -(void)rightMouseDown: (NSEvent*)pEvent
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index fa185c32dcda..ab92445b5e03 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -132,7 +132,7 @@ protected:
     SAL_DLLPRIVATE WinBits         ImplInitStyle( const Window* pPrevWindow, WinBits nStyle );
     SAL_DLLPRIVATE void            ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
     SAL_DLLPRIVATE void            ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags,
-                                               const Rectangle& rRect, bool bLayout );
+                                               const Rectangle& rRect, bool bLayout, bool bMenuBtnSep );
     SAL_DLLPRIVATE void            ImplDrawPushButton( bool bLayout = false );
     using Button::ImplGetTextStyle;
     SAL_DLLPRIVATE USHORT          ImplGetTextStyle( ULONG nDrawFlags ) const;
diff --git a/vcl/source/window/dndevdis.hxx b/vcl/inc/vcl/dndevdis.hxx
index 5b91bd0713ec..5b91bd0713ec 100644
--- a/vcl/source/window/dndevdis.hxx
+++ b/vcl/inc/vcl/dndevdis.hxx
diff --git a/vcl/source/window/dndlcon.hxx b/vcl/inc/vcl/dndlcon.hxx
index 5a41a20e4271..5a41a20e4271 100644
--- a/vcl/source/window/dndlcon.hxx
+++ b/vcl/inc/vcl/dndlcon.hxx
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index 06f7a0d14a2e..636fc4a979f3 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -158,6 +158,8 @@ public:
     sal_Bool        IsEqual( const GDIMetaFile& rMtf ) const;
     BOOL            Mirror( ULONG nMirrorFlags );
     void            Move( long nX, long nY );
+    // additional Move method getting specifics how to handle MapMode( MAP_PIXEL )
+    void            Move( long nX, long nY, long nDPIX, long nDPIY );
     void            Scale( double fScaleX, double fScaleY );
     void            Scale( const Fraction& rScaleX, const Fraction& rScaleY );
     void            Rotate( long nAngle10 );
diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx
index e58881c9f463..ae2ff2962adb 100644
--- a/vcl/inc/vcl/graphite_adaptors.hxx
+++ b/vcl/inc/vcl/graphite_adaptors.hxx
@@ -55,11 +55,11 @@
 #include "vcl/dllapi.h"
 
 // Libraries
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/ITextSource.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 // Module type definitions and forward declarations.
 //
diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/vcl/graphite_features.hxx
index 47f4c3a01e7f..47b8f062e299 100644
--- a/vcl/inc/vcl/graphite_features.hxx
+++ b/vcl/inc/vcl/graphite_features.hxx
@@ -29,11 +29,11 @@
 // Parse a string of features specified as ; separated pairs.
 // e.g.
 // 1001=1&2002=2&fav1=0
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/GrFeature.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 namespace grutils
 {
diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx
index 765a154a9898..cd22abdcdb26 100644
--- a/vcl/inc/vcl/graphite_layout.hxx
+++ b/vcl/inc/vcl/graphite_layout.hxx
@@ -40,13 +40,13 @@
 #include <vector>
 #include <utility>
 // Libraries
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/GrConstants.h>
 #include <graphite/GrAppData.h>
 #include <graphite/SegmentAux.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 // Platform
 #include <vcl/sallayout.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx
index 33f60a1e8a2f..ac278f76f65b 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/vcl/ilstbox.hxx
@@ -396,6 +396,7 @@ private:
                         mbHScroll       : 1,    // HScroll an oder aus
                         mbAutoHScroll   : 1;    // AutoHScroll an oder aus
     Link                maScrollHdl;    // Weil der vom ImplListBoxWindow selbst benoetigt wird.
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 
 protected:
     virtual void        GetFocus();
@@ -500,6 +501,7 @@ public:
 
     // pb: #106948# explicit mirroring for calc
     inline void     EnableMirroring()   { maLBWindow.EnableMirroring(); }
+    inline void     SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
 };
 
 // -----------------------------
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index af83b2db40e1..be7633f13d53 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -521,6 +521,7 @@ public:
     SAL_DLLPRIVATE void setPrinter( const boost::shared_ptr<Printer>& );
     SAL_DLLPRIVATE void setOptionChangeHdl( const Link& );
     SAL_DLLPRIVATE void createProgressDialog();
+    SAL_DLLPRIVATE bool isProgressCanceled() const;
     SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& );
     SAL_DLLPRIVATE const MultiPageSetup& getMultipage() const;
     SAL_DLLPRIVATE void setLastPage( sal_Bool i_bLastPage );
diff --git a/vcl/inc/vcl/splitwin.hxx b/vcl/inc/vcl/splitwin.hxx
index 4aa1ca16785c..f028c6969b16 100644
--- a/vcl/inc/vcl/splitwin.hxx
+++ b/vcl/inc/vcl/splitwin.hxx
@@ -201,6 +201,18 @@ public:
                                    BOOL bPropGreat = FALSE );
     void                SetItemSize( USHORT nId, long nNewSize );
     long                GetItemSize( USHORT nId ) const;
+    /** Set a range that limits the (variable part of the) size with an
+        upper and a lower bound (both are valid values themselves.)
+        @param nId
+            Id of the item for which the size limits are set.
+        @param aRange
+            Values of -1 define missing bounds, thus setting a range (-1,-1)
+            (the default) removes the size limitiation.
+    */
+    void                SetItemSizeRange (USHORT nId, const Range aRange);
+    /** Return the current size limits for the specified item.
+    */
+    Range               GetItemSizeRange (USHORT nId) const;
     long                GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const;
     void                SetItemBits( USHORT nId, SplitWindowItemBits nNewBits );
     SplitWindowItemBits GetItemBits( USHORT nId ) const;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 980e0f1c5b58..b91afbbae9fe 100755..100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -424,7 +424,10 @@ ImplStyleData::ImplStyleData()
     mnPushButtonStyle           = 0;
     mnTabControlStyle           = 0;
     mnLogoDisplayTime           = LOGO_DISPLAYTIME_STARTTIME;
-    mnDragFullOptions           = 0;
+    mnDragFullOptions           = DRAGFULL_OPTION_WINDOWMOVE | DRAGFULL_OPTION_WINDOWSIZE |
+                                  DRAGFULL_OPTION_OBJECTMOVE | DRAGFULL_OPTION_OBJECTSIZE |
+                                  DRAGFULL_OPTION_DOCKING    | DRAGFULL_OPTION_SPLIT      |
+                                  DRAGFULL_OPTION_SCROLL;
     mnAnimationOptions          = 0;
     mnSelectionOptions          = 0;
     mnDisplayOptions            = 0;
@@ -1041,6 +1044,8 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
          (mpData->mnUseSystemUIFonts        == rSet.mpData->mnUseSystemUIFonts)         &&
          (mpData->mnUseFlatBorders          == rSet.mpData->mnUseFlatBorders)           &&
          (mpData->mnUseFlatMenues           == rSet.mpData->mnUseFlatMenues)            &&
+         (mpData->mnSymbolsStyle            == rSet.mpData->mnSymbolsStyle)             &&
+         (mpData->mnPreferredSymbolsStyle   == rSet.mpData->mnPreferredSymbolsStyle)    &&
          (mpData->maFaceColor               == rSet.mpData->maFaceColor)                &&
          (mpData->maCheckedColor            == rSet.mpData->maCheckedColor)             &&
          (mpData->maLightColor              == rSet.mpData->maLightColor)               &&
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index d4f29e224e7b..db7649a90258 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -896,7 +896,8 @@ void PushButton::ImplInitSettings( BOOL bFont,
         // #i38498#: do not check for GetParent()->IsChildTransparentModeEnabled()
         // otherwise the formcontrol button will be overdrawn due to PARENTCLIPMODE_NOCLIP
         // for radio and checkbox this is ok as they shoud appear transparent in documents
-        if ( IsNativeControlSupported( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL ) )
+        if ( IsNativeControlSupported( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL ) ||
+             (GetStyle() & WB_FLATBUTTON) != 0 )
         {
             EnableChildTransparentMode( TRUE );
             SetParentClipMode( PARENTCLIPMODE_NOCLIP );
@@ -1155,7 +1156,9 @@ static void ImplDrawBtnDropDownArrow( OutputDevice* pDev,
 
 void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags,
                                             const Rectangle& rRect,
-                                            bool bLayout )
+                                            bool bLayout,
+                                            bool bMenuBtnSep
+                                            )
 {
     const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
     Rectangle               aInRect = rRect;
@@ -1203,19 +1206,22 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags
             aSize.Width()      -= ( 5 + nSymbolSize );
 
             ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, nImageSep,
-                                  nDrawFlags, nTextStyle, NULL, (GetStyle() & WB_FLATBUTTON) != 0 );
+                                  nDrawFlags, nTextStyle, NULL, true );
         }
         else
             ImplCalcSymbolRect( aInRect );
 
         if( ! bLayout )
         {
-            DecorationView aDecoView( pDev );
             long nDistance = (aInRect.GetHeight() > 10) ? 2 : 1;
-            long nX = aInRect.Left() - 2*nDistance;;
-            Point aStartPt( nX, aInRect.Top()+nDistance );
-            Point aEndPt( nX, aInRect.Bottom()-nDistance );
-            aDecoView.DrawSeparator( aStartPt, aEndPt );
+            DecorationView aDecoView( pDev );
+            if( bMenuBtnSep )
+            {
+                long nX = aInRect.Left() - 2*nDistance;;
+                Point aStartPt( nX, aInRect.Top()+nDistance );
+                Point aEndPt( nX, aInRect.Bottom()-nDistance );
+                aDecoView.DrawSeparator( aStartPt, aEndPt );
+            }
             aDecoView.DrawSymbol( aInRect, SYMBOL_SPIN_DOWN, aColor, nStyle );
             aInRect.Left() -= 2*nDistance;
             ImplSetSymbolRect( aInRect );
@@ -1227,7 +1233,7 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags
         // FIXME: (GetStyle() & WB_FLATBUTTON) != 0 is preliminary
         // in the next major this should be replaced by "true"
         ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, nImageSep, nDrawFlags,
-                              nTextStyle, IsSymbol() ? &aSymbolRect : NULL, (GetStyle() & WB_FLATBUTTON) != 0 );
+                              nTextStyle, IsSymbol() ? &aSymbolRect : NULL, true );
 
         if ( IsSymbol() && ! bLayout )
         {
@@ -1356,6 +1362,12 @@ void PushButton::ImplDrawPushButton( bool bLayout )
         return;
 
     bool bRollOver = (IsMouseOver() && aInRect.IsInside( GetPointerPosPixel() ));
+    bool bDrawMenuSep = true;
+    if( (GetStyle() & WB_FLATBUTTON) )
+    {
+        if( ! bRollOver && ! HasFocus() )
+            bDrawMenuSep = false;
+    }
     if ( (bNativeOK=IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)) == TRUE )
     {
         PushButtonValue aControlValue;
@@ -1406,7 +1418,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
         // draw content using the same aInRect as non-native VCL would do
         ImplDrawPushButtonContent( this,
                                    (nState&CTRL_STATE_ROLLOVER) ? WINDOW_DRAW_ROLLOVER : 0,
-                                   aInRect, bLayout );
+                                   aInRect, bLayout, bDrawMenuSep );
 
         if ( HasFocus() )
             ShowFocus( ImplGetFocusRect() );
@@ -1432,7 +1444,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
         }
 
         // draw content
-        ImplDrawPushButtonContent( this, 0, aInRect, bLayout );
+        ImplDrawPushButtonContent( this, 0, aInRect, bLayout, bDrawMenuSep );
 
         if( ! bLayout && HasFocus() )
         {
@@ -1753,7 +1765,7 @@ void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
         nButtonStyle |= BUTTON_DRAW_CHECKED;
     aRect = aDecoView.DrawButton( aRect, nButtonStyle );
 
-    ImplDrawPushButtonContent( pDev, nFlags, aRect, false );
+    ImplDrawPushButtonContent( pDev, nFlags, aRect, false, true );
     pDev->Pop();
 }
 
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 786b190069c4..a692cbea0260 100755
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -122,6 +122,7 @@ struct DDInfo
     BOOL            bStarterOfDD;
     BOOL            bDroppedInMe;
     BOOL            bVisCursor;
+    BOOL            bIsStringSupported;
 
     DDInfo()
     {
@@ -130,6 +131,7 @@ struct DDInfo
         bStarterOfDD = FALSE;
         bDroppedInMe = FALSE;
         bVisCursor = FALSE;
+        bIsStringSupported = FALSE;
     }
 };
 
@@ -3062,17 +3064,26 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent&
     rDTDE.Context->dropComplete( bChanges );
 }
 
-void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& ) throw (::com::sun::star::uno::RuntimeException)
+void Edit::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& rDTDE ) throw (::com::sun::star::uno::RuntimeException)
 {
     if ( !mpDDInfo )
     {
         mpDDInfo = new DDInfo;
     }
-//    sal_Bool bTextContent = mbReadOnly ? sal_False : sal_True;   // quiery from rDTDEE.SupportedDataFlavors()
-//    if ( bTextContent )
-//        rDTDEE.Context->acceptDrop(datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE);
-//    else
-//        rDTDEE.Context->rejectDrop();
+    // search for string data type
+    const Sequence< com::sun::star::datatransfer::DataFlavor >& rFlavors( rDTDE.SupportedDataFlavors );
+    sal_Int32 nEle = rFlavors.getLength();
+    mpDDInfo->bIsStringSupported = FALSE;
+    for( sal_Int32 i = 0; i < nEle; i++ )
+    {
+        sal_Int32 nIndex = 0;
+        rtl::OUString aMimetype = rFlavors[i].MimeType.getToken( 0, ';', nIndex );
+        if( aMimetype.equalsAscii( "text/plain" ) )
+        {
+            mpDDInfo->bIsStringSupported = TRUE;
+            break;
+        }
+    }
 }
 
 void Edit::dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& ) throw (::com::sun::star::uno::RuntimeException)
@@ -3104,7 +3115,7 @@ void Edit::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEv
     aSel.Justify();
 
     // Don't accept drop in selection or read-only field...
-    if ( IsReadOnly() || aSel.IsInside( mpDDInfo->nDropPos ) )
+    if ( IsReadOnly() || aSel.IsInside( mpDDInfo->nDropPos ) || ! mpDDInfo->bIsStringSupported )
     {
         ImplHideDDCursor();
         rDTDE.Context->rejectDrag();
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index eb8c20d1d803..03527bf083a7 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -44,9 +44,10 @@
 
 #include "tools/debug.hxx"
 
+#include <vcl/dndevdis.hxx>
+#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 
-
-// =======================================================================
+// =======================================================================
 
 ListBox::ListBox( WindowType nType ) : Control( nType )
 {
@@ -119,6 +120,8 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
     Control::ImplInit( pParent, nStyle, NULL );
     SetBackground();
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener> xDrop = new DNDEventDispatcher(this);
+
     if( nStyle & WB_DROPDOWN )
     {
         sal_Int32 nLeft, nTop, nRight, nBottom;
@@ -145,16 +148,19 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
         mpFloatWin = new ImplListBoxFloatingWindow( this );
         mpFloatWin->SetAutoWidth( TRUE );
         mpFloatWin->SetPopupModeEndHdl( LINK( this, ListBox, ImplPopupModeEndHdl ) );
+        mpFloatWin->GetDropTarget()->addDropTargetListener(xDrop);
 
         mpImplWin = new ImplWin( this, (nStyle & (WB_LEFT|WB_RIGHT|WB_CENTER))|WB_NOBORDER );
         mpImplWin->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
         mpImplWin->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) );
         mpImplWin->Show();
+        mpImplWin->GetDropTarget()->addDropTargetListener(xDrop);
 
         mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE );
         ImplInitDropDownButton( mpBtn );
         mpBtn->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
         mpBtn->Show();
+        mpBtn->GetDropTarget()->addDropTargetListener(xDrop);
 
     }
 
@@ -170,6 +176,9 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
     mpImplLB->SetPosPixel( Point() );
     mpImplLB->Show();
 
+    mpImplLB->GetDropTarget()->addDropTargetListener(xDrop);
+    mpImplLB->SetDropTraget(xDrop);
+
     if ( mpFloatWin )
     {
         mpFloatWin->SetImplListBox( mpImplLB );
@@ -1612,7 +1621,6 @@ const Wallpaper& ListBox::GetDisplayBackground() const
 }
 
 // =======================================================================
-
 MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) :
     ListBox( WINDOW_MULTILISTBOX )
 {
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 9e2a21b43e37..ec476157fbeb 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -961,8 +961,8 @@ BOOL Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY )
             const long  nScanlineSize = pWriteAcc->GetScanlineSize();
             const long  nNewWidth1 = nNewWidth - 1L;
             const long  nNewHeight1 = nNewHeight - 1L;
-            const long  nWidth1 = pReadAcc->Width() - 1L;
-            const long  nHeight1 = pReadAcc->Height() - 1L;
+            const long  nWidth = pReadAcc->Width();
+            const long  nHeight = pReadAcc->Height();
             long*       pLutX = new long[ nNewWidth ];
             long*       pLutY = new long[ nNewHeight ];
             long        nX, nY, nMapY, nActY = 0L;
@@ -970,10 +970,10 @@ BOOL Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY )
             if( nNewWidth1 && nNewHeight1 )
             {
                 for( nX = 0L; nX < nNewWidth; nX++ )
-                    pLutX[ nX ] = nX * nWidth1 / nNewWidth1;
+                    pLutX[ nX ] = nX * nWidth / nNewWidth;
 
                 for( nY = 0L; nY < nNewHeight; nY++ )
-                    pLutY[ nY ] = nY * nHeight1 / nNewHeight1;
+                    pLutY[ nY ] = nY * nHeight / nNewHeight;
 
                 while( nActY < nNewHeight )
                 {
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 01b34286a086..818a31a10c0f 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -841,6 +841,49 @@ void GDIMetaFile::Move( long nX, long nY )
     }
 }
 
+void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY )
+{
+    const Size      aBaseOffset( nX, nY );
+    Size            aOffset( aBaseOffset );
+    VirtualDevice   aMapVDev;
+
+    aMapVDev.EnableOutput( FALSE );
+    aMapVDev.SetReferenceDevice( nDPIX, nDPIY );
+    aMapVDev.SetMapMode( GetPrefMapMode() );
+
+    for( MetaAction* pAct = (MetaAction*) First(); pAct; pAct = (MetaAction*) Next() )
+    {
+        const long  nType = pAct->GetType();
+        MetaAction* pModAct;
+
+        if( pAct->GetRefCount() > 1 )
+        {
+            Replace( pModAct = pAct->Clone(), GetCurPos() );
+            pAct->Delete();
+        }
+        else
+            pModAct = pAct;
+
+        if( ( META_MAPMODE_ACTION == nType ) ||
+            ( META_PUSH_ACTION == nType ) ||
+            ( META_POP_ACTION == nType ) )
+        {
+            pModAct->Execute( &aMapVDev );
+            if( aMapVDev.GetMapMode().GetMapUnit() == MAP_PIXEL )
+            {
+                aOffset = aMapVDev.LogicToPixel( aBaseOffset, GetPrefMapMode() );
+                MapMode aMap( aMapVDev.GetMapMode() );
+                aOffset.Width() = aOffset.Width() * (double)aMap.GetScaleX();
+                aOffset.Height() = aOffset.Height() * (double)aMap.GetScaleY();
+            }
+            else
+                aOffset = aMapVDev.LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() );
+        }
+
+        pModAct->Move( aOffset.Width(), aOffset.Height() );
+    }
+}
+
 // ------------------------------------------------------------------------
 
 void GDIMetaFile::Scale( double fScaleX, double fScaleY )
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 476ac3ca44a9..3105850c4fbf 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -553,14 +553,14 @@ void ImplImageBmp::Draw( USHORT nPos, OutputDevice* pOutDev,
 // -----------------------------------------------------------------------
 
 void ImplImageBmp::ImplUpdateDisplayBmp( OutputDevice*
-#if defined WIN || defined WNT
+#if defined WNT
 pOutDev
 #endif
 )
 {
     if( !mpDisplayBmp && !maBmpEx.IsEmpty() )
     {
-#if defined WIN || defined WNT
+#if defined WNT
         if( maBmpEx.IsAlpha() )
             mpDisplayBmp = new BitmapEx( maBmpEx );
         else
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 752a4222bcb2..94f07b8f17d1 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -4078,7 +4078,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
                     aMemStm >> aFill;
                     PolyPolygon aPath;
                     aFill.getPath( aPath );
-                    aPath.Scale( nXMove, nYMove );
+                    aPath.Move( nXMove, nYMove );
                     aFill.setPath( aPath );
                     aDest << aFill;
                 }
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index c4185a77382e..63bc233ef4e0 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -1327,11 +1327,11 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const
         "msmincho", "fzmingti", "fzheiti", "ipamincho", "sazanamimincho", "kochimincho", "",
         "sunbatang", "sundotum", "baekmukdotum", "gulim", "batang", "dotum", "",
         "hgmincholightj", "msunglightsc", "msunglighttc", "hymyeongjolightk", "",
-        "tahoma", "dejavusans", "timesnewroman", "lucidatypewriter", "lucidasans", "nimbussansl", "",
+        "tahoma", "dejavusans", "timesnewroman", "liberationsans", "",
         "shree", "mangal", "",
         "raavi", "shruti", "tunga", "",
         "latha", "gautami", "kartika", "vrinda", "",
-        "shayyalmt", "naskmt", "",
+        "shayyalmt", "naskmt", "scheherazade", "",
         "david", "nachlieli", "lucidagrande", "",
         "norasi", "angsanaupc", "",
         "khmerossystem", "",
@@ -1381,6 +1381,7 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const
         }
     }
 
+#ifdef SAL_FONTENUM_STABLE_ON_PLATFORM // #i113472#
     // sort the list of fonts for glyph fallback by quality (highest first)
     // #i33947# keep the EUDC font at the front of the list
     // an insertion sort is good enough for this short list
@@ -1396,6 +1397,7 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const
                 break;
         pFallbackList[ j+1 ] = pTestFont;
     }
+#endif
 
 #if defined(HDU_DEBUG)
     for( int i = 0; i < nMaxLevel; ++i )
@@ -3146,17 +3148,17 @@ long OutputDevice::ImplGetTextWidth( const SalLayout& rSalLayout ) const
 // -----------------------------------------------------------------------
 
 void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY,
-                                     long nX, long nY, long nWidth, long nHeight )
+                                     long nDistX, long nDistY, long nWidth, long nHeight )
 {
+    long nX = nDistX;
+    long nY = nDistY;
+
     short nOrientation = mpFontEntry->mnOrientation;
     if ( nOrientation )
     {
         // Rotate rect without rounding problems for 90 degree rotations
         if ( !(nOrientation % 900) )
         {
-            nX -= nBaseX;
-            nY -= nBaseY;
-
             if ( nOrientation == 900 )
             {
                 long nTemp = nX;
@@ -3184,12 +3186,11 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY,
                 nHeight = nTemp;
                 nX -= nWidth;
             }
-
-            nX += nBaseX;
-            nY += nBaseY;
         }
         else
         {
+            nX += nBaseX;
+            nY += nBaseY;
             // inflate because polygons are drawn smaller
             Rectangle aRect( Point( nX, nY ), Size( nWidth+1, nHeight+1 ) );
             Polygon   aPoly( aRect );
@@ -3199,6 +3200,8 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY,
         }
     }
 
+    nX += nBaseX;
+    nY += nBaseY;
     mpGraphics->DrawRect( nX, nY, nWidth, nHeight, this );
 }
 
@@ -3219,7 +3222,7 @@ void OutputDevice::ImplDrawTextBackground( const SalLayout& rSalLayout )
     mpGraphics->SetFillColor( ImplColorToSal( GetTextFillColor() ) );
     mbInitFillColor = TRUE;
 
-    ImplDrawTextRect( nX, nY, nX, nY-mpFontEntry->maMetric.mnAscent-mnEmphasisAscent,
+    ImplDrawTextRect( nX, nY, 0, -(mpFontEntry->maMetric.mnAscent + mnEmphasisAscent),
                       nWidth,
                       mpFontEntry->mnLineHeight+mnEmphasisAscent+mnEmphasisDescent );
 }
@@ -3504,7 +3507,7 @@ static void ImplDrawWavePixel( long nOriginX, long nOriginY,
 // -----------------------------------------------------------------------
 
 void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
-                                     long nStartX, long nStartY,
+                                     long nDistX, long nDistY,
                                      long nWidth, long nHeight,
                                      long nLineWidth, short nOrientation,
                                      const Color& rColor )
@@ -3512,6 +3515,9 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
     if ( !nHeight )
         return;
 
+    long nStartX = nBaseX + nDistX;
+    long nStartY = nBaseY + nDistY;
+
     // Bei Hoehe von 1 Pixel reicht es, eine Linie auszugeben
     if ( (nLineWidth == 1) && (nHeight == 1) )
     {
@@ -3526,7 +3532,6 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
             ImplRotatePos( nBaseX, nBaseY, nEndX, nEndY, nOrientation );
         }
         mpGraphics->DrawLine( nStartX, nStartY, nEndX, nEndY, this );
-
     }
     else
     {
@@ -3626,7 +3631,7 @@ void OutputDevice::ImplDrawWaveLine( long nBaseX, long nBaseY,
 // -----------------------------------------------------------------------
 
 void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY,
-                                         long nX, long nY, long nWidth,
+                                         long nDistX, long nDistY, long nWidth,
                                          FontUnderline eTextLine,
                                          Color aColor,
                                          BOOL bIsAbove )
@@ -3652,7 +3657,7 @@ void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY,
         nLineWidth = 1;
     if ( eTextLine == UNDERLINE_BOLDWAVE )
         nLineWidth *= 2;
-    nLinePos += nY - (nLineHeight / 2);
+    nLinePos += nDistY - (nLineHeight / 2);
     long nLineWidthHeight = ((nLineWidth*mnDPIX)+(mnDPIY/2))/mnDPIY;
     if ( eTextLine == UNDERLINE_DOUBLEWAVE )
     {
@@ -3673,16 +3678,16 @@ void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY,
             nLineDY2 = 1;
 
         nLinePos -= nLineWidthHeight-nLineDY2;
-        ImplDrawWaveLine( nBaseX, nBaseY, nX, nLinePos, nWidth, nLineHeight,
+        ImplDrawWaveLine( nBaseX, nBaseY, nDistX, nLinePos, nWidth, nLineHeight,
                           nLineWidth, mpFontEntry->mnOrientation, aColor );
         nLinePos += nLineWidthHeight+nLineDY;
-        ImplDrawWaveLine( nBaseX, nBaseY, nX, nLinePos, nWidth, nLineHeight,
+        ImplDrawWaveLine( nBaseX, nBaseY, nDistX, nLinePos, nWidth, nLineHeight,
                           nLineWidth, mpFontEntry->mnOrientation, aColor );
     }
     else
     {
         nLinePos -= nLineWidthHeight/2;
-        ImplDrawWaveLine( nBaseX, nBaseY, nX, nLinePos, nWidth, nLineHeight,
+        ImplDrawWaveLine( nBaseX, nBaseY, nDistX, nLinePos, nWidth, nLineHeight,
                           nLineWidth, mpFontEntry->mnOrientation, aColor );
     }
 }
@@ -3690,7 +3695,7 @@ void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY,
 // -----------------------------------------------------------------------
 
 void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY,
-                                             long nX, long nY, long nWidth,
+                                             long nDistX, long nDistY, long nWidth,
                                              FontUnderline eTextLine,
                                              Color aColor,
                                              BOOL bIsAbove )
@@ -3700,6 +3705,8 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY,
     long            nLinePos  = 0;
     long            nLinePos2 = 0;
 
+    const long nY = nDistY;
+
     if ( eTextLine > UNDERLINE_LAST )
         eTextLine = UNDERLINE_SINGLE;
 
@@ -3767,7 +3774,7 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY,
         mpGraphics->SetFillColor( ImplColorToSal( aColor ) );
         mbInitFillColor = TRUE;
 
-        long nLeft = nX;
+        long nLeft = nDistX;
 
         switch ( eTextLine )
         {
@@ -3920,7 +3927,7 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY,
 // -----------------------------------------------------------------------
 
 void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY,
-                                          long nX, long nY, long nWidth,
+                                          long nDistX, long nDistY, long nWidth,
                                           FontStrikeout eStrikeout,
                                           Color aColor )
 {
@@ -3929,6 +3936,8 @@ void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY,
     long            nLinePos  = 0;
     long            nLinePos2 = 0;
 
+    long nY = nDistY;
+
     if ( eStrikeout > STRIKEOUT_LAST )
         eStrikeout = STRIKEOUT_SINGLE;
 
@@ -3961,7 +3970,7 @@ void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY,
         mpGraphics->SetFillColor( ImplColorToSal( aColor ) );
         mbInitFillColor = TRUE;
 
-        long nLeft = nX;
+        const long& nLeft = nDistX;
 
         switch ( eStrikeout )
         {
@@ -3982,7 +3991,7 @@ void OutputDevice::ImplDrawStrikeoutLine( long nBaseX, long nBaseY,
 // -----------------------------------------------------------------------
 
 void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
-                                          long nX, long nY, long nWidth,
+                                          long nDistX, long nDistY, long nWidth,
                                           FontStrikeout eStrikeout,
                                           Color aColor )
 {
@@ -4016,12 +4025,12 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
 
     // calculate acceptable strikeout length
     // allow the strikeout to be one pixel larger than the text it strikes out
-    long nMaxWidth = nStrikeoutWidth / 2;
+    long nMaxWidth = nStrikeoutWidth * 3 / 4;
     if ( nMaxWidth < 2 )
         nMaxWidth = 2;
     nMaxWidth += nWidth + 1;
 
-    int nStrikeStrLen = (nMaxWidth + nStrikeoutWidth - 1) / nStrikeoutWidth;
+    int nStrikeStrLen = (nMaxWidth - 1) / nStrikeoutWidth;
     // if the text width is smaller than the strikeout text, then do not
     // strike out at all. This case requires user interaction, e.g. adding
     // a space to the text
@@ -4036,7 +4045,9 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
     const String aStrikeoutText( aChars, xub_StrLen(nStrikeStrLen) );
 
     if( mpFontEntry->mnOrientation )
-        ImplRotatePos( nBaseX, nBaseY, nX, nY, mpFontEntry->mnOrientation );
+        ImplRotatePos( 0, 0, nDistX, nDistY, mpFontEntry->mnOrientation );
+    nBaseX += nDistX;
+    nBaseY += nDistY;
 
     // strikeout text has to be left aligned
     ULONG nOrigTLM = mnTextLayoutMode;
@@ -4052,7 +4063,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
     SetTextColor( aColor );
     ImplInitTextColor();
 
-    pLayout->DrawBase() = Point( nX+mnTextOffX, nY+mnTextOffY );
+    pLayout->DrawBase() = Point( nBaseX+mnTextOffX, nBaseY+mnTextOffY );
     pLayout->DrawText( *mpGraphics );
     pLayout->Release();
 
@@ -4062,8 +4073,8 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
 
 // -----------------------------------------------------------------------
 
-void OutputDevice::ImplDrawTextLine( long nBaseX,
-                                     long nX, long nY, long nWidth,
+void OutputDevice::ImplDrawTextLine( long nX, long nY,
+                                     long nDistX, long nWidth,
                                      FontStrikeout eStrikeout,
                                      FontUnderline eUnderline,
                                      FontUnderline eOverline,
@@ -4079,10 +4090,14 @@ void OutputDevice::ImplDrawTextLine( long nBaseX,
     BOOL            bUnderlineDone = FALSE;
     BOOL            bOverlineDone  = FALSE;
 
-    // TODO: fix rotated text
     if ( IsRTLEnabled() )
+    {
         // --- RTL --- mirror at basex
-        nX = nBaseX - nWidth - (nX - nBaseX - 1);
+        long nXAdd = nWidth - nDistX;
+        if( mpFontEntry->mnOrientation )
+            nXAdd = FRound( nXAdd * cos( mpFontEntry->mnOrientation * F_PI1800 ) );
+        nX += nXAdd - 1;
+    }
 
     if ( !IsTextLineColor() )
         aUnderlineColor = GetTextColor();
@@ -4095,7 +4110,7 @@ void OutputDevice::ImplDrawTextLine( long nBaseX,
          (eUnderline == UNDERLINE_DOUBLEWAVE) ||
          (eUnderline == UNDERLINE_BOLDWAVE) )
     {
-        ImplDrawWaveTextLine( nBaseX, nY, nX, nY, nWidth, eUnderline, aUnderlineColor, bUnderlineAbove );
+        ImplDrawWaveTextLine( nX, nY, nDistX, 0, nWidth, eUnderline, aUnderlineColor, bUnderlineAbove );
         bUnderlineDone = TRUE;
     }
     if ( (eOverline == UNDERLINE_SMALLWAVE) ||
@@ -4103,25 +4118,25 @@ void OutputDevice::ImplDrawTextLine( long nBaseX,
          (eOverline == UNDERLINE_DOUBLEWAVE) ||
          (eOverline == UNDERLINE_BOLDWAVE) )
     {
-        ImplDrawWaveTextLine( nBaseX, nY, nX, nY, nWidth, eOverline, aOverlineColor, TRUE );
+        ImplDrawWaveTextLine( nX, nY, nDistX, 0, nWidth, eOverline, aOverlineColor, TRUE );
         bOverlineDone = TRUE;
     }
 
     if ( (eStrikeout == STRIKEOUT_SLASH) ||
          (eStrikeout == STRIKEOUT_X) )
     {
-        ImplDrawStrikeoutChar( nBaseX, nY, nX, nY, nWidth, eStrikeout, aStrikeoutColor );
+        ImplDrawStrikeoutChar( nX, nY, nDistX, 0, nWidth, eStrikeout, aStrikeoutColor );
         bStrikeoutDone = TRUE;
     }
 
     if ( !bUnderlineDone )
-        ImplDrawStraightTextLine( nBaseX, nY, nX, nY, nWidth, eUnderline, aUnderlineColor, bUnderlineAbove );
+        ImplDrawStraightTextLine( nX, nY, nDistX, 0, nWidth, eUnderline, aUnderlineColor, bUnderlineAbove );
 
     if ( !bOverlineDone )
-        ImplDrawStraightTextLine( nBaseX, nY, nX, nY, nWidth, eOverline, aOverlineColor, TRUE );
+        ImplDrawStraightTextLine( nX, nY, nDistX, 0, nWidth, eOverline, aOverlineColor, TRUE );
 
     if ( !bStrikeoutDone )
-        ImplDrawStrikeoutLine( nBaseX, nY, nX, nY, nWidth, eStrikeout, aStrikeoutColor );
+        ImplDrawStrikeoutLine( nX, nY, nDistX, 0, nWidth, eStrikeout, aStrikeoutColor );
 }
 
 // -----------------------------------------------------------------------
@@ -4131,34 +4146,49 @@ void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout,
 {
     if( bWordLine )
     {
-        Point aPos, aStartPt;
-        sal_Int32 nWidth = 0, nAdvance=0;
+        // draw everything relative to the layout base point
+     const Point aStartPt = rSalLayout.DrawBase();
+     // calculate distance of each word from the base point
+        Point aPos;
+        sal_Int32 nDist = 0, nWidth = 0, nAdvance=0;
         for( int nStart = 0;;)
         {
+            // iterate through the layouted glyphs
             sal_GlyphId nGlyphIndex;
             if( !rSalLayout.GetNextGlyphs( 1, &nGlyphIndex, aPos, nStart, &nAdvance ) )
                 break;
 
+            // calculate the boundaries of each word
             if( !rSalLayout.IsSpacingGlyph( nGlyphIndex ) )
             {
                 if( !nWidth )
                 {
-                    aStartPt = aPos;//rSalLayout.DrawBase() - (aPos - rSalLayout.DrawOffset());
+                    // get the distance to the base point (as projected to baseline)
+                    nDist = aPos.X() - aStartPt.X();
+                    if( mpFontEntry->mnOrientation )
+                    {
+                        const long nDY = aPos.Y() - aStartPt.Y();
+                        const double fRad = mpFontEntry->mnOrientation * F_PI1800;
+                        nDist = FRound( nDist*cos(fRad) - nDY*sin(fRad) );
+                    }
                 }
 
+                // update the length of the textline
                 nWidth += nAdvance;
             }
             else if( nWidth > 0 )
             {
-                ImplDrawTextLine( rSalLayout.DrawBase().X(), aStartPt.X(), aStartPt.Y(), nWidth,
+             // draw the textline for each word
+                ImplDrawTextLine( aStartPt.X(), aStartPt.Y(), nDist, nWidth,
                     eStrikeout, eUnderline, eOverline, bUnderlineAbove );
                 nWidth = 0;
             }
         }
 
+        // draw textline for the last word
         if( nWidth > 0 )
         {
-            ImplDrawTextLine( rSalLayout.DrawBase().X(), aStartPt.X(), aStartPt.Y(), nWidth,
+            ImplDrawTextLine( aStartPt.X(), aStartPt.Y(), nDist, nWidth,
                 eStrikeout, eUnderline, eOverline, bUnderlineAbove );
         }
     }
@@ -4166,7 +4196,7 @@ void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout,
     {
         Point aStartPt = rSalLayout.GetDrawPosition();
         int nWidth = rSalLayout.GetTextWidth() / rSalLayout.GetUnitsPerPixel();
-        ImplDrawTextLine( rSalLayout.DrawBase().X(), aStartPt.X(), aStartPt.Y(), nWidth,
+        ImplDrawTextLine( aStartPt.X(), aStartPt.Y(), 0, nWidth,
             eStrikeout, eUnderline, eOverline, bUnderlineAbove );
     }
 }
@@ -4185,7 +4215,7 @@ void OutputDevice::ImplDrawMnemonicLine( long nX, long nY, long nWidth )
         nX = nBaseX - nWidth - (nX - nBaseX - 1);
     }
 
-    ImplDrawTextLine( nBaseX, nX, nY, nWidth, STRIKEOUT_NONE, UNDERLINE_SINGLE, UNDERLINE_NONE, FALSE );
+    ImplDrawTextLine( nX, nY, 0, nWidth, STRIKEOUT_NONE, UNDERLINE_SINGLE, UNDERLINE_NONE, FALSE );
 }
 
 // -----------------------------------------------------------------------
@@ -5433,7 +5463,7 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth,
     Point aPos = ImplLogicToDevicePixel( rPos );
     nWidth = ImplLogicWidthToDevicePixel( nWidth );
     aPos += Point( mnTextOffX, mnTextOffY );
-    ImplDrawTextLine( aPos.X(), aPos.X(), aPos.Y(), nWidth, eStrikeout, eUnderline, eOverline, bUnderlineAbove );
+    ImplDrawTextLine( aPos.X(), aPos.X(), 0, nWidth, eStrikeout, eUnderline, eOverline, bUnderlineAbove );
 
     if( mpAlphaVDev )
         mpAlphaVDev->DrawTextLine( rPos, nWidth, eStrikeout, eUnderline, eOverline, bUnderlineAbove );
@@ -5510,7 +5540,7 @@ void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos,
      if( nWaveHeight > pFontEntry->maMetric.mnWUnderlineSize )
          nWaveHeight = pFontEntry->maMetric.mnWUnderlineSize;
 
-     ImplDrawWaveLine( nStartX, nStartY, nStartX, nStartY,
+     ImplDrawWaveLine( nStartX, nStartY, 0, 0,
                       nEndX-nStartX, nWaveHeight, 1,
                       nOrientation, GetLineColor() );
     if( mpAlphaVDev )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 7b7f3bbcb4d3..09cf1734eb6f 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -67,6 +67,7 @@
 #include "cppuhelper/implbase1.hxx"
 #include <icc/sRGB-IEC61966-2.1.hxx>
 #include <vcl/lineinfo.hxx>
+#include "vcl/strhelper.hxx"
 
 using namespace vcl;
 using namespace rtl;
@@ -10839,7 +10840,7 @@ sal_Int32 PDFWriterImpl::setOutlineItemText( sal_Int32 nItem, const OUString& rT
     if( nItem < 1 || nItem >= (sal_Int32)m_aOutline.size() )
         return -1;
 
-    m_aOutline[ nItem ].m_aTitle = rText;
+    m_aOutline[ nItem ].m_aTitle = psp::WhitespaceToSpace( rText );
     return 0;
 }
 
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index f6bd81ef1bea..8b4bf5163839 100644..100755
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -186,17 +186,17 @@ public:
     {}
     ~ImplPrinterControllerData() { delete mpProgress; }
 
-    Size getRealPaperSize( const Size& i_rPageSize ) const
+    Size getRealPaperSize( const Size& i_rPageSize, bool bNoNUP ) const
     {
         if( maFixedPageSize.Width() > 0 && maFixedPageSize.Height() > 0 )
             return maFixedPageSize;
-        if( maMultiPage.nRows * maMultiPage.nColumns > 1 )
+        if( maMultiPage.nRows * maMultiPage.nColumns > 1 && ! bNoNUP )
             return maMultiPage.aPaperSize;
         return i_rPageSize;
     }
     bool isFixedPageSize() const
     { return maFixedPageSize.Width() != 0 && maFixedPageSize.Height() != 0; }
-    PrinterController::PageSize modifyJobSetup( const Sequence< PropertyValue >& i_rProps );
+    PrinterController::PageSize modifyJobSetup( const Sequence< PropertyValue >& i_rProps, bool bNoNUP );
 };
 
 PrinterController::PrinterController()
@@ -446,8 +446,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
             if( ! aDlg.Execute() )
             {
                 GDIMetaFile aPageFile;
-                i_pController->setLastPage( sal_True );
-                i_pController->getFilteredPageFile( 0, aPageFile );
+                i_pController->abortJob();
                 return;
             }
             if( aDlg.isPrintToFile() )
@@ -455,9 +454,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
                 rtl::OUString aFile = queryFile( pController->getPrinter().get() );
                 if( ! aFile.getLength() )
                 {
-                    GDIMetaFile aPageFile;
-                    i_pController->setLastPage( sal_True );
-                    i_pController->getFilteredPageFile( 0, aPageFile );
+                    i_pController->abortJob();
                     return;
                 }
                 pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocalFileName" ) ),
@@ -596,17 +593,25 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
         i_pController->jobStarted();
 
         int nJobs = 1;
-        int nRepeatCount = bUserCopy ? mnCopyCount : 1;
+        int nOuterRepeatCount = 1;
+        int nInnerRepeatCount = 1;
+        if( bUserCopy )
+        {
+            if( mbCollateCopy )
+                nOuterRepeatCount = mnCopyCount;
+            else
+                nInnerRepeatCount = mnCopyCount;
+        }
         if( bSinglePrintJobs )
         {
             nJobs = mnCopyCount;
             nCopies = 1;
-            nRepeatCount = 1;
+            nOuterRepeatCount = nInnerRepeatCount = 1;
         }
 
         for( int nJobIteration = 0; nJobIteration < nJobs; nJobIteration++ )
         {
-            bool bError = false;
+            bool bError = false, bAborted = false;
             if( mpPrinter->StartJob( pPrintFile,
                                      i_rJobName,
                                      Application::GetDisplayName(),
@@ -618,13 +623,26 @@ bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::
                 mbJobActive             = TRUE;
                 i_pController->createProgressDialog();
                 int nPages = i_pController->getFilteredPageCount();
-                for( int nIteration = 0; nIteration < nRepeatCount; nIteration++ )
+                for( int nOuterIteration = 0; nOuterIteration < nOuterRepeatCount && ! bAborted; nOuterIteration++ )
                 {
-                    for( int nPage = 0; nPage < nPages; nPage++ )
+                    for( int nPage = 0; nPage < nPages && ! bAborted; nPage++ )
                     {
-                        if( nPage == nPages-1 && nIteration == nRepeatCount-1 && nJobIteration == nJobs-1 )
-                            i_pController->setLastPage( sal_True );
-                        i_pController->printFilteredPage( nPage );
+                        for( int nInnerIteration = 0; nInnerIteration < nInnerRepeatCount && ! bAborted; nInnerIteration++ )
+                        {
+                            if( nPage == nPages-1 &&
+                                nOuterIteration == nOuterRepeatCount-1 &&
+                                nInnerIteration == nInnerRepeatCount-1 &&
+                                nJobIteration == nJobs-1 )
+                            {
+                                i_pController->setLastPage( sal_True );
+                            }
+                            i_pController->printFilteredPage( nPage );
+                            if( i_pController->isProgressCanceled() )
+                            {
+                                i_pController->abortJob();
+                                bAborted = true;
+                            }
+                        }
                     }
                     // FIXME: duplex ?
                 }
@@ -740,7 +758,7 @@ bool PrinterController::setupPrinter( Window* i_pParent )
     return bRet;
 }
 
-PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( const Sequence< PropertyValue >& i_rProps )
+PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( const Sequence< PropertyValue >& i_rProps, bool bNoNUP )
 {
     PrinterController::PageSize aPageSize;
     aPageSize.aSize = mpPrinter->GetPaperSize();
@@ -775,7 +793,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
     if( aSetSize.Width && aSetSize.Height )
     {
         Size aSetPaperSize( aSetSize.Width, aSetSize.Height );
-        Size aRealPaperSize( getRealPaperSize( aSetPaperSize ) );
+        Size aRealPaperSize( getRealPaperSize( aSetPaperSize, bNoNUP ) );
         if( aRealPaperSize != aCurSize )
             aIsSize = aSetSize;
     }
@@ -785,7 +803,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
         aPageSize.aSize.Width() = aIsSize.Width;
         aPageSize.aSize.Height() = aIsSize.Height;
 
-        Size aRealPaperSize( getRealPaperSize( aPageSize.aSize ) );
+        Size aRealPaperSize( getRealPaperSize( aPageSize.aSize, bNoNUP ) );
         if( aRealPaperSize != aCurSize )
             mpPrinter->SetPaperSizeUser( aRealPaperSize, ! isFixedPageSize() );
     }
@@ -851,7 +869,7 @@ PrinterController::PageSize PrinterController::getPageFile( int i_nUnfilteredPag
     mpImplData->mpPrinter->SetMapMode( aMapMode );
 
     // modify job setup if necessary
-    PrinterController::PageSize aPageSize = mpImplData->modifyJobSetup( aPageParm );
+    PrinterController::PageSize aPageSize = mpImplData->modifyJobSetup( aPageParm, true );
 
     o_rMtf.SetPrefSize( aPageSize.aSize );
     o_rMtf.SetPrefMapMode( aMapMode );
@@ -933,7 +951,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
         rMPS.nTopMargin == 0 && rMPS.nBottomMargin == 0 )
     {
         PrinterController::PageSize aPageSize = getPageFile( i_nFilteredPage, o_rMtf, i_bMayUseCache );
-        Size aPaperSize = mpImplData->getRealPaperSize( aPageSize.aSize );
+        Size aPaperSize = mpImplData->getRealPaperSize( aPageSize.aSize, true );
         mpImplData->mpPrinter->SetMapMode( MapMode( MAP_100TH_MM ) );
         mpImplData->mpPrinter->SetPaperSizeUser( aPaperSize, ! mpImplData->isFixedPageSize() );
         if( aPaperSize != aPageSize.aSize )
@@ -942,7 +960,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
             o_rMtf.WindStart();
             long nDX = (aPaperSize.Width() - aPageSize.aSize.Width()) / 2;
             long nDY = (aPaperSize.Height() - aPageSize.aSize.Height()) / 2;
-            o_rMtf.Move( nDX, nDY );
+            o_rMtf.Move( nDX, nDY, mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
             o_rMtf.WindStart();
             o_rMtf.SetPrefSize( aPaperSize );
             aPageSize.aSize = aPaperSize;
@@ -955,7 +973,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
     sal_Bool bIsLastPage = mpImplData->mbLastPage;
     mpImplData->mbLastPage = sal_False;
 
-    Size aPaperSize( mpImplData->getRealPaperSize( mpImplData->maMultiPage.aPaperSize ) );
+    Size aPaperSize( mpImplData->getRealPaperSize( mpImplData->maMultiPage.aPaperSize, false ) );
 
     // multi page area: page size minus margins + one time spacing right and down
     // the added spacing is so each subpage can be calculated including its spacing
@@ -1017,7 +1035,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
                 long nOffY = (aSubPageSize.Height() - long(double(aPageSize.aSize.Height()) * fScale)) / 2;
                 long nX = rMPS.nLeftMargin + nOffX + nAdvX * nCellX;
                 long nY = rMPS.nTopMargin + nOffY + nAdvY * nCellY;
-                aPageFile.Move( nX, nY );
+                aPageFile.Move( nX, nY, mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
                 aPageFile.WindStart();
                 // calculate border rectangle
                 Rectangle aSubPageRect( Point( nX, nY ),
@@ -1137,7 +1155,7 @@ void PrinterController::printFilteredPage( int i_nPage )
     {
         Point aPageOffset( mpImplData->mpPrinter->GetPageOffset() );
         aPageFile.WindStart();
-        aPageFile.Move( -aPageOffset.X(), -aPageOffset.Y() );
+        aPageFile.Move( -aPageOffset.X(), -aPageOffset.Y(), mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
     }
 
     GDIMetaFile aCleanedFile;
@@ -1169,6 +1187,13 @@ void PrinterController::jobFinished( view::PrintableState )
 void PrinterController::abortJob()
 {
     setJobState( view::PrintableState_JOB_ABORTED );
+    // applications (well, sw) depend on a page request with "IsLastPage" = true
+    // to free resources, else they (well, sw) will crash eventually
+    setLastPage( sal_True );
+    delete mpImplData->mpProgress;
+    mpImplData->mpProgress = NULL;
+    GDIMetaFile aMtf;
+    getPageFile( 0, aMtf, false );
 }
 
 void PrinterController::setLastPage( sal_Bool i_bLastPage )
@@ -1522,6 +1547,11 @@ void PrinterController::createProgressDialog()
         mpImplData->mpProgress->reset();
 }
 
+bool PrinterController::isProgressCanceled() const
+{
+    return mpImplData->mpProgress && mpImplData->mpProgress->isCanceled();
+}
+
 void PrinterController::setMultipage( const MultiPageSetup& i_rMPS )
 {
     mpImplData->maMultiPage = i_rMPS;
diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx
index 389accd631f0..7682cdb6c8ba 100644
--- a/vcl/source/glyphs/graphite_cache.cxx
+++ b/vcl/source/glyphs/graphite_cache.cxx
@@ -36,10 +36,10 @@
 #include <tools/debug.hxx>
 #include <vcl/sallayout.hxx>
 
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <graphite/GrClient.h>
 #include <graphite/Segment.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 #include <rtl/ustring.hxx>
 #include <vcl/graphite_layout.hxx>
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 9d7efc79400e..9d4d2529249d 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -67,13 +67,13 @@
 #include <unicode/uscript.h>
 
 // Graphite Libraries (must be after vcl headers on windows)
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/ITextSource.h>
 #include <graphite/Segment.h>
 #include <graphite/SegmentPainter.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 #include <vcl/graphite_layout.hxx>
 #include <vcl/graphite_features.hxx>
@@ -594,21 +594,39 @@ bool GraphiteLayout::LayoutText(ImplLayoutArgs & rArgs)
 {
 #ifdef GRCACHE
     GrSegRecord * pSegRecord = NULL;
-    gr::Segment * pSegment = CreateSegment(rArgs, &pSegRecord);
-    if (!pSegment)
-       return false;
-
+    gr::Segment * pSegment = NULL;
+    // Graphite can in rare cases crash with a zero length
+    if (rArgs.mnMinCharPos < rArgs.mnEndCharPos)
+    {
+        pSegment = CreateSegment(rArgs, &pSegRecord);
+        if (!pSegment)
+            return false;
+    }
+    else
+    {
+        clear();
+        return true;
+    }
     // layout the glyphs as required by OpenOffice
     bool success = LayoutGlyphs(rArgs, pSegment, pSegRecord);
 
     if (pSegRecord) pSegRecord->unlock();
     else delete pSegment;
 #else
-    gr::Segment * pSegment = CreateSegment(rArgs);
-    if (!pSegment)
-        return false;
-    bool success = LayoutGlyphs(rArgs, pSegment);
-    delete pSegment;
+    gr::Segment * pSegment = NULL;
+    bool success = true;
+    if (rArgs.mnMinCharPos < rArgs.mnEndCharPos)
+    {
+        pSegment = CreateSegment(rArgs);
+        if (!pSegment)
+            return false;
+        success = LayoutGlyphs(rArgs, pSegment);
+        if (pSegment) delete pSegment;
+    }
+    else
+    {
+        clear();
+    }
 #endif
     return success;
 }
@@ -659,7 +677,7 @@ public:
         return hash;
     };
 protected:
-    virtual void UniqueCacheInfo(std::wstring & stuFace, bool & fBold, bool & fItalic)
+    virtual void UniqueCacheInfo( ext_std::wstring& stuFace, bool& fBold, bool& fItalic )
     {
 #ifdef WIN32
         dynamic_cast<GraphiteWinFont&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic);
@@ -722,7 +740,7 @@ gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
             (GraphiteCacheHandler::instance).getCache(aFontHash);
         if (pCache)
         {
-            *pSegRecord = pCache->getSegment(rArgs, bRtl, nSegCharLimit);
+            *pSegRecord = pCache->getSegment(rArgs, bRtl, limit);
             if (*pSegRecord)
             {
                 pSegment = (*pSegRecord)->getSegment();
@@ -736,7 +754,34 @@ gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
                     (*pSegRecord)->clearVectors();
                 }
                 mpTextSrc->switchLayoutArgs(rArgs);
-                return pSegment;
+                if (limit > rArgs.mnMinCharPos && limit == rArgs.mnEndCharPos
+                    && pSegment->stopCharacter() != limit)
+                {
+                    // check that the last character is not part of a ligature
+                    glyph_set_range_t aGlyphSet = pSegment->charToGlyphs(limit - 1);
+                    if (aGlyphSet.first == aGlyphSet.second)
+                    {
+                        // no glyphs associated with this glyph - occurs mid ligature
+                        pSegment = NULL;
+                        *pSegRecord = NULL;
+                    }
+                    else
+                    {
+                        while (aGlyphSet.first != aGlyphSet.second)
+                        {
+                            int lastChar = static_cast<int>((*aGlyphSet.first).lastChar());
+                            if (lastChar >= limit)
+                            {
+                                pSegment = NULL;
+                                *pSegRecord = NULL;
+                                break;
+                            }
+                            aGlyphSet.first++;
+                        }
+                    }
+                }
+                if (pSegment)
+                    return pSegment;
             }
         }
 #endif
@@ -1058,7 +1103,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector<int> & rDelt
     {
         nXOffset = args.mpDXArray[nChars - 1] - mvCharDxs[nChars - 1];
     }
-    int nPrevClusterGlyph = (bRtl)? mvGlyphs.size() : -1;
+    int nPrevClusterGlyph = (bRtl)? (signed)mvGlyphs.size() : -1;
     int nPrevClusterLastChar = -1;
     for (size_t i = 0; i < nChars; i++)
     {
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
index 3912977cc9be..388f8a631b49 100644
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ b/vcl/source/glyphs/graphite_textsrc.hxx
@@ -59,11 +59,11 @@
 #include "vcl/dllapi.h"
 
 // Libraries
-#include <tools/preextstl.h>
+#include <preextstl.h>
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/ITextSource.h>
-#include <tools/postextstl.h>
+#include <postextstl.h>
 
 // Module type definitions and forward declarations.
 //
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 58f0a477c848..010cae338e0e 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -488,5 +488,6 @@ StringArray SV_PRINT_NATIVE_STRINGS
         < "Page number"; >;
         < "Number of pages"; >;
         < "More"; >;
+        < "Print selection only"; >;
     };
 };
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index efc49be6fbf8..e4d5a8c4c0eb 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <dndevdis.hxx>
-#include <dndlcon.hxx>
+#include <vcl/dndevdis.hxx>
+#include <vcl/dndlcon.hxx>
 #include <vcl/window.h>
 
 #include <vos/mutex.hxx>
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index c5d78dd6bae3..07819e76f957 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include<dndlcon.hxx>
+#include <vcl/dndlcon.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 81676eba3be4..e77eacb2fddf 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3722,7 +3722,7 @@ USHORT PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, ULONG nPopupM
     if ( GetItemCount() )
     {
         SalMenu* pMenu = ImplGetSalMenu();
-        if( pMenu && pMenu->ShowNativePopupMenu( pWin, aRect, nPopupModeFlags | FLOATWIN_POPUPMODE_GRABFOCUS ) )
+        if( pMenu && bRealExecute && pMenu->ShowNativePopupMenu( pWin, aRect, nPopupModeFlags | FLOATWIN_POPUPMODE_GRABFOCUS ) )
         {
             pWin->StopExecute(0);
             pWin->doShutdown();
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 4490bfb3dbeb..a0be94674328 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -498,8 +498,10 @@ void PrintDialog::NUpTabPage::showAdvancedControls( bool i_bShow )
 
 void PrintDialog::NUpTabPage::setupLayout()
 {
-    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
-    long nIndent = 3*aBorder.Width();
+    Size aBorder( LogicToPixel( Size( 6, 6 ), MapMode( MAP_APPFONT ) ) );
+    /*  According to OOo style guide, the horizontal indentation of child
+        elements to their parent element should always be 6 map units. */
+    long nIndent = aBorder.Width();
 
     maLayout.setParentWindow( this );
     maLayout.setOuterBorder( aBorder.Width() );
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 689c56cbe619..62fbe2e507f3 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -49,7 +49,8 @@
 
 // =======================================================================
 
-// Achtung: Darf keine Objekte enthalten, da mit memmove/memcpy gearbeitet wird
+// Attention: Must not contain non-PODs because array is enlarged/copied
+// with the use of memmove/memcpy.
 struct ImplSplitItem
 {
     long                mnSize;
@@ -71,6 +72,10 @@ struct ImplSplitItem
     SplitWindowItemBits mnBits;
     BOOL                mbFixed;
     BOOL                mbSubSize;
+    /// Minimal width or height of the item.  -1 means no restriction.
+    long                mnMinSize;
+    /// Maximal width or height of the item.  -1 means no restriction.
+    long                mnMaxSize;
 };
 
 struct ImplSplitSet
@@ -85,6 +90,28 @@ struct ImplSplitSet
     BOOL                mbCalcPix;
 };
 
+
+
+/** Check whether the given size is inside the valid range defined by
+    [rItem.mnMinSize,rItem.mnMaxSize].  When it is not inside it then return
+    the upper or lower bound, respectively. Otherwise return the given size
+    unmodified.
+    Note that either mnMinSize and/or mnMaxSize can be -1 in which case the
+    size has not lower or upper bound.
+*/
+namespace {
+    long ValidateSize (const long nSize, const ImplSplitItem rItem)
+    {
+        if (rItem.mnMinSize>=0 && nSize<rItem.mnMinSize)
+            return rItem.mnMinSize;
+        else if (rItem.mnMaxSize>0 && nSize>rItem.mnMaxSize)
+            return rItem.mnMaxSize;
+        else
+            return nSize;
+    }
+}
+
+
 #define SPLITWIN_SPLITSIZE              3
 #define SPLITWIN_SPLITSIZEEX            4
 #define SPLITWIN_SPLITSIZEEXLN          6
@@ -2850,7 +2877,7 @@ void SplitWindow::InsertItem( USHORT nId, Window* pWindow, long nSize,
     DBG_ASSERT( !ImplFindItem( mpMainSet, nId, nDbgDummy ), "SplitWindow::InsertItem() - Id already exists" );
 #endif
 
-    // Size muss min. 1 sein
+    // Size has to be at least 1.
     if ( nSize < 1 )
         nSize = 1;
 
@@ -2858,7 +2885,7 @@ void SplitWindow::InsertItem( USHORT nId, Window* pWindow, long nSize,
     ImplSplitSet* pNewSet;
     ImplSplitItem* pItem;
 
-    // Platz fuer neues Item schaffen
+    // Make room for the new item.
     if ( nPos > pSet->mnItems )
         nPos = pSet->mnItems;
     ImplSplitItem* pNewItems = new ImplSplitItem[pSet->mnItems+1];
@@ -2871,19 +2898,21 @@ void SplitWindow::InsertItem( USHORT nId, Window* pWindow, long nSize,
     pSet->mnItems++;
     pSet->mbCalcPix = TRUE;
 
-    // Item anlegen und erweitern
+    // Create and initialize item.
     pItem           = &(pSet->mpItems[nPos]);
     memset( pItem, 0, sizeof( ImplSplitItem ) );
     pItem->mnSize   = nSize;
     pItem->mnId     = nId;
     pItem->mnBits   = nBits;
+    pItem->mnMinSize=-1;
+    pItem->mnMaxSize=-1;
 
     if ( pWindow )
     {
         pItem->mpWindow         = pWindow;
         pItem->mpOrgParent      = pWindow->GetParent();
 
-        // Window mit SplitWindow verbinden
+        // Attach window to SplitWindow.
         pWindow->Hide();
         pWindow->SetParent( this );
     }
@@ -3251,6 +3280,10 @@ void SplitWindow::SplitItem( USHORT nId, long nNewSize,
     nItems = pSet->mnItems;
     pItems = pSet->mpItems;
 
+    // When there is an explicit minimum or maximum size then move nNewSize
+    // into that range (when it is not yet already in it.)
+    nNewSize = ValidateSize(nNewSize, pItems[nPos]);
+
     if ( mbCalc )
     {
         pItems[nPos].mnSize = nNewSize;
@@ -3552,6 +3585,36 @@ long SplitWindow::GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const
         return 0;
 }
 
+
+
+
+void SplitWindow::SetItemSizeRange (USHORT nId, const Range aRange)
+{
+    USHORT nPos;
+    ImplSplitSet* pSet = ImplFindItem(mpBaseSet, nId, nPos);
+
+    if (pSet != NULL)
+    {
+        pSet->mpItems[nPos].mnMinSize = aRange.Min();
+        pSet->mpItems[nPos].mnMaxSize = aRange.Max();
+    }
+}
+
+
+
+
+Range SplitWindow::GetItemSizeRange (USHORT nId) const
+{
+    USHORT nPos;
+    ImplSplitSet* pSet = ImplFindItem(mpBaseSet, nId, nPos);
+
+    if (pSet != NULL)
+        return Range (pSet->mpItems[nPos].mnMinSize, pSet->mpItems[nPos].mnMaxSize);
+    else
+        return Range(-1,-1);
+}
+
+
 // -----------------------------------------------------------------------
 
 void SplitWindow::SetItemBits( USHORT nId, SplitWindowItemBits nNewBits )
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index c09dc464b809..1adabe487492 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -206,7 +206,7 @@ BOOL TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent )
     BOOL bFocusInList = FALSE;
     KeyCode aKeyCode = aKeyEvent.GetKeyCode();
     BOOL bForward = !aKeyCode.IsShift();
-    if( aKeyCode.GetCode() == KEY_F6 ) // F6
+    if( aKeyCode.GetCode() == KEY_F6 && ! aKeyCode.IsMod2() ) // F6
     {
         bSplitterOnly = aKeyCode.IsMod1() && aKeyCode.IsShift();
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 35641ab8d6f9..adedbde4c0f2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -88,8 +88,8 @@
 
 #include "vcl/dialog.hxx"
 #include "vcl/unowrap.hxx"
-#include "dndlcon.hxx"
-#include "dndevdis.hxx"
+#include "vcl/dndlcon.hxx"
+#include "vcl/dndevdis.hxx"
 #include "vcl/impbmpconv.hxx"
 #include "unotools/confignode.hxx"
 #include "vcl/gdimtf.hxx"
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 7b0512a1320b..c964ad0d739b 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -62,7 +62,7 @@
 #include <vcl/salgdi.hxx>
 #include <vcl/menu.hxx>
 
-#include <dndlcon.hxx>
+#include <vcl/dndlcon.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 13492f3d4a5c..ad33cdf67de6 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -77,11 +77,10 @@ atk_wrapper_focus_idle_handler (gpointer data)
     uno::Reference< accessibility::XAccessible > xAccessible = xNextFocusObject;
     if( xAccessible.get() == reinterpret_cast < accessibility::XAccessible * > (data) )
     {
+        AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : NULL;
         // Gail does not notify focus changes to NULL, so do we ..
-        if( xAccessible.is() )
+        if( atk_obj )
         {
-            AtkObject *atk_obj = atk_object_wrapper_ref( xAccessible );
-
 #ifdef ENABLE_TRACING
             fprintf(stderr, "notifying focus event for %p\n", atk_obj);
 #endif
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 1f1c469bf9a1..322530b881cc 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -489,6 +489,7 @@ class GtkXLib : public SalXLib
     GSource             *m_pUserEvent;
     oslMutex             m_aDispatchMutex;
     oslCondition         m_aDispatchCondition;
+    XIOErrorHandler      m_aOrigGTKXIOErrorHandler;
 
 public:
     static gboolean      timeoutFn(gpointer data);
@@ -522,6 +523,7 @@ GtkXLib::GtkXLib()
     m_pUserEvent = NULL;
     m_aDispatchCondition = osl_createCondition();
     m_aDispatchMutex = osl_createMutex();
+    m_aOrigGTKXIOErrorHandler = NULL;
 }
 
 GtkXLib::~GtkXLib()
@@ -535,6 +537,9 @@ GtkXLib::~GtkXLib()
     osl_setCondition( m_aDispatchCondition );
     osl_destroyCondition( m_aDispatchCondition );
     osl_destroyMutex( m_aDispatchMutex );
+
+    PopXErrorLevel();
+    XSetIOErrorHandler (m_aOrigGTKXIOErrorHandler);
 }
 
 void GtkXLib::Init()
@@ -596,6 +601,10 @@ void GtkXLib::Init()
     // init gtk/gdk
     gtk_init_check( &nParams, &pCmdLineAry );
 
+    //gtk_init_check sets XError/XIOError handlers, we want our own one
+    m_aOrigGTKXIOErrorHandler = XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl );
+    PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) );
+
     for (i = 0; i < nParams; i++ )
         g_free( pCmdLineAry[i] );
     delete [] pCmdLineAry;
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 68617c8c16be..faedc7e5e600 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -76,7 +76,7 @@ void GtkHookedYieldMutex::ThreadsLeave()
 
 #if OSL_DEBUG_LEVEL > 1
     if( mnThreadId &&
-        mnThreadId != NAMESPACE_VOS(OThread)::getCurrentIdentifier())
+        mnThreadId != vos::OThread::getCurrentIdentifier())
         fprintf( stderr, "\n\n--- A different thread owns the mutex ...---\n\n\n");
 #endif
 
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 9d3ce6b137cd..b8a3ac773a8f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -732,12 +732,6 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
                             const ImplControlValue& aValue,
                             const OUString& rCaption )
 {
-    if( (nType==CTRL_CHECKBOX) && (nPart==PART_ENTIRE_CONTROL) &&
-        aValue.getTristateVal() == BUTTONVALUE_MIXED )
-    {
-        return drawNativeMixedStateCheck( nType, nPart, rControlRegion, nState, aValue, rCaption );
-    }
-
     BOOL            returnVal = FALSE;
     // get a GC with current clipping region set
     SelectFont();
@@ -895,55 +889,6 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
     return( returnVal );
 }
 
-BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
-                                                ControlPart nPart,
-                                                const Rectangle& rControlRegion,
-                                                ControlState nState,
-                                                const ImplControlValue& aValue,
-                                                const OUString& rCaption )
-{
-    // need to emulate something for mixed state
-
-    // do this via pixmap since some themes don't care for regions
-    bool bOldNeedPixmapPaint = bNeedPixmapPaint;
-    bNeedPixmapPaint = true;
-
-    Rectangle aCtrlRect = rControlRegion;
-    BOOL      returnVal = FALSE;
-    SelectFont();
-
-    // draw upper half in off state
-    const_cast<ImplControlValue&>(aValue).setTristateVal( BUTTONVALUE_OFF );
-    XLIB_Region aRegion = XCreateRegion();
-    XRectangle aXRect = { aCtrlRect.Left(), aCtrlRect.Top(), aCtrlRect.GetWidth(), aCtrlRect.GetHeight() };
-    const unsigned short nH = aXRect.height/2;
-    aXRect.height -= nH;
-    XUnionRectWithRegion( &aXRect, aRegion, aRegion );
-    SetClipRegion( pFontGC_, aRegion );
-    XDestroyRegion( aRegion );
-
-    returnVal = drawNativeControl( nType, nPart, rControlRegion, nState, aValue, rCaption );
-
-    if( returnVal )
-    {
-        // draw lower half in on state
-        const_cast<ImplControlValue&>(aValue).setTristateVal( BUTTONVALUE_ON );
-        aXRect.y += nH;
-        aRegion = XCreateRegion();
-        XUnionRectWithRegion( &aXRect, aRegion, aRegion );
-        SetClipRegion( pFontGC_, aRegion );
-        XDestroyRegion( aRegion );
-        returnVal = drawNativeControl( nType, nPart, rControlRegion, nState, aValue, rCaption );
-    }
-
-    // clean up
-    bNeedPixmapPaint = bOldNeedPixmapPaint;
-    const_cast<ImplControlValue&>(aValue).setTristateVal( BUTTONVALUE_MIXED );
-    SetClipRegion( pFontGC_ );
-    return returnVal;
-}
-
-
 /*
  * DrawNativeControlText()
  *
@@ -1378,7 +1323,8 @@ BOOL GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
 {
     GtkStateType    stateType;
     GtkShadowType   shadowType;
-    BOOL            isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON) ? TRUE : FALSE;
+    bool            isChecked = (aValue.getTristateVal() == BUTTONVALUE_ON);
+    bool            isInconsistent = (aValue.getTristateVal() == BUTTONVALUE_MIXED);
     GdkRectangle    clipRect;
     gint            x,y;
 
@@ -1393,7 +1339,7 @@ BOOL GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
     y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
 
     // Set the shadow based on if checked or not so we get a checkmark.
-    shadowType = isChecked ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
+    shadowType = isChecked ? GTK_SHADOW_IN : isInconsistent ? GTK_SHADOW_ETCHED_IN : GTK_SHADOW_OUT;
     NWSetWidgetState( gWidgetData[m_nScreen].gCheckWidget, nState, stateType );
     GTK_TOGGLE_BUTTON(gWidgetData[m_nScreen].gCheckWidget)->active = isChecked;
 
@@ -2291,11 +2237,10 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
                                         const ImplControlValue& aValue,
                                         const OUString& )
 {
-    OSL_ASSERT( aValue.getType() == CTRL_TAB_ITEM );
+    OSL_ASSERT( nType != CTRL_TAB_ITEM || aValue.getType() == CTRL_TAB_ITEM );
     GdkPixmap * pixmap;
     Rectangle       pixmapRect;
     Rectangle       tabRect;
-    const TabitemValue *    pTabitemValue = static_cast<const TabitemValue *>(&aValue);
     GtkStateType    stateType;
     GtkShadowType   shadowType;
     if( ! gWidgetData[ m_nScreen ].gCacheTabItems )
@@ -2311,9 +2256,8 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
     if( !aCachePage.GetSize() )
         aCachePage.SetSize( 1 );
 
-    if ( !pTabitemValue && (nType==CTRL_TAB_ITEM) )
+    if ( (nType == CTRL_TAB_ITEM) && (aValue.getType() != CTRL_TAB_ITEM) )
     {
-        std::fprintf( stderr, "NWPaintGTKTabItem() received a NULL TabitemValue.  Cannot draw native tab\n" );
         return( false );
     }
 
@@ -2326,6 +2270,7 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
     pixmapRect = rControlRectangle;
     if ( nType == CTRL_TAB_ITEM )
     {
+        const TabitemValue *    pTabitemValue = static_cast<const TabitemValue *>(&aValue);
         if ( !pTabitemValue->isFirst() )
         {
             // GTK+ tabs overlap on the right edge (the top tab obscures the
@@ -2534,7 +2479,6 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
     gint            g_x=0, g_y=0, g_w=10, g_h=10;
     bool            bPaintButton = true;
     GtkWidget*      pButtonWidget = gWidgetData[m_nScreen].gToolbarButtonWidget;
-    const gchar*    pButtonDetail = "button";
     GdkRectangle    clipRect;
 
     NWEnsureGTKToolbar( m_nScreen );
@@ -2593,13 +2537,18 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
         {
             pButtonWidget = gWidgetData[m_nScreen].gToolbarToggleWidget;
             shadowType = GTK_SHADOW_IN;
+            stateType = GTK_STATE_ACTIVE;
             // special case stateType value for depressed toggle buttons
             // cf. gtk+/gtk/gtktogglebutton.c (gtk_toggle_button_update_state)
-            if( ! (nState & (CTRL_STATE_PRESSED|CTRL_STATE_ROLLOVER)) )
-                stateType = GTK_STATE_ACTIVE;
-            pButtonDetail = "togglebutton";
+            if( (nState & (CTRL_STATE_ROLLOVER|CTRL_STATE_PRESSED)) )
+            {
+                stateType = GTK_STATE_PRELIGHT;
+                shadowType = GTK_SHADOW_OUT;
+            }
             bPaintButton = true;
         }
+        else
+            stateType = GTK_STATE_PRELIGHT; // only for bPaintButton = true, in which case always rollver is meant
 
         NWSetWidgetState( pButtonWidget, nState, stateType );
         gtk_widget_ensure_style( pButtonWidget );
@@ -2657,7 +2606,7 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
                                stateType,
                                shadowType,
                                &clipRect,
-                               pButtonWidget, pButtonDetail, x, y, w, h );
+                               pButtonWidget, "button", x, y, w, h );
             }
         }
     }
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx
index 466b56868900..5c3be54f9ddc 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.cxx
@@ -302,7 +302,7 @@ vos::IMutex* SvpSalInstance::GetYieldMutex()
 ULONG SvpSalInstance::ReleaseYieldMutex()
 {
     if ( m_aYieldMutex.GetThreadId() ==
-         NAMESPACE_VOS(OThread)::getCurrentIdentifier() )
+         vos::OThread::getCurrentIdentifier() )
     {
         ULONG nCount = m_aYieldMutex.GetAcquireCount();
         ULONG n = nCount;
@@ -464,13 +464,13 @@ SvpSalYieldMutex::SvpSalYieldMutex()
 void SvpSalYieldMutex::acquire()
 {
     OMutex::acquire();
-    mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier();
+    mnThreadId = vos::OThread::getCurrentIdentifier();
     mnCount++;
 }
 
 void SvpSalYieldMutex::release()
 {
-    if ( mnThreadId == NAMESPACE_VOS(OThread)::getCurrentIdentifier() )
+    if ( mnThreadId == vos::OThread::getCurrentIdentifier() )
     {
         if ( mnCount == 1 )
             mnThreadId = 0;
@@ -483,7 +483,7 @@ sal_Bool SvpSalYieldMutex::tryToAcquire()
 {
     if ( OMutex::tryToAcquire() )
     {
-        mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier();
+        mnThreadId = vos::OThread::getCurrentIdentifier();
         mnCount++;
         return sal_True;
     }
diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx
index 284a2d11cd82..d931a2735ff9 100644
--- a/vcl/unx/headless/svpinst.hxx
+++ b/vcl/unx/headless/svpinst.hxx
@@ -46,11 +46,11 @@
 // SalYieldMutex
 // -------------------------------------------------------------------------
 
-class SvpSalYieldMutex : public NAMESPACE_VOS(OMutex)
+class SvpSalYieldMutex : public vos::OMutex
 {
 protected:
     ULONG                                       mnCount;
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   mnThreadId;
+    vos::OThread::TThreadIdentifier mnThreadId;
 
 public:
                                                 SvpSalYieldMutex();
@@ -60,7 +60,7 @@ public:
     virtual sal_Bool                            tryToAcquire();
 
     ULONG                                       GetAcquireCount() const { return mnCount; }
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   GetThreadId() const { return mnThreadId; }
+    vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; }
 };
 
 // ---------------
diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
index 7544a566d8ae..38c79b3e11df 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
@@ -178,10 +178,6 @@ protected:
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-
-    BOOL drawNativeMixedStateCheck( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                    ControlState nState, const ImplControlValue& aValue,
-                                    const rtl::OUString& rCaption );
 };
 
 #endif // _VCL_GTKGDI_HXX
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index 7e38e0a89bf2..939437060750 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.hxx
@@ -63,6 +63,7 @@ protected:
             SalDisplay         *m_pSalDisplay;
             pthread_t           hMainThread_;
             rtl::OUString       maLocalHostName;
+            rtl::OUString       maUnicodeAccumulator;
 
 public:
     X11SalData();
@@ -90,6 +91,7 @@ public:
 
     const rtl::OUString&    GetLocalHostName() const
     { return maLocalHostName; }
+    rtl::OUString&          GetUnicodeAccumulator() { return maUnicodeAccumulator; }
 
     static int XErrorHdl( Display*, XErrorEvent* );
     static int XIOErrorHdl( Display* );
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index ed173e61fe61..9786bac76f35 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -208,6 +208,10 @@ public:
     bool                    isMapped() const { return bMapped_; }
     bool                    hasFocus() const { return mbInputFocus; }
 
+    void                    beginUnicodeSequence();
+    bool                    appendUnicodeSequence( sal_Unicode );
+    bool                    endUnicodeSequence();
+
     virtual SalGraphics*        GetGraphics();
     virtual void                ReleaseGraphics( SalGraphics* pGraphics );
 
diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h
index d73d67f81425..8f4719f098f0 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/unx/inc/salinst.h
@@ -39,11 +39,11 @@
 #include <vcl/dllapi.h>
 #include <vcl/salinst.hxx>
 
-class VCL_DLLPUBLIC SalYieldMutex : public NAMESPACE_VOS(OMutex)
+class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex
 {
 protected:
     ULONG                                       mnCount;
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   mnThreadId;
+    vos::OThread::TThreadIdentifier mnThreadId;
 
 public:
                                                 SalYieldMutex();
@@ -53,7 +53,7 @@ public:
     virtual sal_Bool                            tryToAcquire();
 
     ULONG                                       GetAcquireCount() const { return mnCount; }
-    NAMESPACE_VOS(OThread)::TThreadIdentifier   GetThreadId() const { return mnThreadId; }
+    vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; }
 };
 
 // -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 13a0d1093c8e..acf8c91ab5db 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -2255,7 +2255,7 @@ void SalX11Display::Yield()
 
     XEvent aEvent;
     DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() ==
-                NAMESPACE_VOS(OThread)::getCurrentIdentifier(),
+                vos::OThread::getCurrentIdentifier(),
                 "will crash soon since solar mutex not locked in SalDisplay::Yield" );
 
     XNextEvent( pDisp_, &aEvent );
diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx
index 8a8db44cefcd..49a9cceb8617 100644
--- a/vcl/unx/source/app/salinst.cxx
+++ b/vcl/unx/source/app/salinst.cxx
@@ -66,13 +66,13 @@ SalYieldMutex::SalYieldMutex()
 void SalYieldMutex::acquire()
 {
     OMutex::acquire();
-    mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier();
+    mnThreadId = vos::OThread::getCurrentIdentifier();
     mnCount++;
 }
 
 void SalYieldMutex::release()
 {
-    if ( mnThreadId == NAMESPACE_VOS(OThread)::getCurrentIdentifier() )
+    if ( mnThreadId == vos::OThread::getCurrentIdentifier() )
     {
         if ( mnCount == 1 )
             mnThreadId = 0;
@@ -85,7 +85,7 @@ sal_Bool SalYieldMutex::tryToAcquire()
 {
     if ( OMutex::tryToAcquire() )
     {
-        mnThreadId = NAMESPACE_VOS(OThread)::getCurrentIdentifier();
+        mnThreadId = vos::OThread::getCurrentIdentifier();
         mnCount++;
         return True;
     }
@@ -231,7 +231,7 @@ ULONG X11SalInstance::ReleaseYieldMutex()
 {
     SalYieldMutex* pYieldMutex = mpSalYieldMutex;
     if ( pYieldMutex->GetThreadId() ==
-         NAMESPACE_VOS(OThread)::getCurrentIdentifier() )
+         vos::OThread::getCurrentIdentifier() )
     {
         ULONG nCount = pYieldMutex->GetAcquireCount();
         ULONG n = nCount;
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 7f205407b21b..403ee9707a94 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -28,15 +28,17 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "saldisp.hxx"
+#include "saldata.hxx"
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+
 #include "tools/prex.h"
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
-#include <X11/Xlib.h>
-#include <X11/X.h>
 #include <X11/Xutil.h>
 #include "tools/postx.h"
 #if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
@@ -3259,6 +3261,8 @@ void SelectionManager::startDrag(
         return;
     }
 
+    SalFrame* pCaptureFrame = NULL;
+
     {
         ClearableMutexGuard aGuard(m_aMutex);
 
@@ -3327,6 +3331,32 @@ void SelectionManager::startDrag(
                           None,
                           None,
                           CurrentTime );
+        /* if we could not grab the pointer here, there is a chance
+           that the pointer is grabbed by the other vcl display (the main loop)
+           so let's break that grab an reset it later
+
+           remark: this whole code should really be molten into normal vcl so only
+           one display is used ....
+        */
+        if( nPointerGrabSuccess != GrabSuccess )
+        {
+            vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+            if( rSolarMutex.tryToAcquire() )
+            {
+                pCaptureFrame = GetX11SalData()->GetDisplay()->GetCaptureFrame();
+                if( pCaptureFrame )
+                {
+                    GetX11SalData()->GetDisplay()->CaptureMouse( NULL );
+                    nPointerGrabSuccess =
+                                XGrabPointer( m_pDisplay, it->second.m_aRootWindow, True,
+                                              DRAG_EVENT_MASK,
+                                              GrabModeAsync, GrabModeAsync,
+                                              None,
+                                              None,
+                                              CurrentTime );
+                }
+            }
+        }
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "%d\n", nPointerGrabSuccess );
 #endif
@@ -3349,6 +3379,16 @@ void SelectionManager::startDrag(
             aGuard.clear();
             if( listener.is() )
                 listener->dragDropEnd( aDragFailedEvent );
+            if( pCaptureFrame )
+            {
+                vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+                if( rSolarMutex.tryToAcquire() )
+                    GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
+#if OSL_DEBUG_LEVEL > 0
+                else
+                    OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" );
+#endif
+            }
             return;
         }
 
@@ -3428,6 +3468,17 @@ void SelectionManager::startDrag(
         XUngrabKeyboard( m_pDisplay, CurrentTime );
         XFlush( m_pDisplay );
 
+        if( pCaptureFrame )
+        {
+            vos::IMutex& rSolarMutex( Application::GetSolarMutex() );
+            if( rSolarMutex.tryToAcquire() )
+                GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame );
+#if OSL_DEBUG_LEVEL > 0
+            else
+                OSL_ENSURE( 0, "failed to acquire SolarMutex to reset capture frame" );
+#endif
+        }
+
         m_aDragRunning.reset();
 
         if( listener.is() )
@@ -3915,6 +3966,18 @@ void SelectionManager::deregisterHandler( Atom selection )
 
 // ------------------------------------------------------------------------
 
+static bool bWasError = false;
+
+extern "C"
+{
+    int local_xerror_handler(Display* , XErrorEvent*)
+    {
+        bWasError = true;
+        return 0;
+    }
+    typedef int(*xerror_hdl_t)(Display*,XErrorEvent*);
+}
+
 void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTarget )
 {
     MutexGuard aGuard(m_aMutex);
@@ -3926,18 +3989,31 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar
         OSL_ASSERT( "attempt to register window as drop target twice" );
     else if( aWindow && m_pDisplay )
     {
-        XSelectInput( m_pDisplay, aWindow, PropertyChangeMask );
-
-        // set XdndAware
-        XChangeProperty( m_pDisplay, aWindow, m_nXdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&nXdndProtocolRevision, 1 );
-
         DropTargetEntry aEntry( pTarget );
-        // get root window of window (in 99.999% of all cases this will be
-        // DefaultRootWindow( m_pDisplay )
-        int x, y;
-        unsigned int w, h, bw, d;
-        XGetGeometry( m_pDisplay, aWindow, &aEntry.m_aRootWindow,
-                      &x, &y, &w, &h, &bw, &d );
+        bWasError=false;
+        /* #i100000# ugly workaround: gtk sets its own XErrorHandler which is not suitable for us
+           unfortunately XErrorHandler is not per display, so this is just and ugly hack
+           Need to remove separate display and integrate clipboard/dnd into vcl's unx code ASAP
+        */
+        xerror_hdl_t pOldHandler = XSetErrorHandler( local_xerror_handler );
+        XSelectInput( m_pDisplay, aWindow, PropertyChangeMask );
+        if( ! bWasError )
+        {
+            // set XdndAware
+            XChangeProperty( m_pDisplay, aWindow, m_nXdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&nXdndProtocolRevision, 1 );
+            if( ! bWasError )
+            {
+                // get root window of window (in 99.999% of all cases this will be
+                // DefaultRootWindow( m_pDisplay )
+                int x, y;
+                unsigned int w, h, bw, d;
+                XGetGeometry( m_pDisplay, aWindow, &aEntry.m_aRootWindow,
+                              &x, &y, &w, &h, &bw, &d );
+            }
+        }
+        XSetErrorHandler( pOldHandler );
+        if(bWasError)
+            return;
         m_aDropTargets[ aWindow ] = aEntry;
     }
     else
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index ae21c3aa9f7b..9215f2e25b16 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -1127,6 +1127,8 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
     basegfx::B2DTrapezoidVector aB2DTrapVector;
     basegfx::tools::trapezoidSubdivide( aB2DTrapVector, aPolyPoly );
     const int nTrapCount = aB2DTrapVector.size();
+    if( !nTrapCount )
+        return true;
     const bool bDrawn = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, fTransparency );
     return bDrawn;
 }
@@ -1238,12 +1240,17 @@ bool X11SalGraphics::drawPolyLine(const ::basegfx::B2DPolygon& rPolygon, double
         basegfx::tools::createLineTrapezoidFromB2DPolygon( aB2DTrapVector, aPolygon, rLineWidth.getX() );
 
         // draw tesselation result
-        const int nTrapCount = aB2DTrapVector.size();
-        const bool bDrawOk = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, fTransparency );
+        if( ! aB2DTrapVector.empty() )
+        {
+            const int nTrapCount = aB2DTrapVector.size();
+            const bool bDrawOk = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, fTransparency );
 
-        // restore the original brush GC
-        nBrushColor_ = aKeepBrushColor;
-        return bDrawOk;
+            // restore the original brush GC
+            nBrushColor_ = aKeepBrushColor;
+            return bDrawOk;
+        }
+        else
+            return true;
     }
 
     // get the area polygon for the line polygon
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index b0248662a2a2..9934277302e1 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -3144,6 +3144,100 @@ GetAlternateKeyCode( const USHORT nKeyCode )
     return aAlternate;
 }
 
+void X11SalFrame::beginUnicodeSequence()
+{
+    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+    DeletionListener aDeleteWatch( this );
+
+    if( rSeq.getLength() )
+        endUnicodeSequence();
+
+    rSeq = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "u" ) );
+
+    if( ! aDeleteWatch.isDeleted() )
+    {
+        USHORT nTextAttr = SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
+        SalExtTextInputEvent aEv;
+        aEv.mnTime          = 0;
+        aEv.maText          = rSeq;
+        aEv.mpTextAttr      = &nTextAttr;
+        aEv.mnCursorPos     = 0;
+        aEv.mnDeltaStart    = 0;
+        aEv.mnCursorFlags   = 0;
+        aEv.mbOnlyCursor    = FALSE;
+
+        CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
+    }
+}
+
+bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
+{
+    bool bRet = false;
+    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+    if( rSeq.getLength() > 0 )
+    {
+        // range check
+        if( (c >= sal_Unicode('0') && c <= sal_Unicode('9')) ||
+            (c >= sal_Unicode('a') && c <= sal_Unicode('f')) ||
+            (c >= sal_Unicode('A') && c <= sal_Unicode('F')) )
+        {
+            rtl::OUStringBuffer aBuf( rSeq.getLength() + 1 );
+            aBuf.append( rSeq );
+            aBuf.append( c );
+            rSeq = aBuf.makeStringAndClear();
+            std::vector<USHORT> attribs( rSeq.getLength(), SAL_EXTTEXTINPUT_ATTR_UNDERLINE );
+
+            SalExtTextInputEvent aEv;
+            aEv.mnTime          = 0;
+            aEv.maText          = rSeq;
+            aEv.mpTextAttr      = &attribs[0];
+            aEv.mnCursorPos     = 0;
+            aEv.mnDeltaStart    = 0;
+            aEv.mnCursorFlags   = 0;
+            aEv.mbOnlyCursor    = FALSE;
+
+            CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
+            bRet = true;
+        }
+        else
+            bRet = endUnicodeSequence();
+    }
+    else
+        endUnicodeSequence();
+    return bRet;
+}
+
+bool X11SalFrame::endUnicodeSequence()
+{
+    rtl::OUString& rSeq( GetX11SalData()->GetUnicodeAccumulator() );
+
+    DeletionListener aDeleteWatch( this );
+    if( rSeq.getLength() > 1 && rSeq.getLength() < 6 )
+    {
+        // cut the "u"
+        rtl::OUString aNumbers( rSeq.copy( 1 ) );
+        sal_Int32 nValue = aNumbers.toInt32( 16 );
+        if( nValue >= 32 )
+        {
+            USHORT nTextAttr = SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
+            SalExtTextInputEvent aEv;
+            aEv.mnTime          = 0;
+            aEv.maText          = rtl::OUString( sal_Unicode(nValue) );
+            aEv.mpTextAttr      = &nTextAttr;
+            aEv.mnCursorPos     = 0;
+            aEv.mnDeltaStart    = 0;
+            aEv.mnCursorFlags   = 0;
+            aEv.mbOnlyCursor    = FALSE;
+            CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
+        }
+    }
+    bool bWasInput = rSeq.getLength() > 0;
+    rSeq = rtl::OUString();
+    if( bWasInput && ! aDeleteWatch.isDeleted() )
+        CallCallback(SALEVENT_ENDEXTTEXTINPUT, NULL);
+    return bWasInput;
+}
+
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
 {
@@ -3189,6 +3283,9 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
     if( pEvent->state & Mod1Mask )
         nModCode |= KEY_MOD2;
 
+    if( nModCode != (KEY_SHIFT|KEY_MOD1) )
+        endUnicodeSequence();
+
     if(     nKeySym == XK_Shift_L   || nKeySym == XK_Shift_R
         ||  nKeySym == XK_Control_L || nKeySym == XK_Control_R
         ||  nKeySym == XK_Alt_L     || nKeySym == XK_Alt_R
@@ -3312,6 +3409,33 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
     if( !nKeyCode && !nLen && !nKeyString)
         return 0;
 
+    DeletionListener aDeleteWatch( this );
+
+    if( nModCode == (KEY_SHIFT | KEY_MOD1) && pEvent->type == XLIB_KeyPress )
+    {
+        USHORT nSeqKeyCode = pDisplay_->GetKeyCode( nUnmodifiedKeySym, &aDummy );
+        if( nSeqKeyCode == KEY_U )
+        {
+            beginUnicodeSequence();
+            return 1;
+        }
+        else if( nSeqKeyCode >= KEY_0 && nSeqKeyCode <= KEY_9 )
+        {
+            if( appendUnicodeSequence( sal_Unicode( '0' ) + sal_Unicode(nSeqKeyCode - KEY_0) ) )
+                return 1;
+        }
+        else if( nSeqKeyCode >= KEY_A && nSeqKeyCode <= KEY_F )
+        {
+            if( appendUnicodeSequence( sal_Unicode( 'a' ) + sal_Unicode(nSeqKeyCode - KEY_A) ) )
+                return 1;
+        }
+        else
+            endUnicodeSequence();
+    }
+
+    if( aDeleteWatch.isDeleted() )
+        return 0;
+
     rtl_TextEncoding nEncoding;
 
     if (mpInputContext != NULL && mpInputContext->IsMultiLingual() )
@@ -3370,8 +3494,6 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
         nSize   = 0;
     }
 
-    DeletionListener aDeleteWatch( this );
-
     if (   mpInputContext != NULL
         && mpInputContext->UseContext()
         && KeyRelease != pEvent->type
diff --git a/vcl/util/makefile2.pmk b/vcl/util/makefile2.pmk
index df9ba1a214d7..ac2977ca8eab 100644
--- a/vcl/util/makefile2.pmk
+++ b/vcl/util/makefile2.pmk
@@ -36,6 +36,6 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
 #building with stlport, but graphite was not built with stlport
 .IF "$(USE_SYSTEM_STL)"!="YES"
 .IF "$(SYSTEM_GRAPHITE)"=="YES"
-CDEFS += -DADAPT_EXT_STL
+CFLAGSCXX+=-DADAPT_EXT_STL
 .ENDIF
 .ENDIF
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 6f0c98279e7b..806d3b420b33 100755..100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -2894,6 +2894,11 @@ void GraphiteWinLayout::RestoreDC(gr::Segment & segment) const
 
 bool GraphiteWinLayout::LayoutText( ImplLayoutArgs & args)
 {
+    if (args.mnMinCharPos >= args.mnEndCharPos)
+    {
+        maImpl.clear();
+        return true;
+    }
     HFONT hUnRotatedFont;
     if (args.mnOrientation)
     {
diff --git a/vos/inc/vos/execabl.hxx b/vos/inc/vos/execabl.hxx
index 04e0ef837b02..5788fb598662 100644
--- a/vos/inc/vos/execabl.hxx
+++ b/vos/inc/vos/execabl.hxx
@@ -50,7 +50,7 @@ namespace vos
     @version 0.1
 */
 
-class IExecutable : public NAMESPACE_VOS(IReference)
+class IExecutable : public vos::IReference
 {
 public:
 
@@ -82,8 +82,8 @@ public:
 /** OExecutable
     added default impl. of IReferenceCounter
 */
-class OExecutable : public NAMESPACE_VOS(IExecutable),
-                    public NAMESPACE_VOS(OReference)
+class OExecutable : public vos::IExecutable,
+                    public vos::OReference
 
 {
 public:
diff --git a/vos/inc/vos/macros.hxx b/vos/inc/vos/macros.hxx
index ca1b750d67f4..be91b6d00aa2 100644
--- a/vos/inc/vos/macros.hxx
+++ b/vos/inc/vos/macros.hxx
@@ -149,9 +149,6 @@
 // def. for arbitrary namespace
 #define VOS_NAMESPACE(class_name, name_space) name_space::class_name
 
-// sal_Int16 def. for namespace vos
-#define NAMESPACE_VOS(class_name) vos::class_name
-
 // sal_Int16 def. for namespace std
 #define NAMESPACE_STD(class_name) std::class_name
 
diff --git a/vos/inc/vos/pipe.hxx b/vos/inc/vos/pipe.hxx
index e9b1145a36ee..ce378272c9b9 100644
--- a/vos/inc/vos/pipe.hxx
+++ b/vos/inc/vos/pipe.hxx
@@ -48,10 +48,10 @@ class OStreamPipe;
 
 /** Represents a pipe.
 */
-class OPipe : public NAMESPACE_VOS(OReference),
-              public NAMESPACE_VOS(OObject)
+class OPipe : public vos::OReference,
+              public vos::OObject
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OPipe));
+    VOS_DECLARE_CLASSINFO(vos::OPipe);
 
 public:
     /*
@@ -101,7 +101,7 @@ public:
         @param Security
     */
     OPipe(const ::rtl::OUString& strName, TPipeOption Options,
-          const NAMESPACE_VOS(OSecurity)& rSecurity);
+          const vos::OSecurity& rSecurity);
 
     /** Copy constructor.
     */
@@ -132,7 +132,7 @@ public:
         @return True if socket was successfully created.
     */
     sal_Bool SAL_CALL create(const ::rtl::OUString& strName, TPipeOption Options,
-                   const NAMESPACE_VOS(OSecurity)& rSecurity);
+                   const vos::OSecurity& rSecurity);
 
     /** Assignment operator. If pipe was already created, the old one will
         be discarded.
@@ -191,10 +191,10 @@ public:
 
 /** A pipe to send or receive a stream of data.
 */
-class OStreamPipe : public NAMESPACE_VOS(OPipe),
-                    public NAMESPACE_VOS(IStream)
+class OStreamPipe : public vos::OPipe,
+                    public vos::IStream
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OStreamPipe));
+    VOS_DECLARE_CLASSINFO(vos::OStreamPipe);
 public:
 
     /** Creates an unattached pipe. You must attach the pipe to an oslPipe
diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx
index e41a050acaa0..0b98278d117e 100644
--- a/vos/inc/vos/process.hxx
+++ b/vos/inc/vos/process.hxx
@@ -284,7 +284,7 @@ class OExtCommandLineImpl;
 class OExtCommandLine : public OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OExtCommandLine, vos));
-    static NAMESPACE_VOS(OExtCommandLineImpl)* pExtImpl;
+    static vos::OExtCommandLineImpl* pExtImpl;
 
 public:
 
diff --git a/vos/inc/vos/refernce.hxx b/vos/inc/vos/refernce.hxx
index 25f0f39eb0f3..8f5a0ec799fb 100644
--- a/vos/inc/vos/refernce.hxx
+++ b/vos/inc/vos/refernce.hxx
@@ -82,7 +82,7 @@ private:
     ORefCount& SAL_CALL operator= (const ORefCount&);
 };
 
-class OReference : public NAMESPACE_VOS(IReference)
+class OReference : public vos::IReference
 {
 public:
     OReference();
diff --git a/vos/inc/vos/signal.hxx b/vos/inc/vos/signal.hxx
index ea9db4850490..f2bff35998ec 100644
--- a/vos/inc/vos/signal.hxx
+++ b/vos/inc/vos/signal.hxx
@@ -46,7 +46,7 @@ SignalHandlerFunction_impl signalHandlerFunction_impl;
     @version 1.0
 */
 
-class OSignalHandler : public NAMESPACE_VOS(OObject)
+class OSignalHandler : public vos::OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OSignalHandler, vos));
 
diff --git a/vos/inc/vos/socket.hxx b/vos/inc/vos/socket.hxx
index cfd51fbb069b..f803a455129c 100644
--- a/vos/inc/vos/socket.hxx
+++ b/vos/inc/vos/socket.hxx
@@ -189,7 +189,7 @@ public:
 
 /** Base class for socket addresses.
 */
-class ISocketAddr : public NAMESPACE_VOS(ISocketTypes)
+class ISocketAddr : public vos::ISocketTypes
 {
 public:
     virtual ~ISocketAddr() { }
@@ -202,11 +202,11 @@ public:
     virtual sal_Bool SAL_CALL operator== (oslSocketAddr Addr)= 0;
 };
 
-class OSocketAddr : public NAMESPACE_VOS(ISocketAddr),
-            public NAMESPACE_VOS(OObject)
+class OSocketAddr : public vos::ISocketAddr,
+            public vos::OObject
 
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OSocketAddr));
+    VOS_DECLARE_CLASSINFO(vos::OSocketAddr);
 public:
 
     /** Creates socket address of unknown type.
@@ -274,9 +274,9 @@ protected:
 
 /** Represents an internet-address.
 */
-class OInetSocketAddr : public NAMESPACE_VOS(OSocketAddr)
+class OInetSocketAddr : public vos::OSocketAddr
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OInetSocketAddr));
+    VOS_DECLARE_CLASSINFO(vos::OInetSocketAddr);
 public:
 
     /** Creates an empty internet-address (INADDR_ANY).
@@ -359,9 +359,9 @@ public:
 
 /** Represents an IPX/SPX address.
 */
-class OIpxSocketAddr :  public NAMESPACE_VOS(OSocketAddr)
+class OIpxSocketAddr :  public vos::OSocketAddr
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OIpxSocketAddr));
+    VOS_DECLARE_CLASSINFO(vos::OIpxSocketAddr);
 public:
 
     typedef oslSocketIpxNetNumber  TIpxNetNumber;
@@ -430,11 +430,11 @@ public:
 
 /** Represents a socket.
 */
-class OSocket : public NAMESPACE_VOS(ISocketTypes),
-                public NAMESPACE_VOS(OReference),
-                public NAMESPACE_VOS(OObject)
+class OSocket : public vos::ISocketTypes,
+                public vos::OReference,
+                public vos::OObject
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OSocket));
+    VOS_DECLARE_CLASSINFO(vos::OSocket);
 
 protected:
     typedef ORefObj<oslSocket> SockRef;
@@ -809,10 +809,10 @@ public:
 
 /** A socket to send or receive a stream of data.
 */
-class OStreamSocket : public NAMESPACE_VOS(OSocket),
-                      public NAMESPACE_VOS(IStream)
+class OStreamSocket : public vos::OSocket,
+                      public vos::IStream
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OStreamSocket));
+    VOS_DECLARE_CLASSINFO(vos::OStreamSocket);
 public:
 
     /** Creates an unattached socket. You must attach the socket to an oslSocket
@@ -952,9 +952,9 @@ protected:
 
 /** A socket to accept incoming connections.
 */
-class OAcceptorSocket : public NAMESPACE_VOS(OSocket)
+class OAcceptorSocket : public vos::OSocket
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OAcceptorSocket));
+    VOS_DECLARE_CLASSINFO(vos::OAcceptorSocket);
 public:
 
     /** Creates a socket that can accept connections.
@@ -1014,9 +1014,9 @@ public:
 
 /** A socket to initiate a conenction.
 */
-class OConnectorSocket : public NAMESPACE_VOS(OStreamSocket)
+class OConnectorSocket : public vos::OStreamSocket
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(OConnectorSocket));
+    VOS_DECLARE_CLASSINFO(vos::OConnectorSocket);
 public:
 
     /** Creates a socket that can accept connections.
@@ -1050,9 +1050,9 @@ public:
 
 /** A connectionless socket to send and receive datagrams.
 */
-class ODatagramSocket : public NAMESPACE_VOS(OSocket)
+class ODatagramSocket : public vos::OSocket
 {
-    VOS_DECLARE_CLASSINFO(NAMESPACE_VOS(ODatagramSocket));
+    VOS_DECLARE_CLASSINFO(vos::ODatagramSocket);
 public:
 
     /** Creates a datagram socket.
diff --git a/vos/inc/vos/stream.hxx b/vos/inc/vos/stream.hxx
index 5e25aa1d103a..6df13d5ddb28 100644
--- a/vos/inc/vos/stream.hxx
+++ b/vos/inc/vos/stream.hxx
@@ -37,7 +37,7 @@ namespace vos
 
 /** Adds seeking capabilities to IStream
 */
-class IPositionableStream : public NAMESPACE_VOS(IStream)
+class IPositionableStream : public vos::IStream
 {
 
 public:
@@ -75,8 +75,8 @@ protected:
 
 /** Implements IPositionableStream
 */
-class OStream : public NAMESPACE_VOS(OObject),
-                public NAMESPACE_VOS(IPositionableStream)
+class OStream : public vos::OObject,
+                public vos::IPositionableStream
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OStream, vos));
 
diff --git a/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx
index 16f64c0e0812..d84fdfdadccc 100644
--- a/vos/inc/vos/thread.hxx
+++ b/vos/inc/vos/thread.hxx
@@ -53,8 +53,8 @@ ThreadWorkerFunction_impl threadWorkerFunction_impl;
     @version 1.0
 */
 
-class OThread : public NAMESPACE_VOS(IRunnable),
-                public NAMESPACE_VOS(OObject)
+class OThread : public vos::IRunnable,
+                public vos::OObject
 {
 
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThread, vos));
@@ -203,7 +203,7 @@ protected:
     friend void threadWorkerFunction_impl(void *);
 };
 
-class OThreadData : public NAMESPACE_VOS(OObject)
+class OThreadData : public vos::OObject
 {
     VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThreadData, vos));
 
diff --git a/vos/source/pipe.cxx b/vos/source/pipe.cxx
index a7d8e655414d..777d1a76b36b 100644
--- a/vos/source/pipe.cxx
+++ b/vos/source/pipe.cxx
@@ -138,7 +138,7 @@ sal_Bool OPipe::create( const rtl::OUString& strName, TPipeOption Options )
 /*****************************************************************************/
 sal_Bool OPipe::create( const rtl::OUString& strName,
                         TPipeOption Options,
-                        const NAMESPACE_VOS(OSecurity)& rSecurity )
+                        const vos::OSecurity& rSecurity )
 {
     // if this was a valid pipe, decrease reference
     if ((m_pPipeRef) && (m_pPipeRef->release() == 0))
diff --git a/vos/source/process.cxx b/vos/source/process.cxx
index 71c8729d9023..59b1af3223d4 100644
--- a/vos/source/process.cxx
+++ b/vos/source/process.cxx
@@ -485,7 +485,7 @@ void OExtCommandLineImpl::init()
 
 namespace
 {
-    struct lclMutex : public rtl::Static< NAMESPACE_VOS(OMutex), lclMutex > {};
+    struct lclMutex : public rtl::Static< vos::OMutex, lclMutex > {};
 }
 
 OExtCommandLineImpl* OExtCommandLine::pExtImpl=0;
diff --git a/vos/source/signal.cxx b/vos/source/signal.cxx
index 1f879f8b225c..eb1b65191918 100644
--- a/vos/source/signal.cxx
+++ b/vos/source/signal.cxx
@@ -35,7 +35,7 @@ using namespace vos;
 oslSignalAction vos::signalHandlerFunction_impl(
     void * pthis, oslSignalInfo * pInfo)
 {
-    NAMESPACE_VOS(OSignalHandler)* pThis= (NAMESPACE_VOS(OSignalHandler)*)pthis;
+    vos::OSignalHandler* pThis= (vos::OSignalHandler*)pthis;
 
     return ((oslSignalAction)pThis->signal(pInfo));
 }
diff --git a/vos/source/thread.cxx b/vos/source/thread.cxx
index 8b2c8826b753..94cdfbdf970b 100644
--- a/vos/source/thread.cxx
+++ b/vos/source/thread.cxx
@@ -34,7 +34,7 @@ using namespace vos;
 
 void vos::threadWorkerFunction_impl(void * pthis)
 {
-    NAMESPACE_VOS(OThread)* pThis= (NAMESPACE_VOS(OThread)*)pthis;
+    vos::OThread* pThis= (vos::OThread*)pthis;
 
     // call Handler-Function of OThread-derived class
     pThis->run();
diff --git a/vos/source/timer.cxx b/vos/source/timer.cxx
index 1c1e2385b60c..a365415672e9 100644
--- a/vos/source/timer.cxx
+++ b/vos/source/timer.cxx
@@ -41,7 +41,7 @@
 
 class OTimerManagerCleanup;
 
-class NAMESPACE_VOS(OTimerManager) : public NAMESPACE_VOS(OThread)
+class vos::OTimerManager : public vos::OThread
 {
 
 public:
@@ -53,13 +53,13 @@ public:
       ~OTimerManager();
 
       /// register timer
-    sal_Bool SAL_CALL registerTimer(NAMESPACE_VOS(OTimer)* pTimer);
+    sal_Bool SAL_CALL registerTimer(vos::OTimer* pTimer);
 
       /// unregister timer
-    sal_Bool SAL_CALL unregisterTimer(NAMESPACE_VOS(OTimer)* pTimer);
+    sal_Bool SAL_CALL unregisterTimer(vos::OTimer* pTimer);
 
       /// lookup timer
-    sal_Bool SAL_CALL lookupTimer(const NAMESPACE_VOS(OTimer)* pTimer);
+    sal_Bool SAL_CALL lookupTimer(const vos::OTimer* pTimer);
 
     /// retrieves the "Singleton" TimerManager Instance
     static OTimerManager* SAL_CALL getTimerManager();
@@ -77,17 +77,17 @@ protected:
     virtual void SAL_CALL onTerminated();
 
       // sorted-queue data
-      NAMESPACE_VOS(OTimer)*        m_pHead;
+      vos::OTimer*      m_pHead;
     // List Protection
-    NAMESPACE_VOS(OMutex)       m_Lock;
+    vos::OMutex     m_Lock;
     // Signal the insertion of a timer
-    NAMESPACE_VOS(OCondition)   m_notEmpty;
+    vos::OCondition m_notEmpty;
 
     // Synchronize access to OTimerManager
-    static NAMESPACE_VOS(OMutex) m_Access;
+    static vos::OMutex m_Access;
 
     // "Singleton Pattern"
-    static NAMESPACE_VOS(OTimerManager)* m_pManager;
+    static vos::OTimerManager* m_pManager;
 
     friend class OTimerManagerCleanup;
 
@@ -267,8 +267,8 @@ TTimeValue OTimer::getRemainingTime() const
 // Timer manager
 //
 
-OMutex NAMESPACE_VOS(OTimerManager)::m_Access;
-OTimerManager* NAMESPACE_VOS(OTimerManager)::m_pManager=0;
+OMutex vos::OTimerManager::m_Access;
+OTimerManager* vos::OTimerManager::m_pManager=0;
 
 OTimerManager::OTimerManager()
 {