-- 
cgit v1.2.3

From 42db25f9d33669a7ccbd6f4bf7acc999a276c7ed Mon Sep 17 00:00:00 2001
From: thb <thb@openoffice.org>
Date: Fri, 16 Oct 2009 00:43:16 +0200
Subject: #i105937# Much improved gradient support for
 canvas/basegfx/drawinglayer.

See http://blog.thebehrens.net/2009/07/28/hackweek-iv-canvas-convwatch/ for more background information
---
 offapi/com/sun/star/rendering/XGraphicDevice.idl | 65 ++++++++++++++++++++++--
 offapi/com/sun/star/rendering/makefile.mk        |  1 -
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index aa8169670..8ee13c4cf 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -51,8 +51,8 @@
 #ifndef __com_sun_star_rendering_XParametricPolyPolygon2DFactory_idl__
 #include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl>
 #endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
-#include <com/sun/star/rendering/XColorSpace.idl>
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
+#include <com/sun/star/lang/XMultiServiceFactory.idl>
 #endif
 
 module com { module sun { module star { module rendering {
@@ -220,8 +220,67 @@ interface XGraphicDevice : ::com::sun::star::uno::XInterface
         this is not advisable: each canvas implementation is free to
         internally generate optimized parametric polygons, which can
         be used more directly for e.g. texturing operations.
+
+        <pre>
+        Available services (all canvas implementations should provide
+        this minimal set, though are free to add more; just check the
+        getAvailableServiceNames() on the returned interface):
+
+        - Gradients - all gradients need to support two construction
+          parameters, "Colors" being a <type>sequence<Color></type>
+          and "Stops" being a <type>sequence<double></type>. Both must
+          have the same length, and at least two elements. See
+          http://www.w3.org/TR/SVG11/pservers.html#GradientStops for
+          the semantics of gradient stops and colors.
+          Required gradient services:
+
+          * "LinearGradient" - the gradient varies linearly between
+            the given colors. without coordinate system
+            transformation, the color interpolation happens in
+            increasing x direction, and is constant in y
+            direction. Equivalent to svg linear gradient
+            http://www.w3.org/TR/SVG11/pservers.html#LinearGradients
+
+          * "EllipticalGradient" - this gradient has zeroth color
+            index in the middle, and varies linearly between center
+            and final color. The services takes an additional
+            parameter named "AspectRatio" of <type>double</type>
+            (width divided by height), if this aspect ratio is 1, the
+            gradient is circular. If it's not 1, the gradient is
+            elliptical, with the special twist that the aspect ratio
+            is maintained also for the center color: the gradient will
+            not collapse into a single point, but become a line of
+            center color. If "AspectRatio" is missing, or equal to 1,
+            this gradient yields similar results as the svg radial
+            gradient
+            http://www.w3.org/TR/SVG11/pservers.html#RadialGradients
+
+          * "RectangularGradient" - this gradient has zeroth color
+            index in the middle, and varies linearly between center
+            and final color via rectangular boxes
+            around the center point. The services takes an additional
+            parameter named "AspectRatio" of <type>double</type>
+            (width divided by height), if this aspect ratio is 1, the
+            gradient is quadratic. If it's not 1, the gradient is
+            rectangular, with the special twist that the aspect ratio
+            is maintained also for the center color: the gradient will
+            not collapse into a single point, but become a line of
+            center color.
+
+        - Hatch patterns - Required hatch services:
+
+          * "VerticalLineHatch" - this hatching consists of vertical lines
+          * "OrthogonalLinesHatch" - this hatching consists of
+            crossing vertical and horizontal lines
+          * "ThreeCrossingLinesHatch" - this hatching consists of
+            vertical and horizontal lines plus diagonal lines from
+            left, top to bottom, right.
+          * "FourCrossingLinesHatch" - this hatching consists of
+            vertical and horizontal lines plus diagonal lines in both
+            directions.
+        </pre>     
      */
-    XParametricPolyPolygon2DFactory getParametricPolyPolygonFactory();
+    com::sun::star::lang::XMultiServiceFactory getParametricPolyPolygonFactory();
 
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/rendering/makefile.mk b/offapi/com/sun/star/rendering/makefile.mk
index f04f08161..4426c81ee 100644
--- a/offapi/com/sun/star/rendering/makefile.mk
+++ b/offapi/com/sun/star/rendering/makefile.mk
@@ -108,7 +108,6 @@ IDLFILES=\
     XIntegerReadOnlyBitmap.idl \
     XLinePolyPolygon2D.idl \
     XParametricPolyPolygon2D.idl \
-    XParametricPolyPolygon2DFactory.idl \
     XPolyPolygon2D.idl \
     XSimpleCanvas.idl \
     XSprite.idl \
-- 
cgit v1.2.3


From f0463870ebca4f2320382fb7d881ee4a27a3b071 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 11 Dec 2009 14:29:59 +0100
Subject: sb118: Replace (heavily modified) CppUnit 1.8.0 with (unmodified)
 latest 1.12.1. - Old modifications were necessary for testshl2, which has
 simply been excluded   from the build for now. - Tests in basebmp, basegfx,
 o3tl (that are executed during build) have been   converted from using
 modified CppUnit/testshl2 to using unmodified CppUnit. - CppUnit's
 DllPlugInTester has problems with OOo tests on Windows, see   #i107562#, so
 for now a new cppunittester from sal is used instead.

---
 sal/cppunittester/cppunittester.cxx | 63 +++++++++++++++++++++++++++++++++++++
 sal/cppunittester/makefile.mk       | 45 ++++++++++++++++++++++++++
 sal/prj/build.lst                   |  3 +-
 sal/prj/d.lst                       |  2 ++
 4 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 sal/cppunittester/cppunittester.cxx
 create mode 100644 sal/cppunittester/makefile.mk

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
new file mode 100644
index 000000000..a8d36b312
--- /dev/null
+++ b/sal/cppunittester/cppunittester.cxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2010 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#include "precompiled_sal.hxx"
+#include "sal/config.h"
+
+#include <cstdlib>
+#include <iostream>
+
+#include "cppunit/CompilerOutputter.h"
+#include "cppunit/TestResult.h"
+#include "cppunit/TestResultCollector.h"
+#include "cppunit/TestRunner.h"
+#include "cppunit/extensions/TestFactoryRegistry.h"
+#include "cppunit/plugin/PlugInManager.h"
+#include "cppunit/portability/Stream.h"
+#include "osl/thread.h"
+#include "rtl/process.h"
+#include "rtl/string.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/main.h"
+
+SAL_IMPLEMENT_MAIN() {
+    if (rtl_getAppCommandArgCount() != 1) {
+        std::cerr << "Usage: cppunittest <shared-library-path>" << std::endl;
+        return EXIT_FAILURE;
+    }
+    rtl::OUString path;
+    rtl_getAppCommandArg(0, &path.pData);
+    CppUnit::PlugInManager manager;
+    manager.load(
+        rtl::OUStringToOString(path, osl_getThreadTextEncoding()).getStr());
+    CppUnit::TestRunner runner;
+    runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+    CppUnit::TestResult result;
+    CppUnit::TestResultCollector collector;
+    result.addListener(&collector);
+    runner.run(result);
+    CppUnit::CompilerOutputter(&collector, CppUnit::stdCErr()).write();
+    return collector.wasSuccessful() ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
new file mode 100644
index 000000000..a87d1b182
--- /dev/null
+++ b/sal/cppunittester/makefile.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile,v $
+#
+# $Revision: 1.4 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#***********************************************************************/
+
+PRJ = ..
+PRJNAME = sal
+TARGET = cppunittester
+
+ENABLE_EXCEPTIONS = TRUE
+
+.INCLUDE: settings.mk
+
+OBJFILES = $(APP1OBJS)
+
+APP1OBJS = $(OBJ)/cppunittester.obj
+APP1RPATH = NONE
+APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
+APP1TARGET = cppunittester
+
+.INCLUDE: target.mk
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 5622d80ed..6985584b6 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,4 +1,4 @@
-sa	sal	:	xml2cmp stlport external BOOST:boost NULL 
+sa	sal	:	xml2cmp stlport external BOOST:boost cppunit NULL 
 sa	sal										usr1	-	all	sa_mkout NULL
 sa	sal\inc									nmake	-	all	sa_inc NULL
 sa	sal\typesconfig							nmake	-	u	sa_tc sa_inc NULL
@@ -14,3 +14,4 @@ sa  sal\qa                                  nmake   -   all sa_qa sa_util NULL
 sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
 sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
+sa sal\cppunittester nmake - all sa_cppunittester sa_util NULL
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index bcd9c0e2c..3ce270bbb 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -34,3 +34,5 @@ symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib
 
 ..\%__SRC%\inc\udkversion.h %_DEST%\inc%_EXT%\sal\udkversion.h
 
+..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunittester
+..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunittester.exe
-- 
cgit v1.2.3


From 40e254c1fed24b1a131a3ddf24d007a259b0f47e Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 18 Dec 2009 16:03:28 +0100
Subject: sb118: allow environment variables to be unset in osl_executeProcess
 (undocumented feature for now, and OS/2 code is not yet adapted)

---
 sal/osl/unx/process.c    | 11 ++++++++++-
 sal/osl/w32/procimpl.cxx | 18 ++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 946103af6..9519375bf 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -488,7 +488,16 @@ static void ChildStatusProc(void *pData)
                   chdir(data.m_pszDir);
 
             for (i = 0; data.m_pszEnv[i] != NULL; i++)
-                 putenv(data.m_pszEnv[i]);
+            {
+                if (strchr(data.m_pszEnv[i], '=') == NULL)
+                {
+                    unsetenv(data.m_pszEnv[i]); /*TODO: check error return*/
+                }
+                else
+                {
+                    putenv(data.m_pszEnv[i]); /*TODO: check error return*/
+                }
+            }
 
 #if defined(LINUX) && !defined(NPTL)
             /* mfe: linux likes to have just one thread when the exec family is called */
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 875d1a097..bcbdfe45a 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -172,8 +172,7 @@ namespace /* private */
         {   
             rtl::OUString env_var = rtl::OUString(env_vars[i]);
             
-            if ((env_var.getLength() == 0) || 
-                (env_var.indexOf(NAME_VALUE_SEPARATOR) == -1))
+            if (env_var.getLength() == 0)
                 return false;
                 
             iterator_pair_t iter_pair = std::equal_range(
@@ -182,10 +181,17 @@ namespace /* private */
                 env_var, 
                 less_environment_variable());
            
-            if (iter_pair.first != iter_pair.second) // found      
-                *iter_pair.first = env_var;        
-            else // not found       
-                merged_env->insert(iter_pair.first, env_var);                                                
+            if (env_var.indexOf(NAME_VALUE_SEPARATOR) == -1)
+            {
+                merged_env->erase(iter_pair.first, iter_pair.second);
+            }
+            else
+            {
+                if (iter_pair.first != iter_pair.second) // found
+                    *iter_pair.first = env_var;
+                else // not found
+                    merged_env->insert(iter_pair.first, env_var);
+            }
         }
         return true;
     }
-- 
cgit v1.2.3


From 358227bf92dc1e62e68d086dc34bc932c3d36ab6 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 8 Jan 2010 16:42:14 +0100
Subject: sb118: typo

---
 sal/cppunittester/cppunittester.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index a8d36b312..ad3ff5a98 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -44,7 +44,7 @@
 
 SAL_IMPLEMENT_MAIN() {
     if (rtl_getAppCommandArgCount() != 1) {
-        std::cerr << "Usage: cppunittest <shared-library-path>" << std::endl;
+        std::cerr << "Usage: cppunittester <shared-library-path>" << std::endl;
         return EXIT_FAILURE;
     }
     rtl::OUString path;
-- 
cgit v1.2.3


From b8dc3fff55bf99921f95d65a9da329d8b2a818aa Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Mon, 11 Jan 2010 17:45:52 +0100
Subject: sb118: adapted cppuhelper/qa/propertysetmixin to new CppUnit

---
 cppuhelper/qa/propertysetmixin/makefile.mk         | 97 ++++++++++------------
 cppuhelper/qa/propertysetmixin/test.gcc3.map       |  2 +-
 cppuhelper/qa/propertysetmixin/test.map            |  2 +-
 .../qa/propertysetmixin/test_propertysetmixin.cxx  | 32 ++++---
 4 files changed, 63 insertions(+), 70 deletions(-)

diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 2ad56c05f..3a0578955 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -29,33 +29,30 @@
 #
 #*************************************************************************
 
-PRJ := ..$/..
+PRJ := ../..
 PRJNAME := cppuhelper
 
 TARGET := qa_propertysetmixin
-PACKAGE = test$/cppuhelper$/propertysetmixin$/comp
+PACKAGE = test/cppuhelper/propertysetmixin/comp
 
 ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(GUI)" == "WNT"
-FILEURLPREFIX = file:///
-MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
+.IF "$(OS)" == "WNT"
+my_file = file:///
 .ELSE
-FILEURLPREFIX = file://
-MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
-.ENDIF
-
-
+my_file = file://
+.END
 
 DLLPRE = # no leading "lib" on .so files
-INCPRE += -I$(MISC)$/$(TARGET)$/inc
+INCPRE += -I$(MISC)/$(TARGET)/inc
 
 SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_propertysetmixin.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
+SHL1OBJS = $(SLO)/test_propertysetmixin.obj
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
 SHL1IMPLIB = i$(SHL1TARGET)
+SHL1RPATH = NONE
 DEF1NAME = $(SHL1TARGET)
 
 .IF "$(COMNAME)" == "gcc3"
@@ -65,10 +62,11 @@ SHL1VERSIONMAP = test.map
 .ENDIF
 
 SHL2TARGET = $(TARGET).uno
-SHL2OBJS = $(SLO)$/comp_propertysetmixin.obj
+SHL2OBJS = $(SLO)/comp_propertysetmixin.obj
 SHL2VERSIONMAP = comp.map
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL2IMPLIB = i$(SHL2TARGET)
+SH21RPATH = NONE
 DEF2NAME = $(SHL2TARGET)
 
 SLOFILES = $(SHL1OBJS) $(SHL2OBJS)
@@ -80,63 +78,52 @@ JARFILES = java_uno.jar juh.jar jurt.jar ridl.jar
 
 ALLTAR: test
 
-$(MISC)$/$(TARGET)$/types.urd: types.idl
+$(MISC)/$(TARGET)/types.urd: types.idl
     - $(MKDIR) $(@:d)
     $(IDLC) -O$(@:d) -I$(SOLARIDLDIR) -cid -we $<
 
-$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.urd
+$(MISC)/$(TARGET)/types.rdb: $(MISC)/$(TARGET)/types.urd
     - $(RM) $@
     $(REGMERGE) $@ /UCR $<
 
-$(MISC)$/$(TARGET)$/uno.rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
-        $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
-        $(MISC)$/$(TARGET)$/$(TARGET).uno.jar $(MISC)$/$(TARGET)$/bootstrap.rdb
+$(MISC)/$(TARGET)/uno.rdb: $(MISC)/$(TARGET)/types.rdb $(SHL2TARGETN) \
+        $(MISC)/$(TARGET)/$(TARGET).uno.jar $(MISC)/$(TARGET)/bootstrap.rdb
     - $(MKDIR) $(@:d)
-    $(COPY) $(SOLARBINDIR)$/types.rdb $@
-    $(REGMERGE) $@ / $(MISC)$/$(TARGET)$/types.rdb
-    $(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \
-        -c javavm.uno$(DLLPOST) -c reflection.uno$(DLLPOST) \
-        -c stocservices.uno$(DLLPOST)
-    $(REGCOMP) -register -r $@ \
-        -c $(subst,$/,/ $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST))
-    $(REGCOMP) -register -br $(MISC)$/$(TARGET)$/bootstrap.rdb -r $@ \
-        -c \
-   $(subst,$/,/ $(FILEURLPREFIX)$(PWD)$/$(MISC)$/$(TARGET)$/$(TARGET).uno.jar) \
-        -classpath $(CLASSPATH) \
-    -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR)
-
-$(MISC)$/$(TARGET)$/bootstrap.rdb .ERRREMOVE:
+    $(COPY) $(SOLARBINDIR)/types.rdb $@
+    $(REGMERGE) $@ / $(MISC)/$(TARGET)/types.rdb
+    $(REGCOMP) -register -r $@ -wop -c javaloader.uno -c javavm.uno \
+        -c reflection.uno -c stocservices.uno -c $(SHL2TARGETN)
+    $(REGCOMP) -register -br $(MISC)/$(TARGET)/bootstrap.rdb -r $@ \
+        -c $(my_file)$(PWD)/$(MISC)/$(TARGET)/$(TARGET).uno.jar \
+        -env:URE_INTERNAL_JAVA_DIR=$(my_file)$(SOLARBINDIR)
+
+$(MISC)/$(TARGET)/bootstrap.rdb:
     - $(MKDIR) $(@:d)
-    $(COPY) $(SOLARBINDIR)$/types.rdb $@
-    $(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \
-        -c javavm.uno$(DLLPOST) -c stocservices.uno$(DLLPOST)
+    $(COPY) $(SOLARBINDIR)/types.rdb $@
+    $(REGCOMP) -register -r $@ -wop -c javaloader.uno -c javavm.uno \
+        -c stocservices.uno
 
-$(MISC)$/$(TARGET)$/cppumaker.flag: $(MISC)$/$(TARGET)$/types.rdb
-    $(CPPUMAKER) -O$(MISC)$/$(TARGET)$/inc -BUCR -Gc \
-        -X$(SOLARBINDIR)$/types.rdb $<
+$(MISC)/$(TARGET)/cppumaker.flag: $(MISC)/$(TARGET)/types.rdb
+    $(CPPUMAKER) -O$(MISC)/$(TARGET)/inc -BUCR -Gc \
+        -X$(SOLARBINDIR)/types.rdb $<
     $(TOUCH) $@
 
-$(SLOFILES): $(MISC)$/$(TARGET)$/cppumaker.flag
+$(SLOFILES): $(MISC)/$(TARGET)/cppumaker.flag
 
-$(MISC)$/$(TARGET)$/javamaker.flag: $(MISC)$/$(TARGET)$/types.rdb
-    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -Gc -X$(SOLARBINDIR)$/types.rdb $<
+$(MISC)/$(TARGET)/javamaker.flag: $(MISC)/$(TARGET)/types.rdb
+    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -Gc -X$(SOLARBINDIR)/types.rdb $<
     $(TOUCH) $@
 
 # The following dependency (to execute javac whenever javamaker has run) does
 # not work reliably, see #i28827#:
-$(JAVAFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET)$/javamaker.flag
+$(JAVAFILES) $(JAVACLASSFILES): $(MISC)/$(TARGET)/javamaker.flag
 
-$(MISC)$/$(TARGET)$/$(TARGET).uno.jar: $(JAVACLASSFILES) \
-        $(MISC)$/$(TARGET)$/javamaker.flag manifest
+$(MISC)/$(TARGET)/$(TARGET).uno.jar: $(JAVACLASSFILES) \
+        $(MISC)/$(TARGET)/javamaker.flag manifest
     jar cfm $@ manifest -C $(CLASSDIR) test/cppuhelper/propertysetmixin
 
-test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET)$/uno.rdb
-.IF "$(GUI)" == "WNT"
-    set CLASSPATH=$(CLASSPATH) && \
-    set URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) && \
-    testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET)$/uno.rdb#$(SOLARBINDIR)"
-.ELSE
-    setenv CLASSPATH $(CLASSPATH) && \
-    setenv URE_INTERNAL_JAVA_DIR $(MY_URE_INTERNAL_JAVA_DIR) && \
-    testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET)$/uno.rdb#$(SOLARLIBDIR)"
-.ENDIF
+test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/uno.rdb
+    $(CPPUNITTESTER) $(SHL1TARGETN) \
+        -env:URE_INTERNAL_JAVA_DIR=$(my_file)$(SOLARBINDIR) \
+        -env:URE_INTERNAL_LIB_DIR=$(my_file)$(SOLARSHAREDBIN) \
+        -env:arg-reg=$(MISC)/$(TARGET)/uno.rdb -env:arg-path=$(SOLARSHAREDBIN)
diff --git a/cppuhelper/qa/propertysetmixin/test.gcc3.map b/cppuhelper/qa/propertysetmixin/test.gcc3.map
index 33f2f055d..246034ea6 100644
--- a/cppuhelper/qa/propertysetmixin/test.gcc3.map
+++ b/cppuhelper/qa/propertysetmixin/test.gcc3.map
@@ -35,7 +35,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
         _ZN4_STL7num_put*; # STLport
 
diff --git a/cppuhelper/qa/propertysetmixin/test.map b/cppuhelper/qa/propertysetmixin/test.map
index a819f6251..56eea0294 100644
--- a/cppuhelper/qa/propertysetmixin/test.map
+++ b/cppuhelper/qa/propertysetmixin/test.map
@@ -31,7 +31,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
index ecb7220d1..e60df4831 100644
--- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx
@@ -64,9 +64,12 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "cppuhelper/implbase1.hxx"
 #include "cppuhelper/servicefactory.hxx"
-#include "testshl/simpleheader.hxx"
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 #include "osl/mutex.hxx"
-#include "osl/thread.h"
+#include "rtl/bootstrap.hxx"
 #include "rtl/ref.hxx"
 #include "rtl/string.h"
 #include "rtl/textenc.h"
@@ -98,6 +101,14 @@ std::ostream & operator <<(std::ostream & out, css::uno::Any const & value) {
         out << "com::sun::star::uno::Any[" << value.getValueType() << ", ...]";
 }
 
+rtl::OUString getArgument(rtl::OUString const & name) {
+    rtl::OUString val;
+    CPPUNIT_ASSERT(
+        rtl::Bootstrap::get(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("arg-")) + name, val));
+    return val;
+}
+
 class BoundListener:
     public cppu::WeakImplHelper1< css::beans::XPropertyChangeListener >
 {
@@ -222,17 +233,12 @@ void Test::setUp() {
     // single component context is used for all tests and destroyed in the last
     // pseudo-test "finish":
     if (!m_context.is()) {
-        char const * fw = getForwardString();
-        rtl::OUString forward(fw, rtl_str_getLength(fw),
-                         osl_getThreadTextEncoding());
-            //TODO: check for string conversion failure
-        sal_Int32 index = forward.indexOf('#');
-        rtl::OUString registry = forward.copy(0, index);
-        rtl::OUString bootstrappath = forward.copy(index+1);
-
         css::uno::Reference< css::lang::XMultiComponentFactory > factory(
             cppu::createRegistryServiceFactory(
-                registry, sal_False, bootstrappath),
+                getArgument(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reg"))),
+                sal_False,
+                getArgument(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("path")))),
             css::uno::UNO_QUERY_THROW);
         css::uno::Reference< css::beans::XPropertySet >(
             factory, css::uno::UNO_QUERY_THROW)->getPropertyValue(
@@ -670,8 +676,8 @@ void Test::testFull(
 
 css::uno::Reference< css::uno::XComponentContext > Test::m_context;
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
-- 
cgit v1.2.3


From b2de558b6972c1d7bc79380d4b9eb0f1b7876ebf Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 12 Jan 2010 18:49:59 +0100
Subject: sb118: #i108269# first step of removing tcsh support

---
 bridges/test/java_uno/acquire/makefile.mk          | 16 ++++++++--------
 bridges/test/java_uno/any/makefile.mk              |  8 ++++----
 bridges/test/java_uno/equals/makefile.mk           |  4 ++--
 bridges/test/java_uno/nativethreadpool/makefile.mk |  4 ++--
 cli_ure/source/basetypes/makefile.mk               | 17 +++++------------
 cli_ure/source/climaker/makefile.mk                |  2 --
 cli_ure/source/native/makefile.mk                  | 15 ++++-----------
 cli_ure/source/ure/makefile.mk                     | 17 +++++------------
 cli_ure/version/makefile.mk                        |  9 ---------
 idlc/source/makefile.mk                            |  4 ----
 sal/util/makefile.mk                               | 16 ----------------
 11 files changed, 30 insertions(+), 82 deletions(-)

diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index d027c067d..dc4ad8658 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -56,10 +56,10 @@ JARFILES = OOoRunner.jar juh.jar jurt.jar ridl.jar
 .INCLUDE: target.mk
 
 ALLTAR: \
-    $(BIN)$/testacquire-java-client$(SCRIPTEXT) \
-    $(BIN)$/testacquire-java-server$(SCRIPTEXT) \
-    $(BIN)$/testacquire-native-client$(SCRIPTEXT) \
-    $(BIN)$/testacquire-native-server$(SCRIPTEXT)
+    $(BIN)$/testacquire-java-client \
+    $(BIN)$/testacquire-java-server \
+    $(BIN)$/testacquire-native-client \
+    $(BIN)$/testacquire-native-server
 
 .IF "$(GUI)" == "WNT"
 GIVE_EXEC_RIGHTS = @echo
@@ -90,7 +90,7 @@ $(SLOFILES) $(JAVACLASSFILES): $(BIN)$/$(TARGET).rdb
 TEST_JAVAUNO_ACQUIRE_UNO_URL := \
     \"'uno:socket,host=127.0.0.1,port=2002;urp;test'\"
 
-$(BIN)$/testacquire-java-client$(SCRIPTEXT):
+$(BIN)$/testacquire-java-client:
     echo java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
@@ -98,7 +98,7 @@ $(BIN)$/testacquire-java-client$(SCRIPTEXT):
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-java-server$(SCRIPTEXT):
+$(BIN)$/testacquire-java-server:
     echo java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
@@ -106,14 +106,14 @@ $(BIN)$/testacquire-java-server$(SCRIPTEXT):
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-native-client$(SCRIPTEXT):
+$(BIN)$/testacquire-native-client:
     echo '$(AUGMENT_LIBRARY_PATH)' uno \
         -c com.sun.star.test.bridges.testacquire.impl \
         -l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb -- \
         $(TEST_JAVAUNO_ACQUIRE_UNO_URL) > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(BIN)$/testacquire-native-server$(SCRIPTEXT):
+$(BIN)$/testacquire-native-server:
     echo '$(AUGMENT_LIBRARY_PATH)' uno \
         -c com.sun.star.test.bridges.testacquire.impl \
         -l ../lib/$(SHL1TARGETN:f) -ro $(TARGET).rdb \
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index 1957194f8..b649c609d 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -104,16 +104,16 @@ $(SLOFILES) : $(MISC)$/gen_files.flag
 $(JAVACLASSFILES) : $(MISC)$/gen_files.flag
 
 ALLTAR : \
-    $(OUT)$/bin$/TestRemote$(SCRIPTEXT) \
-    $(OUT)$/bin$/TestJni$(SCRIPTEXT)
+    $(OUT)$/bin$/TestRemote \
+    $(OUT)$/bin$/TestJni
 
-$(OUT)$/bin$/TestRemote$(SCRIPTEXT) : $(JAVACLASSFILES)
+$(OUT)$/bin$/TestRemote : $(JAVACLASSFILES)
     -rm -f $@
     echo java -classpath ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
         test.java_uno.anytest.TestRemote > $@
     $(GIVE_EXEC_RIGHTS) $@
 
-$(OUT)$/bin$/TestJni$(SCRIPTEXT) : $(JAVACLASSFILES)
+$(OUT)$/bin$/TestJni : $(JAVACLASSFILES)
     -rm -f $@
     echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
         .$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index 4064b5e48..f95f1c0ad 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -62,7 +62,7 @@ JARFILES = juh.jar jurt.jar ridl.jar
 
 .INCLUDE: target.mk
 
-ALLTAR: $(BIN)$/testequals$(SCRIPTEXT)
+ALLTAR: $(BIN)$/testequals
 
 .IF "$(GUI)" == "WNT"
 GIVE_EXEC_RIGHTS = @echo
@@ -85,7 +85,7 @@ $(MISC)$/$(TARGET).rdb: types.idl
 
 $(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).rdb
 
-$(BIN)$/testequals$(SCRIPTEXT): $(BIN)$/testequals_services.rdb
+$(BIN)$/testequals: $(BIN)$/testequals_services.rdb
     echo '$(AUGMENT_LIBRARY_PATH)' java -classpath \
         ..$/class$/test$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)\
 ..$/class$/java_uno.jar$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index c8f7a778f..76f66031b 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -101,7 +101,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
     $(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
         -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
         -c stocservices.uno$(DLLPOST)
-.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
+.IF "$(GUI)" == "WNT"
     ERROR -- missing platform
 .ELSE # GUI, WNT
     + export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \
@@ -111,7 +111,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
 .ENDIF # GUI, WNT
 
 test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-.IF "$(GUI)" == "WNT" || "$(USE_SHELL)" != "bash"
+.IF "$(GUI)" == "WNT"
     ERROR -- missing platform
 .ELSE # GUI, WNT
     $(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \
diff --git a/cli_ure/source/basetypes/makefile.mk b/cli_ure/source/basetypes/makefile.mk
index 3e2e199b5..7ee254cb4 100644
--- a/cli_ure/source/basetypes/makefile.mk
+++ b/cli_ure/source/basetypes/makefile.mk
@@ -41,13 +41,6 @@ TARGET = basetypes
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
-
-.IF "$(USE_SHELL)"!="4nt"
-ECHOQUOTE='
-.ELSE
-ECHOQUOTE=
-.ENDIF
-
 .IF "$(BUILD_FOR_CLI)" != ""
 
 .INCLUDE : $(BIN)$/cliureversion.mk
@@ -77,15 +70,15 @@ CSFILES = \
 .IF "$(CCNUMVER)" <= "001399999999"
 $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
     $(GNUCOPY) -p assembly.cs $@
-    echo $(ECHOQUOTE) \
-    [assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")] \
-    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]$(ECHOQUOTE) \
+    echo \
+    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")] \
+    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]' \
     >> $@
 .ELSE
 $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
     $(GNUCOPY) -p assembly.cs $@
-    echo $(ECHOQUOTE) \
-    [assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")]$(ECHOQUOTE) \
+    echo \
+    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)")]' \
     >> $@
 .ENDIF
 
diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk
index dd67d2600..3983875c8 100644
--- a/cli_ure/source/climaker/makefile.mk
+++ b/cli_ure/source/climaker/makefile.mk
@@ -126,9 +126,7 @@ ALLTAR: \
 #Create the config file that is used with the policy assembly
 $(CLIMAKER_CONFIG): climaker.exe.config
     $(COPY) $< $@
-.IF "$(USE_SHELL)"!="4nt"
     chmod +x $@
-.ENDIF          # "$(USE_SHELL)"!="4nt"
 
 
 .IF "$(BUILD_FOR_CLI)" != ""
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 16eeedb25..2de874e64 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -48,13 +48,6 @@ CCACHE_DISABLE=TRUE
 
 use_shl_versions=
 
-.IF "$(USE_SHELL)"!="4nt"
-ECHOQUOTE='
-.ELSE
-ECHOQUOTE=
-.ENDIF
-
-
 .IF "$(BUILD_FOR_CLI)" == ""
 #do not even build the cxx files because they contain cli cpp
 all:
@@ -146,11 +139,11 @@ CFLAGSCXX += -clr:oldSyntax
 $(ASSEMBLY_ATTRIBUTES) : assembly.cxx $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
     @echo $(ASSEMBLY_KEY_X)
     $(GNUCOPY) -p assembly.cxx $@
-    echo $(ECHOQUOTE) \
-    [assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )]; $(ECHOQUOTE) \
+    echo \
+    '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' \
     >> $(OUT)$/misc$/assembly_cppuhelper.cxx
-    echo $(ECHOQUOTE) \
-    [assembly:System::Reflection::AssemblyKeyFile($(ASSEMBLY_KEY_X))]; $(ECHOQUOTE) \
+    echo \
+    '[assembly:System::Reflection::AssemblyKeyFile($(ASSEMBLY_KEY_X))];' \
     >> $(OUT)$/misc$/assembly_cppuhelper.cxx
     
     
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk
index 1bdbadadc..2109e3c61 100644
--- a/cli_ure/source/ure/makefile.mk
+++ b/cli_ure/source/ure/makefile.mk
@@ -41,13 +41,6 @@ TARGET = ure
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
-
-.IF "$(USE_SHELL)"!="4nt"
-ECHOQUOTE='
-.ELSE
-ECHOQUOTE=
-.ENDIF
-
 .IF "$(BUILD_FOR_CLI)" != ""
 
 .INCLUDE : $(BIN)$/cliureversion.mk
@@ -73,15 +66,15 @@ CSFILES = \
 .IF "$(CCNUMVER)" <= "001399999999"
 $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
     $(GNUCOPY) -p assembly.cs $@
-    echo $(ECHOQUOTE) \
-    [assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")] \
-    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]$(ECHOQUOTE) \
+    echo \
+    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")] \
+    [assembly:System.Reflection.AssemblyKeyFile(@"$(BIN)$/cliuno.snk")]' \
     >> $@
 .ELSE
 $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk 
     $(GNUCOPY) -p assembly.cs $@
-    echo $(ECHOQUOTE) \
-    [assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")]$(ECHOQUOTE) \
+    echo \
+    '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)")]' \
     >> $@
 .ENDIF
 
diff --git a/cli_ure/version/makefile.mk b/cli_ure/version/makefile.mk
index 1f64f0f8b..4a81ea17a 100644
--- a/cli_ure/version/makefile.mk
+++ b/cli_ure/version/makefile.mk
@@ -41,15 +41,6 @@ TARGET = cliureversion.mk
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE : target.mk
 
-
-.IF "$(USE_SHELL)"!="4nt"
-ECHOQUOTE='
-.ELSE
-ECHOQUOTE=
-.ENDIF
-
-
-
 ALLTAR : \
     $(BIN)$/cliureversion.mk 
 
diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk
index 5f7b1d12a..d2afe87a9 100644
--- a/idlc/source/makefile.mk
+++ b/idlc/source/makefile.mk
@@ -124,11 +124,7 @@ YACCFLAGS+=-v
 .INCLUDE :  target.mk
 
 $(MISC)$/stripped_scanner.ll : scanner.ll
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
     tr -d "\015" < scanner.ll > $(MISC)$/stripped_scanner.ll
-.ELSE
-    cat scanner.ll > $(MISC)$/stripped_scanner.ll
-.ENDIF
 
 $(MISC)$/scanner.cxx:	$(MISC)$/stripped_scanner.ll
     flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index a43f09e2e..795764b75 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -228,8 +228,6 @@ SHL1STDLIBS+=-lgcc
 $(SHL1TARGETN) : $(OUT)$/inc$/udkversion.h
 .ENDIF # "$(SHL1TARGETN)" != ""
 
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-
 $(OUT)$/inc$/udkversion.h: 
     echo '#ifndef _SAL_UDKVERSION_H_'           >  $@
     echo '#define _SAL_UDKVERSION_H_'           >> $@
@@ -239,17 +237,3 @@ $(OUT)$/inc$/udkversion.h:
     echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@
     echo ''                                     >> $@
     echo '#endif'                               >> $@
-
-.ELSE
-
-$(OUT)$/inc$/udkversion.h: 
-    echo #ifndef _SAL_UDKVERSION_H_           >  $@
-    echo #define _SAL_UDKVERSION_H_           >> $@
-    echo.                                     >> $@
-    echo #define SAL_UDK_MAJOR "$(UDK_MAJOR)" >> $@
-    echo #define SAL_UDK_MINOR "$(UDK_MINOR)" >> $@
-    echo #define SAL_UDK_MICRO "$(UDK_MICRO)" >> $@
-    echo.                                     >> $@
-    echo #endif                               >> $@
-
-.ENDIF
-- 
cgit v1.2.3


From 33a968ab5fc09694ec581082ea9c453dcbad9b9b Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Wed, 13 Jan 2010 12:57:39 +0100
Subject: sb118: missing dependency

---
 sal/prj/build.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 6985584b6..b2eb14d82 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -14,4 +14,4 @@ sa  sal\qa                                  nmake   -   all sa_qa sa_util NULL
 sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
 sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
-sa sal\cppunittester nmake - all sa_cppunittester sa_util NULL
+sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
-- 
cgit v1.2.3


From eb2bb6b6be76a376e05dc2a9bcb52d7cc5e93743 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Wed, 13 Jan 2010 18:57:41 +0100
Subject: sb118: OOO_SUBSEQUENT_TESTS added

---
 cppuhelper/prj/build.lst                   | 1 +
 cppuhelper/qa/propertysetmixin/makefile.mk | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index db8ddcaae..de66b2d61 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -3,3 +3,4 @@ ch	cppuhelper								usr1	-	all	ch_mkout NULL
 ch	cppuhelper\inc							nmake	-	all	ch_include NULL
 ch	cppuhelper\source						nmake	-	all	ch_source ch_unotypes ch_include NULL
 ch	cppuhelper\unotypes						nmake	-	all	ch_unotypes NULL
+ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source NULL
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 3a0578955..fa3db6129 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -29,6 +29,10 @@
 #
 #*************************************************************************
 
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ := ../..
 PRJNAME := cppuhelper
 
@@ -127,3 +131,5 @@ test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/uno.rdb
         -env:URE_INTERNAL_JAVA_DIR=$(my_file)$(SOLARBINDIR) \
         -env:URE_INTERNAL_LIB_DIR=$(my_file)$(SOLARSHAREDBIN) \
         -env:arg-reg=$(MISC)/$(TARGET)/uno.rdb -env:arg-path=$(SOLARSHAREDBIN)
+
+.END
-- 
cgit v1.2.3


From 13b7aa8e3833476344710edf65536ded9bec4f8b Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Wed, 13 Jan 2010 18:58:37 +0100
Subject: sb118: adpated some sal unit tests to new CppUnit framework

---
 sal/prj/build.lst                           |   2 +
 sal/qa/ByteSequence/ByteSequence.cxx        |  26 ++++----
 sal/qa/ByteSequence/export.exp              |   1 -
 sal/qa/ByteSequence/makefile.mk             |   7 +-
 sal/qa/ByteSequence/rtl_old_testbyteseq.cxx |  12 ++--
 sal/qa/OStringBuffer/export.exp             |   1 -
 sal/qa/OStringBuffer/makefile.mk            |   7 +-
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx  | 100 ++++++++++------------------
 sal/qa/export.map                           |   2 +-
 9 files changed, 69 insertions(+), 89 deletions(-)
 delete mode 100644 sal/qa/ByteSequence/export.exp
 delete mode 100644 sal/qa/OStringBuffer/export.exp

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index b2eb14d82..134c9ac1e 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -15,3 +15,5 @@ sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
 sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
 sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
+sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL
+sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL
diff --git a/sal/qa/ByteSequence/ByteSequence.cxx b/sal/qa/ByteSequence/ByteSequence.cxx
index f1105298d..98e24eb51 100644
--- a/sal/qa/ByteSequence/ByteSequence.cxx
+++ b/sal/qa/ByteSequence/ByteSequence.cxx
@@ -36,7 +36,10 @@
 
 #include <rtl/byteseq.hxx>
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 
 using namespace rtl;
 
@@ -593,18 +596,13 @@ public:
 }; // class getData
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ByteSequence::ctor, "rtl_ByteSequence");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ByteSequence::assign, "rtl_ByteSequence");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ByteSequence::equal, "rtl_ByteSequence");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ByteSequence::notequal, "rtl_ByteSequence");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ByteSequence::getArray, "rtl_ByteSequence");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ByteSequence::realloc, "rtl_ByteSequence");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_ByteSequence::getData, "rtl_ByteSequence");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ByteSequence::ctor);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ByteSequence::assign);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ByteSequence::equal);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ByteSequence::notequal);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ByteSequence::getArray);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ByteSequence::realloc);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ByteSequence::getData);
 } // namespace ByteSequence
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sal/qa/ByteSequence/export.exp b/sal/qa/ByteSequence/export.exp
deleted file mode 100644
index a13529da5..000000000
--- a/sal/qa/ByteSequence/export.exp
+++ /dev/null
@@ -1 +0,0 @@
-registerAllTestFunction
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index 0f1b88ac6..a198d7987 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -28,6 +28,11 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ=..$/..
 
 PRJNAME=sal
@@ -56,7 +61,6 @@ SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 # --- BEGIN --------------------------------------------------------
@@ -80,3 +84,4 @@ SLOFILES=$(SHL1OBJS)
 .INCLUDE :  target.mk
 .INCLUDE : _cppunit.mk
 
+.END
diff --git a/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx b/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx
index 2cea6fa3a..f8f83953c 100644
--- a/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx
+++ b/sal/qa/ByteSequence/rtl_old_testbyteseq.cxx
@@ -37,13 +37,15 @@
 
 #include <stdio.h>
 
-// #include <osl/diagnose.h>
+#include <osl/diagnose.h>
 #include <rtl/byteseq.hxx>
 
 using namespace ::rtl;
 
-#include <testshl/simpleheader.hxx>
-
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 
 namespace rtl_testbyteseq
 {
@@ -129,7 +131,7 @@ void oldbyteseq::test_bytesequence_001()
 } // namespace osl_test_file
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rtl_testbyteseq::oldbyteseq, "rtl_ByteSequence" );
+CPPUNIT_TEST_SUITE_REGISTRATION( rtl_testbyteseq::oldbyteseq );
 
 // -----------------------------------------------------------------------------
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sal/qa/OStringBuffer/export.exp b/sal/qa/OStringBuffer/export.exp
deleted file mode 100644
index a13529da5..000000000
--- a/sal/qa/OStringBuffer/export.exp
+++ /dev/null
@@ -1 +0,0 @@
-registerAllTestFunction
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index d20c011a5..873de5008 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -28,6 +28,11 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ=..$/..
 
 PRJNAME=sal
@@ -62,7 +67,6 @@ SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 
@@ -75,3 +79,4 @@ SLOFILES=$(SHL1OBJS)
 .INCLUDE :  target.mk
 .INCLUDE : _cppunit.mk
 
+.END
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 4c8c242c4..e6f9c351c 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -38,7 +38,10 @@
 
 #include <rtl/strbuf.hxx>
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 
 using namespace rtl;
 
@@ -18407,67 +18410,34 @@ t_print("\n");
 
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::ctors,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::makeStringAndClear,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::getLength,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::getCapacity,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::ensureCapacity,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::setLength,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::charAt,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::csuc,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::getStr,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::setCharAt,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_001,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_002,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_003,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_004,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_005,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_006_Int32,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_006_Int32_Bounderies,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_006_Int32_Negative,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_006_Int32_WrongRadix,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_006_Int32_defaultParam,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_007_Int64,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_007_Int64_Bounderies,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_007_Int64_Negative,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_007_Int64_WrongRadix,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_007_Int64_defaultParam,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_008_float,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_008_Float_Negative,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_009_double,
-                                                "rtl_OStringBuffer");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_OStringBuffer::append_009_Double_Negative,
-                                                "rtl_OStringBuffer");
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::ctors);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::makeStringAndClear);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::getLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::getCapacity);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::ensureCapacity);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::setLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::charAt);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::csuc);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::getStr);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::setCharAt);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_001);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_002);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_003);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_004);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_005);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_006_Int32);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_006_Int32_Bounderies);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_006_Int32_Negative);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_006_Int32_WrongRadix);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_006_Int32_defaultParam);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_007_Int64);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_007_Int64_Bounderies);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_007_Int64_Negative);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_007_Int64_WrongRadix);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_007_Int64_defaultParam);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_008_float);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_008_Float_Negative);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_double);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::append_009_Double_Negative);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sal/qa/export.map b/sal/qa/export.map
index 916aec8fc..3d8914023 100755
--- a/sal/qa/export.map
+++ b/sal/qa/export.map
@@ -31,7 +31,7 @@
 
 UDK_3.0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
-- 
cgit v1.2.3


From 934bb74e23f3e027bec34c64fe709aac9ea92622 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Wed, 13 Jan 2010 22:32:57 +0100
Subject: sb118: adapted some more sal unit tests to new CppUnit framework;
 fixes for unxmacxi

---
 sal/prj/build.lst                          |   3 +
 sal/qa/ByteSequence/makefile.mk            |   6 +-
 sal/qa/OStringBuffer/makefile.mk           |   4 +-
 sal/qa/OStringBuffer/rtl_String_Utils.cxx  |   2 +-
 sal/qa/osl/mutex/makefile.mk               |  13 ++--
 sal/qa/osl/mutex/osl_Mutex.cxx             |  34 ++++-----
 sal/qa/osl/mutex/osl_Mutex_Const.h         |   4 +-
 sal/qa/osl/pipe/export.exp                 |   1 -
 sal/qa/osl/pipe/makefile.mk                |  10 ++-
 sal/qa/osl/pipe/osl_Pipe.cxx               | 112 ++++++++++++++---------------
 sal/qa/osl/pipe/osl_Pipe.xsce              |   9 ---
 sal/qa/osl/pipe/osl_Pipe_Const.h           |   1 -
 sal/qa/osl/profile/makefile.mk             |  10 ++-
 sal/qa/osl/profile/osl_old_testprofile.cxx |  13 ++--
 14 files changed, 116 insertions(+), 106 deletions(-)
 delete mode 100644 sal/qa/osl/pipe/export.exp
 delete mode 100644 sal/qa/osl/pipe/osl_Pipe.xsce
 delete mode 100644 sal/qa/osl/pipe/osl_Pipe_Const.h

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 134c9ac1e..838384f76 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -17,3 +17,6 @@ sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n
 sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
 sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL
 sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL
+sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL
+sa sal\qa\osl\pipe nmake - all sa_qa_osl_pipe sa_cppunittester sa_util NULL
+sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util NULL
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index a198d7987..d3009cc4d 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -55,24 +55,26 @@ SHL1OBJS= \
     $(SLO)$/ByteSequence.obj
 
 SHL1TARGET= rtl_ByteSequence
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1RPATH = NONE
 
 # --- BEGIN --------------------------------------------------------
 SHL2OBJS=  \
     $(SLO)$/rtl_old_testbyteseq.obj
 SHL2TARGET= rtl_old_testbyteseq
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 
 DEF2NAME    =$(SHL2TARGET)
 SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL2RPATH = NONE
 # END --------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index 873de5008..2cabed7de 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -61,14 +61,14 @@ SHL1OBJS= \
     $(SLO)$/rtl_String_Utils.obj
 
 SHL1TARGET= rtl_OStringBuffer
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-
+SHL1RPATH = NONE
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index af1d201ba..57bb32322 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -91,7 +91,7 @@ sal_Char* cpystr( sal_Char* dst, const sal_Char* src )
     const sal_Char* psrc = src;
     sal_Char* pdst = dst;
 
-    while( *pdst++ = *psrc++ );
+    while( (*pdst++ = *psrc++) );
     return ( dst );
 }
 
diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk
index 7c8cfeb39..7fdc72ff8 100755
--- a/sal/qa/osl/mutex/makefile.mk
+++ b/sal/qa/osl/mutex/makefile.mk
@@ -29,6 +29,10 @@
 #
 #*************************************************************************
 
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ=..$/..$/..
 
 PRJNAME=sal
@@ -49,19 +53,16 @@ SHL1OBJS=  \
     $(SLO)$/osl_Mutex.obj
 
 SHL1TARGET= osl_Mutex
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 .IF "$(GUI)" == "WNT"
 SHL1STDLIBS += $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS += -ldl -lnsl
-.ENDIF
-
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1RPATH = NONE
 
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
@@ -70,3 +71,5 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 .INCLUDE :  target.mk
 .INCLUDE : _cppunit.mk
+
+.END
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index f419e0130..d0dd750dd 100755
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -34,6 +34,10 @@
 //------------------------------------------------------------------------
 // include files
 //------------------------------------------------------------------------
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 #include <osl_Mutex_Const.h> 
 
 using namespace	osl;
@@ -49,17 +53,17 @@ inline void printUString( const ::rtl::OUString & str )
 {
     rtl::OString aString;
 
-    t_print("#printUString_u# " );
+    printf("#printUString_u# " );
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("%s\n", aString.getStr( ) );
+    printf("%s\n", aString.getStr( ) );
 }
 
 /** print Boolean value.
 */
 inline void printBool( sal_Bool bOk )
 {
-    t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("YES!\n" ): t_print("NO!\n" );		
+    printf("#printBool# " );
+    ( sal_True == bOk ) ? printf("YES!\n" ): printf("NO!\n" );		
 }
 
 /** pause nSec seconds helper function.
@@ -78,7 +82,7 @@ namespace ThreadHelper
 #if ( defined UNX ) || ( defined OS2 )   //Unix
         sleep( _nSec );
 #endif
-        // t_print("# done\n" ); 
+        // printf("# done\n" ); 
     }
     void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
      {     
@@ -230,7 +234,7 @@ protected:
     {
         // block here if the mutex has been acquired
         pMyMutex->acquire( );
-        t_print("# Mutex acquired. \n" );
+        printf("# Mutex acquired. \n" );
         pMyMutex->release( );
     }
 };
@@ -276,7 +280,7 @@ protected:
         Mutex* pGlobalMutex;
         pGlobalMutex = pGlobalMutex->getGlobalMutex( );
         pGlobalMutex->acquire( );
-        t_print("# Global Mutex acquired. \n" );
+        printf("# Global Mutex acquired. \n" );
         pGlobalMutex->release( );
     }
 };
@@ -341,7 +345,7 @@ namespace osl_Mutex
                 bRes = sal_True;
     
             /*for (sal_Int8 i=0; i<BUFFER_SIZE; i++)
-                t_print("#data in buffer is %d\n", m_Data.buffer[i]);
+                printf("#data in buffer is %d\n", m_Data.buffer[i]);
             */
                     
             CPPUNIT_ASSERT_MESSAGE("Mutex ctor", bRes == sal_True);
@@ -695,7 +699,7 @@ protected:
     void SAL_CALL run( )
     {
         // acquire the mutex
-        // t_print("# ClearGuardThread" );
+        // printf("# ClearGuardThread" );
         ClearableMutexGuard aGuard( pMyMutex );
         ThreadHelper::thread_sleep( 5 );
 
@@ -771,7 +775,7 @@ namespace osl_ClearableGuard
             TimeValue aTimeVal_after; 
             osl_getSystemTime( &aTimeVal_after );
             sal_Int32 nSec = aTimeVal_after.Seconds - aTimeVal_befor.Seconds;
-            t_print("nSec is %d\n", nSec);
+            printf("nSec is %"SAL_PRIdINT32"\n", nSec);
     
             myThread.join();
             
@@ -837,7 +841,7 @@ protected:
     void SAL_CALL run( )
     {
         // acquire the mutex
-        t_print("# ResettableGuard" );
+        printf("# ResettableGuard" );
         ResettableMutexGuard aGuard( pMyMutex );
         // release the mutex
         aGuard.clear( );
@@ -936,13 +940,11 @@ namespace osl_ResettableGuard
     }; // class reset
     
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ResettableGuard::ctor, "osl_ResettableGuard");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ResettableGuard::reset, "osl_ResettableGuard");
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::ctor);
+CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::reset);
 } // namespace osl_ResettableGuard
 
-// this	macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 // The following sets variables for GNU EMACS
 // Local Variables:
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index ba09515e0..0d13b93a0 100755
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -1,5 +1,5 @@
 /*************************************************************************
-*
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2008 by Sun Microsystems, Inc.
@@ -49,8 +49,6 @@
 #endif
 #include <osl/time.h>
 
-#include <testshl/simpleheader.hxx>
-
 #ifdef UNX
 #include <unistd.h>
 #endif
diff --git a/sal/qa/osl/pipe/export.exp b/sal/qa/osl/pipe/export.exp
deleted file mode 100644
index a13529da5..000000000
--- a/sal/qa/osl/pipe/export.exp
+++ /dev/null
@@ -1 +0,0 @@
-registerAllTestFunction
diff --git a/sal/qa/osl/pipe/makefile.mk b/sal/qa/osl/pipe/makefile.mk
index 3d0df14bb..194c602c4 100644
--- a/sal/qa/osl/pipe/makefile.mk
+++ b/sal/qa/osl/pipe/makefile.mk
@@ -29,6 +29,10 @@
 #
 #*************************************************************************
 
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ=..$/..$/..
 
 PRJNAME=sal
@@ -49,14 +53,14 @@ SHL1OBJS=  \
     $(SLO)$/osl_Pipe.obj
 
 SHL1TARGET= osl_Pipe
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-# DEF1EXPORTFILE= export.exp
+SHL1RPATH = NONE
 # auto generated Target:Pipe
 # END ------------------------------------------------------------------
 
@@ -64,3 +68,5 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 .INCLUDE :  target.mk
 .INCLUDE : _cppunit.mk
+
+.END
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index cdae8380e..b4f1b838e 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -35,7 +35,10 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
@@ -67,8 +70,8 @@ using namespace rtl;
  */
 inline void printBool( sal_Bool bOk )
 {
-    t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("YES!\n" ): t_print("NO!\n" );
+    printf("#printBool# " );
+    ( sal_True == bOk ) ? printf("YES!\n" ): printf("NO!\n" );
 }
 
 /** print a UNI_CODE String.
@@ -77,9 +80,9 @@ inline void printUString( const ::rtl::OUString & str )
 {
     rtl::OString aString;
 
-    t_print("#printUString_u# " );
+    printf("#printUString_u# " );
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("%s\n", aString.getStr( ) );
+    printf("%s\n", aString.getStr( ) );
 }
 
 /** print last error of pipe system.
@@ -87,43 +90,43 @@ inline void printUString( const ::rtl::OUString & str )
 inline void printPipeError( ::osl::Pipe aPipe )
 {
     oslPipeError nError = aPipe.getError( );
-    t_print("#printPipeError# " );
+    printf("#printPipeError# " );
     switch ( nError ) {
     case osl_Pipe_E_None:
-        t_print("Success!\n" );
+        printf("Success!\n" );
         break;
     case osl_Pipe_E_NotFound:
-        t_print("The returned error is: Not found!\n" );
+        printf("The returned error is: Not found!\n" );
         break;
     case osl_Pipe_E_AlreadyExists:
-        t_print("The returned error is: Already exist!\n" );
+        printf("The returned error is: Already exist!\n" );
         break;
     case osl_Pipe_E_NoProtocol:
-        t_print("The returned error is: No protocol!\n" );
+        printf("The returned error is: No protocol!\n" );
         break;
     case osl_Pipe_E_NetworkReset:
-        t_print("The returned error is: Network reset!\n" );
+        printf("The returned error is: Network reset!\n" );
         break;
     case osl_Pipe_E_ConnectionAbort:
-        t_print("The returned error is: Connection aborted!\n" );
+        printf("The returned error is: Connection aborted!\n" );
         break;
     case osl_Pipe_E_ConnectionReset:
-        t_print("The returned error is: Connection reset!\n" );
+        printf("The returned error is: Connection reset!\n" );
         break;
     case osl_Pipe_E_NoBufferSpace:
-        t_print("The returned error is: No buffer space!\n" );
+        printf("The returned error is: No buffer space!\n" );
         break;
     case osl_Pipe_E_TimedOut:
-        t_print("The returned error is: Timeout!\n" );
+        printf("The returned error is: Timeout!\n" );
         break;
     case osl_Pipe_E_ConnectionRefused:
-        t_print("The returned error is: Connection refused!\n" );
+        printf("The returned error is: Connection refused!\n" );
         break;
     case osl_Pipe_E_invalidError:
-        t_print("The returned error is: Invalid error!\n" );
+        printf("The returned error is: Invalid error!\n" );
         break;
     default:
-        t_print("The returned error is: Number %d, Unknown Error\n", nError );
+        printf("The returned error is: Number %d, Unknown Error\n", nError );
         break;
     }
 }
@@ -690,17 +693,17 @@ namespace osl_Pipe
 
 
 // -----------------------------------------------------------------------------
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::ctors, "osl_Pipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::is, "osl_Pipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::create, "osl_Pipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::clear, "osl_Pipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::assign, "osl_Pipe");
-//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::isValid, "osl_Pipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::isEqual, "osl_Pipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::close, "osl_Pipe");
-    //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::accept, "osl_Pipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::getError, "osl_Pipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Pipe::getHandle, "osl_Pipe");
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::ctors);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::is);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::create);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::clear);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::assign);
+//CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::isValid);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::isEqual);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::close);
+    //CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::accept);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getError);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getHandle);
 // -----------------------------------------------------------------------------
 
 } // namespace osl_Pipe
@@ -884,7 +887,7 @@ namespace osl_StreamPipe
     void thread_sleep( sal_Int32 _nSec )
     {
         /// print statement in thread process must use fflush() to force display.
-        // t_print("wait %d seconds. ", _nSec );
+        // printf("wait %d seconds. ", _nSec );
         fflush(stdout);
 
 #ifdef WNT                               //Windows
@@ -893,7 +896,7 @@ namespace osl_StreamPipe
 #if ( defined UNX ) || ( defined OS2 )   //Unix
         sleep( _nSec );
 #endif
-        // t_print("done\n" );
+        // printf("done\n" );
     }
     // test read/write & send/recv data to pipe
     // -----------------------------------------------------------------------------
@@ -912,27 +915,27 @@ namespace osl_StreamPipe
             {
                 sal_Int32 nChars = 0;
 
-                t_print("open pipe\n");
+                printf("open pipe\n");
                 ::osl::StreamPipe aSenderPipe( aTestPipeName, osl_Pipe_OPEN );  // aTestPipeName is a string = "TestPipe"
                 if ( aSenderPipe.is() == sal_False )
                 {
-                    t_print("pipe open failed! \n");
+                    printf("pipe open failed! \n");
                 }
                 else
                 {
-                    t_print("read\n");
+                    printf("read\n");
                     nChars = aSenderPipe.read( buf, m_pTestString1.getLength() + 1 );
                     if ( nChars < 0 )
                     {
-                        t_print("read failed! \n");
+                        printf("read failed! \n");
                         return;
                     }
-                    t_print("buffer is %s \n", buf);
-                    t_print("send\n");
+                    printf("buffer is %s \n", buf);
+                    printf("send\n");
                     nChars = aSenderPipe.send( m_pTestString2.getStr(), m_pTestString2.getLength() + 1 );
                     if ( nChars < 0 )
                     {
-                        t_print("client send failed! \n");
+                        printf("client send failed! \n");
                         return;
                     }
                 }
@@ -951,7 +954,7 @@ namespace osl_StreamPipe
         ::osl::StreamPipe aConnectionPipe;
         Pipe_DataSource_Thread( )
             {
-                t_print("create pipe\n");
+                printf("create pipe\n");
                 aListenPipe.create( aTestPipeName, osl_Pipe_CREATE );
             }
         ~Pipe_DataSource_Thread( )
@@ -964,40 +967,40 @@ namespace osl_StreamPipe
                 //create pipe.
                 sal_Int32 nChars;
                 //::osl::StreamPipe aListenPipe( aTestPipeName, osl_Pipe_CREATE );
-                t_print("listen\n");
+                printf("listen\n");
                 if ( aListenPipe.is() == sal_False )
                 {
-                    t_print("pipe create failed! \n");
+                    printf("pipe create failed! \n");
                 }
                 else
                 {
                     //::osl::StreamPipe aConnectionPipe;
 
                     //start server and wait for connection.
-                    t_print("accept\n");
+                    printf("accept\n");
                     if ( osl_Pipe_E_None != aListenPipe.accept( aConnectionPipe ) )
                     {
-                        t_print("pipe accept failed!");
+                        printf("pipe accept failed!");
                         return;
                     }
-                    t_print("write\n");
+                    printf("write\n");
                     // write to pipe
                     nChars = aConnectionPipe.write( m_pTestString1.getStr(), m_pTestString1.getLength() + 1 );
                     if ( nChars < 0)
                     {
-                        t_print("server write failed! \n");
+                        printf("server write failed! \n");
                         return;
                     }
-                    t_print("recv\n");
+                    printf("recv\n");
                     nChars = aConnectionPipe.recv( buf, 256 );
 
                     if ( nChars < 0)
                     {
-                        t_print("server receive failed! \n");
+                        printf("server receive failed! \n");
                         return;
                     }
                     //thread_sleep( 2 );
-                    t_print("received message is: %s\n", buf );
+                    printf("received message is: %s\n", buf );
                     //aConnectionPipe.close();
                 }
             }
@@ -1048,16 +1051,11 @@ namespace osl_StreamPipe
     }; // class recv
 
 // -----------------------------------------------------------------------------
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamPipe::ctors, "osl_StreamPipe");
-//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamPipe::assign, "osl_StreamPipe");
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamPipe::recv, "osl_StreamPipe");
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::ctors);
+//CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::assign);
+    CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::recv);
 // -----------------------------------------------------------------------------
 
 } // namespace osl_StreamPipe
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sal/qa/osl/pipe/osl_Pipe.xsce b/sal/qa/osl/pipe/osl_Pipe.xsce
deleted file mode 100644
index d96a915d8..000000000
--- a/sal/qa/osl/pipe/osl_Pipe.xsce
+++ /dev/null
@@ -1,9 +0,0 @@
-#i23307#
-osl_Pipe.getError.getError_001 wntmsci
-osl_Pipe.getError.getError_002 wntmsci
-
-osl_StreamPipe.recv.recv_002 wntmsci unxsols
-# osl_Pipe.ctors.ctors_acquire wntmsci
-
-#i27889#
-osl_Pipe.ctors.ctors_no_acquire wntmsci
diff --git a/sal/qa/osl/pipe/osl_Pipe_Const.h b/sal/qa/osl/pipe/osl_Pipe_Const.h
deleted file mode 100644
index 0b70655ea..000000000
--- a/sal/qa/osl/pipe/osl_Pipe_Const.h
+++ /dev/null
@@ -1 +0,0 @@
-// no longer used
diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk
index 482bc6927..8e9c0412e 100644
--- a/sal/qa/osl/profile/makefile.mk
+++ b/sal/qa/osl/profile/makefile.mk
@@ -28,6 +28,11 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
+
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ=..$/..$/..
 
 PRJNAME=sal
@@ -48,11 +53,12 @@ SHL1OBJS=  \
     $(SLO)$/osl_old_testprofile.obj
 
 SHL1TARGET= osl_old_testprofile
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1RPATH = NONE
 # END ------------------------------------------------------------------
 
 
@@ -66,4 +72,4 @@ SLOFILES=\
 .INCLUDE :  target.mk
 .INCLUDE : _cppunit.mk
 
-
+.END
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index 27e4cbe6b..654954072 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -40,7 +40,10 @@
 #include <stdio.h>
 #include <osl/profile.h>
 
-#include <testshl/simpleheader.hxx>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 
 //==================================================================================================
 // -----------------------------------------------------------------------------
@@ -67,7 +70,7 @@ void oldtests::test_profile(void)
 
 
     // successful write
-    if (hProfile = osl_openProfile( ustrProfileName, 0 ))
+    if ((hProfile = osl_openProfile( ustrProfileName, 0 )))
     {
         if (! osl_writeProfileBool( hProfile, "testsection", "testbool", 1 ))
             printf( "### cannot write into init file!\n" );
@@ -76,7 +79,7 @@ void oldtests::test_profile(void)
     }
 
     // unsuccessful write
-    if (hProfile = osl_openProfile( ustrProfileName2, 0 ))
+    if ((hProfile = osl_openProfile( ustrProfileName2, 0 )))
     {
         if (osl_writeProfileBool( hProfile, "testsection", "testbool", 1 ))
             printf( "### unexpected success writing into test2.ini!\n" );
@@ -91,7 +94,7 @@ void oldtests::test_profile(void)
 } // namespace osl_Profile
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_Profile::oldtests, "osl_Profile" );
+CPPUNIT_TEST_SUITE_REGISTRATION( osl_Profile::oldtests );
 
 // -----------------------------------------------------------------------------
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
-- 
cgit v1.2.3


From 912e462a1d1e5cec284f40d4dff4506629d4830b Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 14 Jan 2010 15:09:04 +0100
Subject: sb118: #i23307# do not return osl_Pipe_E_None from
 osl_getLastPipeError(0)

---
 sal/osl/w32/pipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c
index fbc4e1923..c6c3a6e94 100644
--- a/sal/osl/w32/pipe.c
+++ b/sal/osl/w32/pipe.c
@@ -632,7 +632,7 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe)
         pPipe->m_Error = osl_Pipe_E_None;
     }
     else
-        Error = osl_Pipe_E_None;
+        Error = osl_Pipe_E_NotFound;
 
     return (Error);
 }
-- 
cgit v1.2.3


From 7a561fc939a4138b557ffab64ae438eac74216cd Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 14 Jan 2010 15:11:09 +0100
Subject: sb118: fixed tests for wntmsci12

---
 sal/qa/osl/pipe/osl_Pipe.cxx               | 8 ++++----
 sal/qa/osl/profile/osl_old_testprofile.cxx | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index b4f1b838e..a447c3ccc 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -631,8 +631,8 @@ namespace osl_Pipe
                 printPipeError( aPipe );
                 aPipe.clear( );
 
-                CPPUNIT_ASSERT_MESSAGE( "#test comment#: open a non-exist pipe. not passed in (W32)(LINUX)(UNX).",
-                                        osl_Pipe_E_invalidError == nError );
+                CPPUNIT_ASSERT_MESSAGE( "#test comment#: open a non-exist pipe.",
+                                        nError != osl_Pipe_E_None );
             }
 
         void getError_002( )
@@ -644,8 +644,8 @@ namespace osl_Pipe
                 aPipe.clear( );
                 aPipe1.clear( );
 
-                CPPUNIT_ASSERT_MESSAGE( "#test comment#: create an already exist pipe.not passed in (W32)(LINUX)(UNX).",
-                                        osl_Pipe_E_invalidError  == nError );
+                CPPUNIT_ASSERT_MESSAGE( "#test comment#: create an already exist pipe.",
+                                        nError != osl_Pipe_E_None );
             }
 
         CPPUNIT_TEST_SUITE( getError );
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index 654954072..abbd59f76 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -70,7 +70,8 @@ void oldtests::test_profile(void)
 
 
     // successful write
-    if ((hProfile = osl_openProfile( ustrProfileName, 0 )))
+    hProfile = osl_openProfile( ustrProfileName, 0 );
+    if (hProfile != 0)
     {
         if (! osl_writeProfileBool( hProfile, "testsection", "testbool", 1 ))
             printf( "### cannot write into init file!\n" );
@@ -79,7 +80,8 @@ void oldtests::test_profile(void)
     }
 
     // unsuccessful write
-    if ((hProfile = osl_openProfile( ustrProfileName2, 0 )))
+    hProfile = osl_openProfile( ustrProfileName2, 0 );
+    if (hProfile != 0)
     {
         if (osl_writeProfileBool( hProfile, "testsection", "testbool", 1 ))
             printf( "### unexpected success writing into test2.ini!\n" );
-- 
cgit v1.2.3


From 1b25da733557cb7029d2656d4ba250b518f5d61f Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 14 Jan 2010 17:45:24 +0100
Subject: sb118: #i108324# deprecated osl/semaphor.h etc., as it is unsupported
 on Mac OS X and unused, anyway

---
 sal/inc/osl/semaphor.h                     |  19 ++
 sal/inc/osl/semaphor.hxx                   |   4 +
 sal/qa/osl/semaphore/makefile.mk           |  65 ----
 sal/qa/osl/semaphore/osl_Semaphore.cxx     | 528 -----------------------------
 sal/qa/osl/semaphore/osl_Semaphore_Const.h |  76 -----
 salhelper/inc/salhelper/queue.hxx          |  12 +
 6 files changed, 35 insertions(+), 669 deletions(-)
 delete mode 100644 sal/qa/osl/semaphore/makefile.mk
 delete mode 100644 sal/qa/osl/semaphore/osl_Semaphore.cxx
 delete mode 100644 sal/qa/osl/semaphore/osl_Semaphore_Const.h

diff --git a/sal/inc/osl/semaphor.h b/sal/inc/osl/semaphor.h
index 23a2b2615..7c6f68484 100644
--- a/sal/inc/osl/semaphor.h
+++ b/sal/inc/osl/semaphor.h
@@ -40,6 +40,10 @@ extern "C" {
 typedef void* oslSemaphore;
 
 /** Creates a semaphore.<BR>
+
+    @deprecated
+    Must not be used, as unnamed semaphores are not supported on Mac OS X.
+
     @param InitialCount denotes the starting value the semaphore. If you set it to
     zero, the first acquire() blocks. Otherwise InitialCount acquire()s  are
     immedeatly  successfull.
@@ -48,12 +52,20 @@ typedef void* oslSemaphore;
 oslSemaphore SAL_CALL osl_createSemaphore(sal_uInt32 initialCount);
 
 /** Release the OS-structures and free semaphore data-structure
+
+    @deprecated
+    Must not be used, as unnamed semaphores are not supported on Mac OS X.
+
     @return fbbb
 */
 void SAL_CALL osl_destroySemaphore(oslSemaphore Semaphore);
 
 /** acquire() decreases the count. It will block if it tries to
     decrease below zero.
+
+    @deprecated
+    Must not be used, as unnamed semaphores are not supported on Mac OS X.
+
     @return False if the system-call failed.
 */
 sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore);
@@ -62,10 +74,17 @@ sal_Bool SAL_CALL osl_acquireSemaphore(oslSemaphore Semaphore);
     return with False if it would decrease the count below zero.
     (When acquire() would block.) If it could successfully 
     decrease the count, it will return True.
+
+    @deprecated
+    Must not be used, as unnamed semaphores are not supported on Mac OS X.
 */
 sal_Bool SAL_CALL osl_tryToAcquireSemaphore(oslSemaphore Semaphore);
 
 /** release() increases the count.
+
+    @deprecated
+    Must not be used, as unnamed semaphores are not supported on Mac OS X.
+
     @return False if the system-call failed.
 */
 sal_Bool SAL_CALL osl_releaseSemaphore(oslSemaphore Semaphore);
diff --git a/sal/inc/osl/semaphor.hxx b/sal/inc/osl/semaphor.hxx
index 5a667fe90..9942ccfea 100644
--- a/sal/inc/osl/semaphor.hxx
+++ b/sal/inc/osl/semaphor.hxx
@@ -38,7 +38,11 @@
 
 namespace osl
 {     
+    /** C++ wrapper class around C semaphore functions.
 
+        @deprecated
+        Must not be used, as unnamed semaphores are not supported on Mac OS X.
+    */
     class Semaphore {
     
     public:
diff --git a/sal/qa/osl/semaphore/makefile.mk b/sal/qa/osl/semaphore/makefile.mk
deleted file mode 100644
index a8918dcfb..000000000
--- a/sal/qa/osl/semaphore/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=sal
-TARGET=qa_osl_semaphore
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:Semaphore by codegen.pl
-SHL1OBJS=  \
-    $(SLO)$/osl_Semaphore.obj
-
-SHL1TARGET= osl_Semaphore
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-
-# auto generated Target:Semaphore
-# END ------------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
diff --git a/sal/qa/osl/semaphore/osl_Semaphore.cxx b/sal/qa/osl/semaphore/osl_Semaphore.cxx
deleted file mode 100644
index 0e2ec5d84..000000000
--- a/sal/qa/osl/semaphore/osl_Semaphore.cxx
+++ /dev/null
@@ -1,528 +0,0 @@
- /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: osl_Semaphore.cxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
- 
-//------------------------------------------------------------------------
-// include files
-//------------------------------------------------------------------------
-#include <osl_Semaphore_Const.h> 
-
-using namespace	osl;
-using namespace	rtl;
-
-
-//------------------------------------------------------------------------
-// helper functions and classes
-//------------------------------------------------------------------------
-
-/** print Boolean value.
-*/
-inline void printBool( sal_Bool bOk )
-{
-    t_print("#printBool# " );
-    ( sal_True == bOk ) ? t_print("YES!\n" ): t_print("NO!\n" );		
-}
-
-/** print a UNI_CODE String.
-*/
-inline void printUString( const ::rtl::OUString & str )
-{
-    rtl::OString aString; 
-
-    t_print("#printUString_u# " );
-    aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("%s\n", aString.getStr( ) );
-}
-
-/** wait _nSec seconds.
-*/
-void thread_sleep( sal_Int32 _nSec )
-{
-    /// print statement in thread process must use fflush() to force display.
-    // t_print("wait %d seconds. ", _nSec );
-    // fflush( stdout );
-    
-#ifdef WNT                               //Windows
-    Sleep( _nSec * 1000 );
-#endif
-#if ( defined UNX ) || ( defined OS2 )   //Unix
-    sleep( _nSec );
-#endif
-}
-
- void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
- {     
-#ifdef WNT      //Windows
-        Sleep(_nTenthSec * 100 );
-#endif
-#if ( defined UNX ) || ( defined OS2 )  //Unix
-        TimeValue nTV;
-        nTV.Seconds = static_cast<sal_uInt32>( _nTenthSec/10 );
-        nTV.Nanosec = ( (_nTenthSec%10 ) * 100000000 );
-        osl_waitThread(&nTV);
-#endif
-}
-
-/** thread for testing Semaphore acquire. 
- */
-class HoldThread : public Thread
-{
-public:
-    //get the Semaphores to operate 
-    HoldThread( ::osl::Semaphore& Sem ): MySem( Sem ) { }
-    
-    ~HoldThread( )
-    {
-        CPPUNIT_ASSERT_MESSAGE( "#HoldThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
-    }
-protected:
-    ::osl::Semaphore& MySem;
-
-    void SAL_CALL run()
-    {
-        // block here if it tries to decrease below zero. 
-        MySem.acquire( );
-        t_print("Semaphore acquired. \n" );
-        MySem.release( );
-    }
-};
-    
-/** thread for testing Semaphore release and tryToAcquire. 
- */
-class WaitThread : public Thread
-{
-public:
-    //get the Semaphore pointer to operate
-    WaitThread( ::osl::Semaphore& Sem ): MySem( Sem ) { }
-    
-    ~WaitThread( )
-    {
-        CPPUNIT_ASSERT_MESSAGE( "WaitThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
-    }    
-protected:
-    Semaphore& MySem;
-
-    void SAL_CALL run( )
-    {
-        // block here if the semaphore has been acquired
-        MySem.acquire( );
-        thread_sleep_tenth_sec( 2 );
-        MySem.release( );
-    }
-};
-
-/** thread for producer-consumer model. 
- */
-#define BSIZE 50
-class SemBuffer
-{
-public:
-    sal_Int32 Buf[BSIZE];
-    ::osl::Semaphore& aSemOccupied;
-    ::osl::Semaphore& aSemEmpty;
-    ::osl::Mutex& aMutex;	
-    
-    SemBuffer( ::osl::Semaphore& Sem, ::osl::Semaphore& Sem1, ::osl::Mutex& Mut )
-            :aSemOccupied( Sem ), aSemEmpty( Sem1 ), aMutex( Mut )
-    {
-        for ( sal_Int8 iCount=0; iCount < BSIZE; iCount++ )
-            Buf[iCount] = 0;
-    }
-};
-
-class WriterThread : public Thread
-{
-public:
-    //get the Semaphores to operate
-    WriterThread( SemBuffer& aSemBuffer ): MySemBuffer( aSemBuffer ){ }
-    
-    ~WriterThread( )
-    {
-        CPPUNIT_ASSERT_MESSAGE( "WriterThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
-    }    
-protected:
-    SemBuffer& MySemBuffer;
-
-    void SAL_CALL run( )
-    {
-        for ( sal_Int32 iCount = 0; iCount < BSIZE; iCount++ )
-        {
-            MySemBuffer.aSemEmpty.acquire( ) ;
-            MySemBuffer.aMutex.acquire( ) ;
-            MySemBuffer.Buf[iCount] = iCount;
-            MySemBuffer.aMutex.release( ) ;
-            MySemBuffer.aSemOccupied.release( ) ;
-        }
-    }
-};
-
-class ReaderThread : public Thread
-{
-public:
-    //get the Semaphores to operate
-    ReaderThread( SemBuffer& aSemBuffer ): MySemBuffer( aSemBuffer ){ }
-    
-    ~ReaderThread( )
-    {
-        CPPUNIT_ASSERT_MESSAGE( "ReaderThread does not shutdown properly.\n", sal_False == this -> isRunning( ) );
-    }    
-    
-protected:
-    SemBuffer& MySemBuffer;
-
-    void SAL_CALL run( )
-    {
-        for ( sal_Int32 iCount = 0; iCount < BSIZE; iCount++ )
-        {
-            MySemBuffer.aSemOccupied.acquire( ) ;
-            MySemBuffer.aMutex.acquire( ) ;
-            MySemBuffer.Buf[iCount] *= MySemBuffer.Buf[iCount];
-            MySemBuffer.aMutex.release( ) ;
-            MySemBuffer.aSemEmpty.release( ) ;
-        }
-    }
-};
-
-
-
-//------------------------------------------------------------------------
-// test code start here
-//------------------------------------------------------------------------
-
-namespace osl_Semaphore
-{
-
-    /** testing the method:
-        Semaphore(sal_uInt32 initialCount);
-    */
-    class ctors : public CppUnit::TestFixture
-    {
-    public:
-        sal_Bool bRes, bRes1;
-    
-        void ctors_001( )
-        {
-            ::osl::Semaphore aSem(sal_uInt32(0));
-            bRes = aSem.tryToAcquire( );
-            
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create semaphore with initialCount = 0. the first acquire will block.", 
-                                    sal_False == bRes );
-        }
-    
-        void ctors_002( )
-        {
-            ::osl::Semaphore aSem(sal_uInt32(1));
-            bRes = aSem.tryToAcquire( );
-            if ( sal_True == bRes )
-                aSem.release( );
-            
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create semaphore with initialCount = 1. the first acquire will not block.", 
-                                    sal_True == bRes );
-        }
-
-        void ctors_003( )
-        {
-            ::osl::Semaphore aSem(sal_uInt32(1));
-            bRes = aSem.tryToAcquire( );
-            bRes1 = aSem.tryToAcquire( );
-            
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create semaphore with initialCount = 1. acquire twice will cause block.", 
-                                    sal_True == bRes && sal_False == bRes1);
-        }
-        
-        void ctors_004( )
-        {
-            oslSemaphore hSem = new ::osl::Semaphore(sal_uInt32(1));
-            
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test return value of the constructor, it should not be NULL.", 
-                                    NULL != hSem );
-        }
-        
-        void ctors_005( )
-        {
-            ::osl::Semaphore aSemaphore(sal_uInt32(2));
-            bRes = 	aSemaphore.tryToAcquire( )&&
-                    aSemaphore.tryToAcquire( )&&
-                    !aSemaphore.tryToAcquire( );
-            
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: create semaphore with initialCount = 2. guess what behaviour will the semaphore act like.", 
-                                    sal_True == bRes );
-        }
-        
-        CPPUNIT_TEST_SUITE( ctors );
-        CPPUNIT_TEST( ctors_001 );
-        CPPUNIT_TEST( ctors_002 );
-        CPPUNIT_TEST( ctors_003 );
-        CPPUNIT_TEST( ctors_004 );
-        CPPUNIT_TEST( ctors_005 );
-        CPPUNIT_TEST_SUITE_END( ); 
-    }; // class ctors
-
-    
-    /** testing the method:
-        sal_Bool acquire();
-    */
-    class acquire : public CppUnit::TestFixture
-    {
-    public:
-        sal_Bool bRes, bRes1, bRes2;
-    
-        /**  tester comment:
-            acquire semaphore in main thread, and then call acquire again in myThread, 
-            the child thread should block, wait 2 secs, it still block. Then release
-            semaphore in main thread, the child thread could return from acquire, and 
-            go to exec next statement, so could terminate quickly.
-        */
-    
-        void acquire_001( )
-        {
-            // launch the child thread
-            ::osl::Semaphore aSemaphore(1);
-            bRes = aSemaphore.acquire( );
-            HoldThread myThread( aSemaphore );
-            myThread.create( );
-    
-            // if acquire in myThread does not work, 2 secs is long enough, 
-            // myThread should terminate now, and bRes1 should be sal_False
-            thread_sleep_tenth_sec( 2 );
-            bRes1 = myThread.isRunning( );
-            
-            // after release semaphore, myThread stops blocking and will terminate immediately
-            aSemaphore.release( );
-            thread_sleep_tenth_sec( 1 );
-            bRes2 = myThread.isRunning( );
-            myThread.join( );
-    
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test acquire of Semaphore.",  
-                bRes == sal_True && bRes1 == sal_True && bRes2 == sal_False );
-        }
-    
-        /**  tester comment:
-            launch 3 thread for testing acquirement inter-process.
-        */
-        
-        void acquire_002( )
-        {
-            // launch three child threads
-            ::osl::Semaphore aSemaphore(1);
-            bRes = aSemaphore.acquire( );
-            HoldThread myThread1( aSemaphore );
-            myThread1.create( );
-            HoldThread myThread2( aSemaphore );
-            myThread2.create( );
-            HoldThread myThread3( aSemaphore );
-            myThread3.create( );
-    
-            // if acquire in myThread does not work, 2 secs is long enough, 
-            thread_sleep_tenth_sec( 2 );
-            bRes1 = myThread1.isRunning( ) && myThread2.isRunning( ) && myThread3.isRunning( );
-            
-            // after release semaphore, myThread stops blocking and will terminate immediately
-            aSemaphore.release( );
-            thread_sleep_tenth_sec( 1 );
-            bRes2 = myThread1.isRunning( ) || myThread2.isRunning( ) || myThread3.isRunning( );
-            myThread1.join( );
-            myThread2.join( );
-            myThread3.join( );
-    
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test acquire of Semaphore in multithreaded environment.",  
-                bRes == sal_True && bRes1 == sal_True && bRes2 == sal_False );
-        }
-        
-        
-        
-        /**  tester comment:
-            launch 3 thread for testing acquirement inter-process. in this test,
-            we use two threads as producer and consumer, operate together on an 
-            array which is initialized to 0 for every item. producer takes action
-            as follow:
-                    p(A), p(M), Buf[i]=i, v(M), v(B).
-            consumer's action is like:
-                    p(B), p(M), Buf[i]=Buf[i]*Buf[i], v(M), v(A).
-            consumer must operate on the array after producer does sequetially, 
-            otherwise, the array will contain items remain zero after all threads
-            terminate. array will be filled with index^2 in the end. 
-        */
-        
-        void acquire_003( )
-        {
-            // initialization.
-            ::osl::Semaphore aSemOccupied( sal_uInt32(0) );
-            ::osl::Semaphore aSemEmpty( BSIZE );
-            ::osl::Mutex aMutex;
-
-            // launch two threads.
-            SemBuffer aBuffer( aSemOccupied, aSemEmpty, aMutex );
-            WriterThread myThread1( aBuffer );
-            ReaderThread myThread2( aBuffer );
-            myThread1.create( );
-            myThread2.create( );
-    
-            myThread1.join( );
-            myThread2.join( ); 
-            
-            bRes = sal_True;
-            for ( sal_Int32 iCount = 0; iCount < BSIZE; iCount++ )
-                bRes = bRes && ( aBuffer.Buf[iCount] == iCount*iCount );
-    
-            CPPUNIT_ASSERT_MESSAGE( "#test comment#: test acquire of Semaphore using Producer-Consumer model.",  
-                sal_True == bRes );
-        }
-
-        CPPUNIT_TEST_SUITE( acquire );
-        CPPUNIT_TEST( acquire_001 );
-        CPPUNIT_TEST( acquire_002 );
-        CPPUNIT_TEST( acquire_003 );
-        CPPUNIT_TEST_SUITE_END( ); 
-    }; // class acquire
-
-    
-    /** testing the method:
-        sal_Bool tryToAcquire();
-    */
-    class tryToAcquire : public CppUnit::TestFixture
-    {
-    public:
-        sal_Bool bRes, bRes1, bRes2;
-        /**  tester comment:
-            First let child thread acquire the semaphore, and wait 2 secs, during the 2 secs,
-            in main thread, tryToAcquire semaphore should return False, then after the 
-            child thread terminated, tryToAcquire should return True
-        */
-        void tryToAcquire_001()
-        {
-            ::osl::Semaphore aSemaphore(1);
-            WaitThread myThread( aSemaphore );
-            myThread.create();
-    
-            // ensure the child thread acquire the semaphore
-            thread_sleep_tenth_sec(1);
-            bRes1 = aSemaphore.tryToAcquire();
-    
-            if (bRes1 == sal_True)
-                aSemaphore.release();
-            // wait the child thread terminate
-            myThread.join();
-            
-            bRes2 = aSemaphore.tryToAcquire();
-            if (bRes2 == sal_True)
-                aSemaphore.release();
-    
-            CPPUNIT_ASSERT_MESSAGE("#test comment#: Try to acquire Semaphore", 
-                    bRes1 == sal_False && bRes2 == sal_True);
-        }
-        
-        void tryToAcquire_002()
-        {
-            ::osl::Semaphore aSem(1);
-            bRes = aSem.tryToAcquire( );
-            bRes1 = aSem.tryToAcquire( );
-            
-    
-            CPPUNIT_ASSERT_MESSAGE("#test comment#: Try to acquire Semaphore twice should block.", 
-                    sal_True == bRes && sal_False == bRes1);
-        }
-        
-        CPPUNIT_TEST_SUITE( tryToAcquire );
-        CPPUNIT_TEST( tryToAcquire_001 );
-        CPPUNIT_TEST( tryToAcquire_002 );
-        CPPUNIT_TEST_SUITE_END( ); 
-    }; // class tryToAcquire
-    
-    
-    /** testing the method:
-        sal_Bool release();
-    */
-    class release : public CppUnit::TestFixture
-    {
-    public:
-        sal_Bool bRes, bRes1, bRes2, bRunning;
-        sal_Int32 nCount;
-        /** acquire/release are not used in pairs: after child thread acquired semaphore, 
-            the main thread release it, then any thread could acquire it.
-        */
-        void release_001()
-        {
-            Semaphore aSemaphore(1);
-            WaitThread myThread( aSemaphore );
-            myThread.create( );
-    
-            // ensure the child thread acquire the mutex
-            thread_sleep_tenth_sec( 1 );
-            
-            bRunning = myThread.isRunning( );
-            bRes1 = aSemaphore.tryToAcquire( );
-            // wait the child thread terminate
-            myThread.join( );
-            
-            bRes2 = aSemaphore.tryToAcquire( );
-            if ( bRes2 == sal_True )
-                aSemaphore.release( );
-    
-            CPPUNIT_ASSERT_MESSAGE( "release Semaphore: try to aquire before and after the semaphore has been released", 
-                bRes1 == sal_False && bRes2 == sal_True && bRunning == sal_True );
-    
-        }
-    
-        void release_002()
-        {
-            Semaphore aSemaphore(sal_uInt32(0));
-            bRes1 = sal_True;
-            for ( nCount = 0; nCount < 10; nCount++, aSemaphore.release( ) ) { }
-            for ( nCount = 0; nCount < 10; nCount++, bRes1 = bRes1 && aSemaphore.tryToAcquire( ) ) { }
-            bRes = aSemaphore.tryToAcquire( );
-            
-            CPPUNIT_ASSERT_MESSAGE( "release Semaphore: release ten times and acquire eleven times.", 
-                sal_False == bRes && sal_True == bRes1); 
-        }
-    
-        CPPUNIT_TEST_SUITE( release );
-        CPPUNIT_TEST( release_001 );
-        CPPUNIT_TEST( release_002 );
-        CPPUNIT_TEST_SUITE_END( );
-    }; // class release
-    
-// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Semaphore::ctors, "osl_Semaphore");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Semaphore::acquire, "osl_Semaphore");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Semaphore::tryToAcquire, "osl_Semaphore");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Semaphore::release, "osl_Semaphore");
-// -----------------------------------------------------------------------------
-    
-} // namespace osl_Semaphore
-
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
diff --git a/sal/qa/osl/semaphore/osl_Semaphore_Const.h b/sal/qa/osl/semaphore/osl_Semaphore_Const.h
deleted file mode 100644
index 831b472a8..000000000
--- a/sal/qa/osl/semaphore/osl_Semaphore_Const.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: osl_Semaphore_Const.h,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-#ifndef _OSL_SEMAPHORE_CONST_H_
-#define _OSL_SEMAPHORE_CONST_H_
-
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-
-#ifndef	_OSL_THREAD_HXX_
-#include <osl/thread.hxx>
-#endif
-#include <osl/mutex.hxx>
-#include <osl/pipe.hxx>
-
-#ifndef	_OSL_SEMAPHOR_HXX_
-#include <osl/semaphor.hxx>
-#endif
-#include <osl/time.h>
-
-#include <testshl/simpleheader.hxx>
-
-#ifdef UNX
-#include <unistd.h>
-#endif
-
-//------------------------------------------------------------------------
-// most return value -1 denote a fail of operation.
-//------------------------------------------------------------------------
-#define OSL_PIPE_FAIL   -1
-
-#define OSLTEST_DECLARE_USTRING( str_name, str_value ) \
-    ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( str_value )
-
-//------------------------------------------------------------------------
-// semaphre names
-//------------------------------------------------------------------------
-OSLTEST_DECLARE_USTRING( TestSem,  "testsem" );
-
-const char pTestString[17] = "Sun Microsystems";
-
-
-#endif /* _OSL_SEMAPHORE_CONST_H_ */
diff --git a/salhelper/inc/salhelper/queue.hxx b/salhelper/inc/salhelper/queue.hxx
index af8ce8907..49440d343 100644
--- a/salhelper/inc/salhelper/queue.hxx
+++ b/salhelper/inc/salhelper/queue.hxx
@@ -96,6 +96,12 @@ public:
 
 //----------------------------------------------------------------------------
 
+/** Queue.
+
+    @deprecated
+    Must not be used, as it internally uses unnamed semaphores, which are not
+    supported on Mac OS X.
+*/
 template<class element_type>
 class Queue : protected QueueBase<element_type>
 {
@@ -133,6 +139,12 @@ public:
 
 //----------------------------------------------------------------------------
 
+/** Bounded queue.
+
+    @deprecated
+    Must not be used, as it internally uses unnamed semaphores, which are not
+    supported on Mac OS X.
+*/
 template<class element_type>
 class BoundedQueue : protected Queue<element_type>
 {
-- 
cgit v1.2.3


From 5c32d71010819ff2d8f7cc943e6c35217ab8318f Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 15 Jan 2010 10:56:10 +0100
Subject: sb118: adpated some stoc unit test to new CppUnit framework

---
 stoc/prj/build.lst                 |  1 +
 stoc/test/uriproc/makefile.mk      | 49 ++++++++++++++++++++------------------
 stoc/test/uriproc/test_uriproc.cxx | 25 +++++++------------
 stoc/test/uriproc/version.map      |  2 +-
 4 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst
index 2550563c8..1fb7d34ee 100644
--- a/stoc/prj/build.lst
+++ b/stoc/prj/build.lst
@@ -22,3 +22,4 @@ tc	stoc\source\javavm						nmake	-	all	tc_jvm tc_inc NULL
 tc	stoc\source\javaloader					nmake	-	all	tc_jvload tc_inc NULL
 tc  	stoc\source\uriproc                     		nmake   -   	all 	tc_uriproc tc_stserv tc_inc NULL
 tc  	stoc\util						nmake   -   	all 	tc_util tc_boot tc_stserv tc_tcv tc_uriproc tc_smgr tc_inc tc_sreg tc_defr tc_ireg tc_regtd tc_tdmng tc_sec NULL
+tc stoc\test\uriproc nmake - all tc_test_uriproc tc_util NULL
diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk
index 78b54bb2a..6ab41afac 100644
--- a/stoc/test/uriproc/makefile.mk
+++ b/stoc/test/uriproc/makefile.mk
@@ -29,7 +29,11 @@
 #
 #*************************************************************************
 
-PRJ := ..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
+PRJ := ../..
 PRJNAME := stoc
 TARGET := test_uriproc
 
@@ -39,25 +43,11 @@ ENABLE_EXCEPTIONS := TRUE
 
 DLLPRE = # no leading "lib" on .so files
 
-UNOTYPES = \
-    com.sun.star.beans.XPropertySet \
-    com.sun.star.lang.XComponent \
-    com.sun.star.lang.XMultiComponentFactory \
-    com.sun.star.uno.XComponentContext \
-    com.sun.star.uri.ExternalUriReferenceTranslator \
-    com.sun.star.uri.UriReferenceFactory \
-    com.sun.star.uri.VndSunStarPkgUrlReferenceFactory \
-    com.sun.star.uri.XExternalUriReferenceTranslator \
-    com.sun.star.uri.XUriReference \
-    com.sun.star.uri.XUriReferenceFactory \
-    com.sun.star.uri.XVndSunStarPkgUrlReferenceFactory \
-    com.sun.star.uri.XVndSunStarScriptUrlReference \
-    com.sun.star.util.XMacroExpander
-
 SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_uriproc.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
+SHL1OBJS = $(SLO)/test_uriproc.obj
+SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
+SHL1RPATH = NONE
 SHL1IMPLIB = i$(SHL1TARGET)
 DEF1NAME = $(SHL1TARGET)
 
@@ -65,11 +55,24 @@ SLOFILES = $(SHL1OBJS)
 
 .INCLUDE: target.mk
 
+.IF "$(OS)" == "WNT"
+my_file = file:///
+.ELSE
+my_file = file://
+.END
+
 ALLTAR: test
 
-$(BIN)$/$(TARGET).rdb .ERRREMOVE:
-    $(COPY) $(SOLARBINDIR)$/types.rdb $@
-    regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/stocservices.uno$(DLLPOST))
+test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
+    $(CPPUNITTESTER) $(SHL1TARGETN) \
+        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+        -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb \
+        -env:OOO_TEST_PREFIX=$(my_file)$(PWD)/$(DLLDEST)/
+
+$(MISC)/$(TARGET)/services.rdb:
+    $(MKDIRHIER) $(@:d)
+    $(RM) $@
+    $(REGCOMP) -register -r $@ -wop=vnd.sun.star.expand:\$${{OOO_TEST_PREFIX}} \
+        -c $(DLLDEST)/stocservices.uno$(DLLPOST)
 
-test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).rdb
-    testshl2 $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
+.END
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index 71f92e504..6575259b6 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 
-#include "com/sun/star/beans/XPropertySet.hpp"
 #include "com/sun/star/lang/XComponent.hpp"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 #include "com/sun/star/uno/Reference.hxx"
@@ -46,10 +45,12 @@
 #include "com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.hpp"
 #include "com/sun/star/uri/XVndSunStarScriptUrlReference.hpp"
 #include "com/sun/star/util/XMacroExpander.hpp"
-#include "cppuhelper/servicefactory.hxx"
-#include "testshl/simpleheader.hxx"
+#include "cppuhelper/bootstrap.hxx"
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
 #include "osl/diagnose.h"
-#include "osl/thread.h"
 #include "rtl/string.h"
 #include "rtl/string.hxx"
 #include "rtl/textenc.h"
@@ -151,20 +152,12 @@ private:
 };
 
 void Test::setUp() {
-    char const * registry = getForwardString();
-    css::uno::Reference< css::lang::XMultiServiceFactory > factory(
-        cppu::createRegistryServiceFactory(
-            rtl::OUString(
-                registry, rtl_str_getLength(registry),
-                osl_getThreadTextEncoding())));
-        //TODO: check for string conversion failure
-    css::uno::Reference< css::beans::XPropertySet >(
-        factory, css::uno::UNO_QUERY_THROW)->getPropertyValue(
-            rtl::OUString::createFromAscii("DefaultContext")) >>= m_context;
+    m_context = cppu::defaultBootstrap_InitialComponentContext();
     m_uriFactory = css::uri::UriReferenceFactory::create(m_context);
 }
 
 void Test::tearDown() {
+    m_uriFactory.clear();
     css::uno::Reference< css::lang::XComponent >(
         m_context, css::uno::UNO_QUERY_THROW)->dispose();
 }
@@ -1007,8 +1000,8 @@ void Test::testPkgUrlFactory() {
     }
 }
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 }
 
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/stoc/test/uriproc/version.map b/stoc/test/uriproc/version.map
index 7ce1476be..5b46b43a1 100644
--- a/stoc/test/uriproc/version.map
+++ b/stoc/test/uriproc/version.map
@@ -31,7 +31,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
-- 
cgit v1.2.3


From 5cd15ccb54e9f390df9de4c2269d20c7bd200200 Mon Sep 17 00:00:00 2001
From: thb <thb@openoffice.org>
Date: Sat, 16 Jan 2010 02:20:50 +0100
Subject: #i105937# Fixed a few remaining gradient glitches

 * linear/axial gradient were f*cked up when border and rotation
   was given
 * found another place where drawinglayer was generating helper
   polygons for gradients (vclgradienthelper.cxx), adapted to new
   value ranges
 * fixed build breakage in debug build in oox
 * fixed order of gradient color generation
---
 offapi/com/sun/star/rendering/XGraphicDevice.idl   |   3 -
 .../rendering/XParametricPolyPolygon2DFactory.idl  | 155 ---------------------
 2 files changed, 158 deletions(-)
 delete mode 100644 offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl

diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index 8ee13c4cf..5b98481e2 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -48,9 +48,6 @@
 #ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XBezierPolyPolygon2D.idl>
 #endif
-#ifndef __com_sun_star_rendering_XParametricPolyPolygon2DFactory_idl__
-#include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl>
-#endif
 #ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
 #endif
diff --git a/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl b/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
deleted file mode 100644
index 87f318f63..000000000
--- a/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+++ /dev/null
@@ -1,155 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: XParametricPolyPolygon2DFactory.idl,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_rendering_XParametricPolyPolygon2DFactory_idl__
-#define __com_sun_star_rendering_XParametricPolyPolygon2DFactory_idl__
-
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
-#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XColorSpace_idl__
-#include <com/sun/star/rendering/XColorSpace.idl>
-#endif
-
-
-module com { module sun { module star { module rendering {
-
-interface XParametricPolyPolygon2D;
-
-/** This interface provides factory methods to generate various
-    ready-made XParametricPolyPolygon2Ds
- */
-interface XParametricPolyPolygon2DFactory : ::com::sun::star::uno::XInterface
-{
-    /** Create a linear gradient.
-
-        The gradient varies linearly between colors. the color positions on <0, 1> interval are given by stops values
-        in the x direction, and has constant color for fixed x
-        coordinate value in y direction
-     */
-    XParametricPolyPolygon2D	createLinearHorizontalGradient( [in] sequence<Color> colors, [in] sequence<double> stops )
-        raises (com::sun::star::lang::IllegalArgumentException); 
-
-    /** Create an axial gradient.
-
-        The gradient has middleColor in the middle, and varies
-        linearly between middleColor and endColor to both sides in the
-        x direction. For fixed x coordinate, the gradient has constant
-        color value in y direction.
-     */
-    XParametricPolyPolygon2D	createAxialHorizontalGradient( [in] sequence<Color> colors, [in] sequence<double> stops )
-        raises (com::sun::star::lang::IllegalArgumentException); 
-
-    /** Create an elliptical gradient.
-
-        The gradient has centerColor in the middle, and varies
-        linearly between center and endColor via concentric ellipses
-        around the center point. Note that the absolute size of the
-        rectangle given at this method does not matter, only it's
-        aspect ratio: if this aspect ratio is 1, the gradient is
-        circular. If it's not 1, the gradient is elliptical, with the
-        special twist that the aspect ratio is maintained also for the
-        center color: the gradient will not collapse into a single
-        point, but become a line of center color.
-     */
-    XParametricPolyPolygon2D	createEllipticalGradient( [in] sequence<Color> colors, [in] sequence<double> stops, [in] ::com::sun::star::geometry::RealRectangle2D boundRect )
-        raises (com::sun::star::lang::IllegalArgumentException); 
-
-    /** Create a rectangular gradient.
-
-        The gradient has centerColor in the middle, and varies
-        linearly between center and endColor via rectangular boxes
-        around the center point. Note that the absolute size of the
-        rectangle given at this method does not matter, only it's
-        aspect ratio: if this aspect ratio is 1, the gradient is
-        quadratic. If it's not 1, the gradient is rectangular, with
-        the special twist that the aspect ratio is maintained also for
-        the center color: the gradient will not collapse into a single
-        point, but become a line of center color.
-     */
-    XParametricPolyPolygon2D	createRectangularGradient( [in] sequence<Color> colors, [in] sequence<double> stops, [in] ::com::sun::star::geometry::RealRectangle2D boundRect )
-        raises (com::sun::star::lang::IllegalArgumentException); 
-
-    /** Create a line hash of vertical lines.
-
-        The hashing consists of vertical lines, with colors varying
-        linearly between leftColor and rightColor, when going from
-        left to right
-     */
-    XParametricPolyPolygon2D	createVerticalLinesHatch( [in] sequence<ColorComponent> leftColor, [in] sequence<ColorComponent> rightColor )
-        raises (com::sun::star::lang::IllegalArgumentException); 
-
-    /** Create a line hash of orthogonally crossing lines.
-
-        The hashing consists of vertical and horizontal lines, with
-        colors varying linearly between leftTopColor and
-        rightBottomColor, when going from left to right (for the
-        vertical lines) and from top tzo bottom (for the horizontal
-        lines).
-     */
-    XParametricPolyPolygon2D	createOrthogonalLinesHatch( [in] sequence<ColorComponent> leftTopColor, [in] sequence<ColorComponent> rightBottomColor )
-        raises (com::sun::star::lang::IllegalArgumentException); 
-
-    /** Create a repeating line hash pattern of three crossing lines.
-
-        The hashing consists of vertical and horizontal lines plus
-        diagonal lines from left, top to bottom, right. Each of the
-        three groups of lines varies the line color of distinct lines
-        linearly from startColor to endColor, starting at the leftmost
-        or topmost position.
-     */
-    XParametricPolyPolygon2D	createThreeCrossingLinesHatch( [in] sequence<ColorComponent> startColor, [in] sequence<ColorComponent> endColor )
-        raises (com::sun::star::lang::IllegalArgumentException); 
-
-    /** Create a repeating line hash pattern of four crossing lines.
-
-        The hashing consists of vertical and horizontal lines plus
-        diagonal lines in both directions. Each of the four groups of
-        lines varies the line color of distinct lines linearly from
-        startColor to endColor, starting at the leftmost or topmost
-        position.
-     */
-    XParametricPolyPolygon2D	createFourCrossingLinesHatch( [in] sequence<ColorComponent> startColor, [in] sequence<ColorComponent> endColor )
-        raises (com::sun::star::lang::IllegalArgumentException); 
-};
-
-//=============================================================================
-
-/// Service providing a <type>XParametricPolyPolygon2DFactory</type> service
-service ParametricPolyPolygon2DFactory: XParametricPolyPolygon2DFactory;
-
-}; }; }; };
-
-#endif
-- 
cgit v1.2.3


From cb5a7372f9bdf7969509547c5cb236c077961e8a Mon Sep 17 00:00:00 2001
From: thb <thb@openoffice.org>
Date: Mon, 18 Jan 2010 00:37:41 +0100
Subject: #i52325# #i108250# removed B3DGeometry, fixed gradient/fill bitmap

 * removed unused & broken B3DGeometry class
 * fixed bug in basegfx::tools::isRectangle for polygons with curves
 * fixed cairocanvas gradient and bitmap fill rendering
 * fixed vclcanvas bitmap fill rendering (not clipping properly)
 * added TextureMode::NONE, adapted all client code
 * fixed snafu in XGraphicDevice.idl, with missing include
---
 offapi/com/sun/star/rendering/TexturingMode.idl  | 19 +++++++++++++++----
 offapi/com/sun/star/rendering/XGraphicDevice.idl |  3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/offapi/com/sun/star/rendering/TexturingMode.idl b/offapi/com/sun/star/rendering/TexturingMode.idl
index b2cfba1a2..7936524b4 100644
--- a/offapi/com/sun/star/rendering/TexturingMode.idl
+++ b/offapi/com/sun/star/rendering/TexturingMode.idl
@@ -39,13 +39,24 @@ module com { module sun { module star { module rendering {
  */
 constants TexturingMode
 {
+    /** Pixel outside the texture area are fully transparent.<p>
+
+        This completely switches off pixel generation outside the
+        texture coordinate range [0,1]. This results in only one
+        instance of the texture generated per textured primitive.<p>
+       */
+    const byte NONE=0;
+
+    //-------------------------------------------------------------------------
+
     /** Clamp texture coordinate.<p>
 
-        This value clamps the texture coordinate to the range
+        This value clamps the texture coordinates to the range
         [0,1]. This results in only one instance of the texture
-        generated per textured primitive.<p>
+        generated per textured primitive, with the remaining area
+        filled with the color of the outermost texels<p>
        */
-    const byte CLAMP=0;
+    const byte CLAMP=1;
 
     //-------------------------------------------------------------------------
 
@@ -54,7 +65,7 @@ constants TexturingMode
         This value repeats the texture over the textured primitive,
         for the given texture coordinate.<p>
      */
-    const byte REPEAT=1;
+    const byte REPEAT=2;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/rendering/XGraphicDevice.idl b/offapi/com/sun/star/rendering/XGraphicDevice.idl
index 5b98481e2..c9de75715 100644
--- a/offapi/com/sun/star/rendering/XGraphicDevice.idl
+++ b/offapi/com/sun/star/rendering/XGraphicDevice.idl
@@ -48,6 +48,9 @@
 #ifndef __com_sun_star_rendering_XBezierPolyPolygon2D_idl__
 #include <com/sun/star/rendering/XBezierPolyPolygon2D.idl>
 #endif
+#ifndef __com_sun_star_rendering_XColorSpace_idl__
+#include <com/sun/star/rendering/XColorSpace.idl>
+#endif
 #ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
 #endif
-- 
cgit v1.2.3


From f53fbe656ef811d77f38711e27c8d1340acbc077 Mon Sep 17 00:00:00 2001
From: hb <hbrinkm@openoffice.org>
Date: Tue, 19 Jan 2010 12:56:39 +0100
Subject: merged DEV300_m69

---
 .../source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx  |  81 +++-
 .../source/cpp_uno/gcc3_linux_powerpc/except.cxx   |   6 +-
 .../source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx  |  54 ++-
 .../source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx   |  12 +-
 bridges/source/remote/urp/urp_reader.cxx           |   4 +-
 cpputools/source/sp2bv/makefile.mk                 |   2 +-
 .../uno/environments/java/java_environment.java    | 194 ++++------
 jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk   |   2 -
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx   |   7 -
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx   |   1 -
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx         |   5 +-
 sal/inc/osl/endian.h                               |  17 +-
 sal/inc/osl/thread.hxx                             |   4 +-
 sal/inc/rtl/math.hxx                               |  21 +-
 sal/inc/rtl/uuid.h                                 |   2 -
 sal/inc/sal/alloca.h                               |   2 +-
 sal/inc/sal/config.h                               |   2 +-
 sal/osl/os2/file.cxx                               |   4 +-
 sal/osl/os2/nlsupport.c                            |  21 +-
 sal/osl/os2/socket.c                               |   2 +-
 sal/osl/os2/system.h                               |  32 +-
 sal/osl/unx/backtrace.c                            |  48 ---
 sal/osl/unx/file_volume.cxx                        | 425 +--------------------
 sal/osl/unx/module.c                               |  26 --
 sal/osl/unx/nlsupport.c                            |  50 +--
 sal/osl/unx/process.c                              | 108 ++----
 sal/osl/unx/profile.c                              |  12 +-
 sal/osl/unx/socket.c                               |  21 +-
 sal/osl/unx/system.h                               |  31 +-
 sal/rtl/source/alloc.c                             |   4 +-
 sal/rtl/source/bootstrap.cxx                       |   4 +-
 sal/rtl/source/macro.hxx                           |   4 -
 sal/rtl/source/math.cxx                            |   9 +-
 sal/util/makefile.mk                               |   3 -
 salhelper/source/simplereferenceobject.cxx         |   2 +-
 35 files changed, 310 insertions(+), 912 deletions(-)

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index 238354b8e..703ebd54e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -61,7 +61,9 @@ static typelib_TypeClass cpp2uno_call(
     sal_Int64 * pRegisterReturn /* space for register return */ )
 {
         int ng = 0; //number of gpr registers used 
+#ifndef __NO_FPRS__
         int nf = 0; //number of fpr regsiters used
+#endif
         void ** pCppStack; //temporary stack pointer
        
         // gpreg:  [ret *], this, [gpr params]
@@ -123,11 +125,23 @@ static typelib_TypeClass cpp2uno_call(
             {
 
               case typelib_TypeClass_DOUBLE:
+#ifndef __NO_FPRS__
                if (nf < 8) {
                   pCppArgs[nPos] = fpreg;
                   pUnoArgs[nPos] = fpreg;
                   nf++;
                   fpreg += 2;
+#else
+               if (ng & 1) {
+                   ng++;
+                   gpreg++;
+               }
+               if (ng < 8) {
+                   pCppArgs[nPos] = gpreg;
+                   pUnoArgs[nPos] = gpreg;
+                   ng += 2;
+                   gpreg += 2;
+#endif
                } else {
                 if (((long)ovrflw) & 4) ovrflw++;
                 pCppArgs[nPos] = ovrflw;
@@ -139,6 +153,7 @@ static typelib_TypeClass cpp2uno_call(
                case typelib_TypeClass_FLOAT:
                 // fpreg are all double values so need to
                 // modify fpreg to be a single word float value
+#ifndef __NO_FPRS__
                 if (nf < 8) {
                    float tmp = (float) (*((double *)fpreg));
                    (*((float *) fpreg)) = tmp;
@@ -146,6 +161,13 @@ static typelib_TypeClass cpp2uno_call(
                    pUnoArgs[nPos] = fpreg;
                    nf++;
                    fpreg += 2;
+#else
+                if (ng < 8) {
+                   pCppArgs[nPos] = gpreg;
+                   pUnoArgs[nPos] = gpreg;
+                   ng++;
+                   gpreg++;
+#endif
                 } else {
 #if 0 /* abi is not being followed correctly */
                   if (((long)ovrflw) & 4) ovrflw++;
@@ -164,11 +186,11 @@ static typelib_TypeClass cpp2uno_call(
 
             case typelib_TypeClass_HYPER:
             case typelib_TypeClass_UNSIGNED_HYPER:
-             if (ng < 7) {
-                if (ng & 1) {
-                  ng++;
-                  gpreg++;
-                }  
+             if (ng & 1) {
+                ng++;
+                gpreg++;
+             }  
+             if (ng < 8) {
                 pCppArgs[nPos] = gpreg;
                 pUnoArgs[nPos] = gpreg;
                 ng += 2;
@@ -488,10 +510,12 @@ static typelib_TypeClass cpp_mediate(
 static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpregptr, void** fpregptr, void** ovrflw)
 {
         sal_Int32     gpreg[8];
-        double        fpreg[8];
-
         memcpy( gpreg, gpregptr, 32);
+
+#ifndef __NO_FPRS__
+        double        fpreg[8];
         memcpy( fpreg, fpregptr, 64);
+#endif
 
     volatile long nRegReturn[2];
 
@@ -499,10 +523,14 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
         // fprintf(stderr,"in cpp_vtable_call nVtableOffset is %x\n",nVtableOffset);
         // fflush(stderr);
 
-        sal_Bool bComplex = nFunctionIndex & 0x80000000 ? sal_True : sal_False;
-
     typelib_TypeClass aType = 
-             cpp_mediate( nFunctionIndex, nVtableOffset, (void**)gpreg, (void**)fpreg, ovrflw, (sal_Int64*)nRegReturn );
+             cpp_mediate( nFunctionIndex, nVtableOffset, (void**)gpreg,
+#ifndef __NO_FPRS__
+                 (void**)fpreg, 
+#else
+                 NULL,
+#endif
+                 ovrflw, (sal_Int64*)nRegReturn );
     
     switch( aType )
     {
@@ -524,13 +552,25 @@ static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpreg
                   break;
 
         case typelib_TypeClass_FLOAT:
+#ifndef __NO_FPRS__
                   __asm__( "lfs 1,%0\n\t" : :
                            "m" (*((float*)nRegReturn)) );
+ #else
+                  __asm__( "lwz 3,%0\n\t" : :
+                           "m"(nRegReturn[0]) );
+#endif
           break;
 
         case typelib_TypeClass_DOUBLE:
+#ifndef __NO_FPRS__
           __asm__( "lfd 1,%0\n\t" : :
                            "m" (*((double*)nRegReturn)) );
+#else
+          __asm__( "lwz 3,%0\n\t" : :
+                           "m"(nRegReturn[0]) );
+          __asm__( "lwz 4,%0\n\t" : :
+                           "m"(nRegReturn[1]) );
+#endif
           break;
 
         case typelib_TypeClass_HYPER:
@@ -577,6 +617,7 @@ unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal
 
 
     // # next save fpr 1 to fpr 8 (aligned to 8)
+    // if dedicated floating point registers are used
     //	stfd	f1,-2016(r1)
     //	stfd	f2,-2008(r1)
     //	stfd	f3,-2000(r1)
@@ -604,6 +645,10 @@ unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal
 
     // #now load up the pointer to the saved fpr registers
     //	addi	r6,r1,-2016
+    // if no dedicated floating point registers are used than we have NULL
+    // pointer there
+    //  li      r6, 0
+    //
 
     // #now load up the pointer to the overflow call stack
     //	addi	r7,r1,8
@@ -617,6 +662,7 @@ unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal
       * p++ = 0x9101f814;
       * p++ = 0x9121f818;
       * p++ = 0x9141f81c;
+#ifndef __NO_FPRS__
       * p++ = 0xd821f820;
       * p++ = 0xd841f828;
       * p++ = 0xd861f830;
@@ -625,6 +671,17 @@ unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal
       * p++ = 0xd8c1f848;
       * p++ = 0xd8e1f850;
       * p++ = 0xd901f858;
+#else
+      /* these nops could be replaced with a smaller codeSnippetSize - 8 * 4 */
+      * p++ = 0x60000000;
+      * p++ = 0x60000000;
+      * p++ = 0x60000000;
+      * p++ = 0x60000000;
+      * p++ = 0x60000000;
+      * p++ = 0x60000000;
+      * p++ = 0x60000000;
+      * p++ = 0x60000000;
+#endif
       * p++ = 0x3c600000 | (((unsigned long)cpp_vtable_call) >> 16);
       * p++ = 0x60630000 | (((unsigned long)cpp_vtable_call) & 0x0000FFFF);
       * p++ = 0x7c6903a6;
@@ -633,7 +690,11 @@ unsigned char *  codeSnippet( unsigned char * code, sal_Int32 functionIndex, sal
       * p++ = 0x3c800000 | (((unsigned long)vtableOffset) >> 16);
       * p++ = 0x60840000 | (((unsigned long)vtableOffset) & 0x0000FFFF);
       * p++ = 0x38a1f800;
+#ifndef __NO_FPRS__
       * p++ = 0x38c1f820;
+#else
+      * p++ = 0x38c00000;
+#endif
       * p++ = 0x38e10008;
       * p++ = 0x4e800420;
       return (code + codeSnippetSize);
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index 2d831a951..be2fa7197 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -137,8 +137,8 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
 
     MutexGuard guard( m_mutex );
-    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-    if (iFind == m_rttis.end())
+    t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
+    if (iRttiFind == m_rttis.end())
     {
         // RTTI symbol
         OStringBuffer buf( 64 );
@@ -202,7 +202,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
     }
     else
     {
-        rtti = iFind->second;
+        rtti = iRttiFind->second;
     }
 
     return rtti;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 0f6f00421..ef41be08b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -74,12 +74,14 @@ static void callVirtualMethod(
      void (*ptr)();
      int gpr[8];                   // storage for gpregisters, map to r3-r10
      int off;                      // offset used to find function
+#ifndef __NO_FPRS__
      double fpr[8];                // storage for fpregisters, map to f1-f8
-     int n;                        // number of gprs mapped so far
      int f;                        // number of fprs mapped so far
+     double dret;                  // temporary function return values
+#endif
+     int n;                        // number of gprs mapped so far
      long *p;                      // pointer to parameter overflow area
      int c;                        // character of parameter type being decoded
-     double dret;                  // temporary function return values
      int iret, iret2;
 
      // Because of the Power PC calling conventions we could be passing
@@ -93,7 +95,7 @@ static void callVirtualMethod(
 
      // Note: could require up to  2*nStackLongs words of parameter stack area 
      // if the call has many float parameters (i.e. floats take up only 1 
-     // word on the stack but take 2 words in parameter area in the 
+     // word on the stack but double takes 2 words in parameter area in the
      // stack frame .
 
      // Update! floats on the outgoing parameter stack only take up 1 word
@@ -119,7 +121,9 @@ static void callVirtualMethod(
 
      // now begin to load the C++ function arguments into storage
      n = 0;
+#ifndef __NO_FPRS__
      f = 0;
+#endif
 
      // now we need to parse the entire signature string */
      // until we get the END indicator */
@@ -143,8 +147,16 @@ static void callVirtualMethod(
        c = *pPT;
        switch (c) {
        case 'D':                   /* type is double */
+#ifndef __NO_FPRS__
             if (f < 8) {
                fpr[f++] = *((double *)pStackLongs);   /* store in register */
+#else
+            if (n & 1)
+               n++;
+            if (n < 8) {
+               gpr[n++] = *pStackLongs;
+               gpr[n++] = *(pStackLongs+1);
+#endif
         } else {
            if (((long) p) & 4)          
               p++;
@@ -163,8 +175,13 @@ static void callVirtualMethod(
             store floats as a *single* word on outgoing parameter stack
             to match what gcc actually does
      */
+#ifndef __NO_FPRS__
             if (f < 8) {
                fpr[f++] = *((float *)pStackLongs);
+#else
+            if (n < 8) {
+               gpr[n++] = *pStackLongs;
+#endif
         } else {
 #if 0 /* if abi were followed */
            if (((long) p) & 4)          
@@ -243,6 +260,7 @@ static void callVirtualMethod(
         "lwz	8,	20(%0)\n\t"
         "lwz	9,	24(%0)\n\t"
         "lwz	10,	28(%0)\n\t"
+#ifndef __NO_FPRS__
         "lfd	1,	0(%1)\n\t"
         "lfd	2,	8(%1)\n\t"
         "lfd	3,	16(%1)\n\t"
@@ -252,16 +270,24 @@ static void callVirtualMethod(
         "lfd	7,	48(%1)\n\t"
         "lfd	8,	56(%1)\n\t"
             : : "r" (gpr), "r" (fpr)
+#else
+            : : "r" (gpr)
+#endif
         : "0", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"
     );
 
     (*ptr)();
 
     __asm__ __volatile__ (
-        "mr	%1,	3\n\t"
-        "mr	%2,	4\n\t"
-        "fmr	%0,	1\n\t"
-        : "=f" (dret), "=r" (iret), "=r" (iret2) : );
+       "mr     %0,     3\n\t"
+       "mr     %1,     4\n\t"
+#ifndef __NO_FPRS__
+       "fmr    %2,     1\n\t"
+       : "=r" (iret), "=r" (iret2), "=f" (dret)
+#else
+       : "=r" (iret), "=r" (iret2)
+#endif
+       : );
 
     switch( eReturnType )
     {
@@ -284,10 +310,21 @@ static void callVirtualMethod(
                 *(unsigned char*)pRegisterReturn = (unsigned char)iret;
             break;
         case typelib_TypeClass_FLOAT:
+#ifndef __NO_FPRS__
                 *(float*)pRegisterReturn = (float)dret;
+#else
+                ((unsigned int*)pRegisterReturn)[0] = iret;
+#endif
             break;
         case typelib_TypeClass_DOUBLE:
+#ifndef __NO_FPRS__
             *(double*)pRegisterReturn = dret;
+#else
+            ((unsigned int*)pRegisterReturn)[0] = iret;
+            ((unsigned int*)pRegisterReturn)[1] = iret2;
+#endif
+            break;
+        default:
             break;
     }
 }
@@ -399,6 +436,8 @@ static void cpp_call(
             case typelib_TypeClass_UNSIGNED_HYPER:
                 *pPT++ = 'H';
                 pCppStack += sizeof(sal_Int32); // extra long
+            default:
+                break;
             }
 
             // no longer needed
@@ -518,7 +557,6 @@ void unoInterfaceProxyDispatch(
     // is my surrogate
         bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
             = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
     
     switch (pMemberDescr->eTypeClass)
     {
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 6bbd37810..64626b5c7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -121,16 +121,14 @@ static typelib_TypeClass cpp2uno_call(
     for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
     {
         const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
 
         int nUsedGPR = 0;
         int nUsedSSE = 0;
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
         bool bFitsRegisters =
 #endif
             x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR, nUsedSSE );
-        if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ) ) // value
+        if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType( rParam.pTypeRef ) ) // value
         {
             // Simple types must fit exactly one register on x86_64
             OSL_ASSERT( bFitsRegisters && ( ( nUsedSSE == 1 && nUsedGPR == 0 ) || ( nUsedSSE == 0 && nUsedGPR == 1 ) ) );
@@ -155,12 +153,12 @@ static typelib_TypeClass cpp2uno_call(
                 else
                     pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw++;
             }
-
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
         }
         else // struct <= 16 bytes || ptr to complex value || ref
         {
+            typelib_TypeDescription * pParamTypeDescr = 0;
+            TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
+
             void *pCppStack;
             if ( nr_gpr < x86_64::MAX_GPR_REGS )
             { 
diff --git a/bridges/source/remote/urp/urp_reader.cxx b/bridges/source/remote/urp/urp_reader.cxx
index 3837f22b9..28489f0e5 100644
--- a/bridges/source/remote/urp/urp_reader.cxx
+++ b/bridges/source/remote/urp/urp_reader.cxx
@@ -372,8 +372,8 @@ inline sal_Bool OReaderThread::readFlags( struct MessageFlags *pFlags )
                 }
                 pFlags->bSynchronous = ( HDRFLAG_SYNCHRONOUS & moreFlags );
                 pFlags->bMustReply = ( HDRFLAG_MUSTREPLY & moreFlags );
-                OSL_ENSURE( pFlags->bSynchronous && pFlags->bMustReply ||
-                            ! pFlags->bSynchronous && !pFlags->bMustReply,
+                OSL_ENSURE( (pFlags->bSynchronous && pFlags->bMustReply) ||
+                            (!pFlags->bSynchronous && !pFlags->bMustReply),
                             "urp-bridge : customized calls currently not supported !");
             }
 
diff --git a/cpputools/source/sp2bv/makefile.mk b/cpputools/source/sp2bv/makefile.mk
index 2b80d6e43..e9ca09bff 100644
--- a/cpputools/source/sp2bv/makefile.mk
+++ b/cpputools/source/sp2bv/makefile.mk
@@ -34,7 +34,7 @@ PRJ=..$/..
 PRJNAME=cpputools
 TARGET=sp2bv
 TARGETTYPE=CUI
-.IF "$(OS)"!="IRIX" && "$(OS)" != "MACOSX"
+.IF "$(OS)" != "MACOSX"
 # hack to get stdc++ linked
 NO_DEFAULT_STL=TRUE
 .ENDIF
diff --git a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
index 30c815bfb..aa9a21a26 100644
--- a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
+++ b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,6 @@ import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 
 /**
  * The java_environment is the environment where objects and
@@ -159,70 +158,64 @@ public final class java_environment implements IEnvironment {
     }
 
     private static final class Registry {
-        public Object register(Object object, String oid, Type type) {
-            synchronized (map) {
-                cleanUp();
-                Level1Entry l1 = getLevel1Entry(oid);
-                if (l1 != null) {
-                    Level2Entry l2 = l1.get(type);
-                    if (l2 != null) {
-                        Object o = l2.get();
-                        if (o != null) {
-                            l2.acquire();
-                            return o;
-                        }
+        public synchronized Object register(
+            Object object, String oid, Type type)
+        {
+            cleanUp();
+            Level1Entry l1 = level1map.get(oid);
+            if (l1 != null) {
+                Level2Entry l2 = l1.level2map.get(type);
+                if (l2 != null) {
+                    Object o = l2.get();
+                    if (o != null) {
+                        l2.acquire();
+                        return o;
                     }
                 }
-                // TODO  If a holder references an unreachable object, but still
-                // has a positive count, it is replaced with a new holder
-                // (referencing a reachable object, and with a count of 1).  Any
-                // later calls to revoke that should decrement the count of the
-                // previous holder would now decrement the count of the new
-                // holder, removing it prematurely.  This is a design flaw that
-                // will be fixed when IEnvironment.revokeInterface is changed to
-                // no longer use counting.  (And this problem is harmless, as
-                // currently a holder either references a strongly held object
-                // and uses register/revoke to control it, or references a
-                // weakly held proxy and never revokes it.)
-                if (l1 == null) {
-                    l1 = new Level1Entry();
-                    map.put(oid, l1);
-                }
-                l1.add(new Level2Entry(oid, type, object, queue));
             }
+            // TODO  If a holder references an unreachable object, but still has
+            // a positive count, it is replaced with a new holder (referencing a
+            // reachable object, and with a count of 1).  Any later calls to
+            // revoke that should decrement the count of the previous holder
+            // would now decrement the count of the new holder, removing it
+            // prematurely.  This is a design flaw that will be fixed when
+            // IEnvironment.revokeInterface is changed to no longer use
+            // counting.  (And this problem is harmless, as currently a holder
+            // either references a strongly held object and uses register/revoke
+            // to control it, or references a weakly held proxy and never
+            // revokes it.)
+            if (l1 == null) {
+                l1 = new Level1Entry();
+                level1map.put(oid, l1);
+            }
+            l1.level2map.put(type, new Level2Entry(oid, type, object, queue));
             return object;
         }
 
-        public boolean revoke(String oid, Type type) {
-            synchronized (map) {
-                Level1Entry l1 = getLevel1Entry(oid);
-                Level2Entry l2 = null;
-                if (l1 != null) {
-                    l2 = l1.get(type);
-                    if (l2 != null && l2.release()) {
-                        removeLevel2Entry(oid, l1, l2);
-                    }
+        public synchronized boolean revoke(String oid, Type type) {
+            Level1Entry l1 = level1map.get(oid);
+            Level2Entry l2 = null;
+            if (l1 != null) {
+                l2 = l1.level2map.get(type);
+                if (l2 != null && l2.release()) {
+                    removeLevel2Entry(l1, oid, type);
                 }
-                cleanUp();
-                return l2 != null;
             }
+            cleanUp();
+            return l2 != null;
         }
 
-        public Object get(String oid, Type type) {
-            synchronized (map) {
-                Level1Entry l1 = getLevel1Entry(oid);
-                return l1 == null ? null : l1.find(type);
-            }
+        public synchronized Object get(String oid, Type type) {
+            Level1Entry l1 = level1map.get(oid);
+            return l1 == null ? null : l1.find(type);
         }
 
-        public void clear() {
-            synchronized (map) {
-                map.clear();
-                cleanUp();
-            }
+        public synchronized void clear() {
+            level1map.clear();
+            cleanUp();
         }
 
-        // must only be called while synchronized on map:
+        // must only be called while synchronized on this Registry:
         private void cleanUp() {
             for (;;) {
                 Level2Entry l2 = (Level2Entry) queue.poll();
@@ -235,55 +228,38 @@ public final class java_environment implements IEnvironment {
                 // created since now e1.get() == null), and only then e1 is
                 // enqueued.  To not erroneously remove the new e2 in that case,
                 // check whether the map still contains e1:
-                String oid = l2.getOid();
-                Level1Entry l1 = getLevel1Entry(oid);
-                if (l1 != null && l1.get(l2.getType()) == l2) {
-                    removeLevel2Entry(oid, l1, l2);
+                Level1Entry l1 = level1map.get(l2.oid);
+                if (l1 != null && l1.level2map.get(l2.type) == l2) {
+                    removeLevel2Entry(l1, l2.oid, l2.type);
                 }
             }
         }
 
-        // must only be called while synchronized on map:
-        private Level1Entry getLevel1Entry(String oid) {
-            return (Level1Entry) map.get(oid);
-        }
-
-        // must only be called while synchronized on map:
-        private void removeLevel2Entry(String oid, Level1Entry l1,
-                                       Level2Entry l2) {
-            if (l1.remove(l2)) {
-                map.remove(oid);
+        // must only be called while synchronized on this Registry:
+        private void removeLevel2Entry(Level1Entry l1, String oid, Type type) {
+            l1.level2map.remove(type);
+            if (l1.level2map.isEmpty()) {
+                level1map.remove(oid);
             }
         }
 
         private static final class Level1Entry {
-            // must only be called while synchronized on map:
-            public Level2Entry get(Type type) {
-                for (Iterator i = list.iterator(); i.hasNext();) {
-                    Level2Entry l2 = (Level2Entry) i.next();
-                    if (l2.getType().equals(type)) {
-                        return l2;
-                    }
-                }
-                return null;
-            }
-
-            // must only be called while synchronized on map:
+            // must only be called while synchronized on enclosing Registry:
             public Object find(Type type) {
                 // First, look for an exactly matching entry; then, look for an
                 // arbitrary entry for a subtype of the request type:
-                for (Iterator i = list.iterator(); i.hasNext();) {
-                    Level2Entry l2 = (Level2Entry) i.next();
-                    if (l2.getType().equals(type)) {
-                        Object o = l2.get();
-                        if (o != null) {
-                            return o;
-                        }
+                Level2Entry l2 = level2map.get(type);
+                if (l2 != null) {
+                    Object o = l2.get();
+                    if (o != null) {
+                        return o;
                     }
                 }
-                for (Iterator i = list.iterator(); i.hasNext();) {
-                    Level2Entry l2 = (Level2Entry) i.next();
-                    if (type.isSupertypeOf(l2.getType())) {
+                for (Iterator<Level2Entry> i = level2map.values().iterator();
+                     i.hasNext();)
+                {
+                    l2 = i.next();
+                    if (type.isSupertypeOf(l2.type)) {
                         Object o = l2.get();
                         if (o != null) {
                             return o;
@@ -293,53 +269,37 @@ public final class java_environment implements IEnvironment {
                 return null;
             }
 
-            // must only be called while synchronized on map:
-            public void add(Level2Entry l2) {
-                list.add(l2);
-            }
-
-            // must only be called while synchronized on map:
-            public boolean remove(Level2Entry l2) {
-                list.remove(l2);
-                return list.isEmpty();
-            }
-
-            private final LinkedList list = new LinkedList(); // of Level2Entry
+            public final HashMap<Type, Level2Entry> level2map =
+                new HashMap<Type, Level2Entry>();
         }
 
-        private static final class Level2Entry extends WeakReference {
-            public Level2Entry(String oid, Type type, Object object,
-                               ReferenceQueue queue) {
+        private static final class Level2Entry extends WeakReference<Object> {
+            public Level2Entry(
+                String oid, Type type, Object object, ReferenceQueue queue)
+            {
                 super(object, queue);
                 this.oid = oid;
                 this.type = type;
             }
 
-            public String getOid() {
-                return oid;
-            }
-
-            public Type getType() {
-                return type;
-            }
-
-            // must only be called while synchronized on map:
+            // must only be called while synchronized on enclosing Registry:
             public void acquire() {
                 ++count;
             }
 
-            // must only be called while synchronized on map:
+            // must only be called while synchronized on enclosing Registry:
             public boolean release() {
                 return --count == 0;
             }
 
-            private final String oid;
-            private final Type type;
+            public final String oid;
+            public final Type type;
+
             private int count = 1;
         }
 
-        private final HashMap map = new HashMap();
-            // from OID (String) to Level1Entry
+        private final HashMap<String, Level1Entry> level1map =
+            new HashMap<String, Level1Entry>();
         private final ReferenceQueue queue = new ReferenceQueue();
     }
 
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
index 29aa95854..55fb0e2d3 100755
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
@@ -34,9 +34,7 @@ PRJ=..$/..$/..
 PRJNAME=javaldx
 TARGET=javaldx
 TARGETTYPE=CUI
-.IF "$(OS)"!="IRIX"
 NO_DEFAULT_STL=TRUE
-.ENDIF
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=true
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index ae0b76b4a..ee4244502 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -54,13 +54,6 @@ public:
 } test;
 #endif    
 
-SunVersion::SunVersion():  m_nUpdateSpecial(0),
-                           m_preRelease(Rel_NONE),
-                           m_bValid(false)
-{
-    memset(m_arVersionParts, 0, sizeof(m_arVersionParts));
-}
-
 SunVersion::SunVersion(const rtl::OUString &usVer): 
     m_nUpdateSpecial(0), m_preRelease(Rel_NONE),
     usVersion(usVer)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index 59082faab..df5eb6e67 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -92,7 +92,6 @@ protected:
 
     PreRelease m_preRelease;
 public:
-    SunVersion();
     SunVersion(const char * szVer);
     SunVersion(const rtl::OUString& usVer);
     ~SunVersion();
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 1c846a410..98bae756a 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -300,13 +300,14 @@ class AsynchReader: public Thread
 public:
 
     AsynchReader(oslFileHandle & rHandle);
-
+#if OSL_DEBUG_LEVEL >= 2
     /** only call this function after this thread has finished.
 
         That is, call join on this instance and then call getData.
         
      */
     OString getData();
+#endif
 };
 
 AsynchReader::AsynchReader(oslFileHandle & rHandle):
@@ -314,11 +315,13 @@ AsynchReader::AsynchReader(oslFileHandle & rHandle):
 {
 }
 
+#if OSL_DEBUG_LEVEL >= 2
 OString AsynchReader::getData()
 {
     OSL_ASSERT(isRunning() == sal_False );
     return OString(m_arData.get(), m_nDataSize);
 }
+#endif
 
 void AsynchReader::run()
 {
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 44a085bc9..b177deb48 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -118,20 +118,6 @@ extern "C" {
 #	include <machine/param.h>
 #endif
 
-#ifdef IRIX
-#   include <sys/endian.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#	undef _BIG_ENDIAN
-#	undef _PDP_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#	undef _LITTLE_ENDIAN
-#	undef _PDP_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#	undef _LITTLE_ENDIAN
-#	undef _BIG_ENDIAN
-#   endif
-#endif
-
 #ifdef _WIN16
 #	define	_LITTLE_ENDIAN
 #endif
@@ -166,8 +152,7 @@ extern "C" {
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)   && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(SCO)   && \
     !defined(AIX)     && !defined(HPUX)   && \
-    !defined(SOLARIS) && !defined(IRIX)   && \
-    !defined(MACOSX) && !defined(FREEBSD)
+    !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD)
 #	error "Target platform not specified !"
 #endif
 
diff --git a/sal/inc/osl/thread.hxx b/sal/inc/osl/thread.hxx
index 1fb3bef6b..0f51a1252 100644
--- a/sal/inc/osl/thread.hxx
+++ b/sal/inc/osl/thread.hxx
@@ -117,7 +117,7 @@ public:
         osl_joinWithThread(m_hThread);
     }
 
-    sal_Bool SAL_CALL isRunning() 
+    sal_Bool SAL_CALL isRunning() const
     {
         return osl_isThreadRunning(m_hThread);
     }
@@ -128,7 +128,7 @@ public:
             osl_setThreadPriority(m_hThread, Priority);
     }
 
-    oslThreadPriority SAL_CALL getPriority()
+    oslThreadPriority SAL_CALL getPriority() const
     {
         return m_hThread ? osl_getThreadPriority(m_hThread) : osl_Thread_PriorityUnknown;
     }
diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx
index 2c180170d..e6481bfe0 100644
--- a/sal/inc/rtl/math.hxx
+++ b/sal/inc/rtl/math.hxx
@@ -357,17 +357,28 @@ inline bool isSignBitSet(double d)
  */
 inline void setInf(double * pd, bool bNegative)
 {
-    reinterpret_cast< sal_math_Double * >(pd)->w32_parts.msw
-        = bNegative ? 0xFFF00000 : 0x7FF00000;
-    reinterpret_cast< sal_math_Double * >(pd)->w32_parts.lsw = 0;
+    union
+    {
+        double sd;
+        sal_math_Double md;
+    };
+    md.w32_parts.msw = bNegative ? 0xFFF00000 : 0x7FF00000;
+    md.w32_parts.lsw = 0;
+    *pd = sd;
 }
 
 /** Set a QNAN.
  */
 inline void setNan(double * pd)
 {
-    reinterpret_cast< sal_math_Double * >(pd)->w32_parts.msw = 0x7FFFFFFF;
-    reinterpret_cast< sal_math_Double * >(pd)->w32_parts.lsw = 0xFFFFFFFF;
+    union
+    {
+        double sd;
+        sal_math_Double md;
+    };
+    md.w32_parts.msw = 0x7FFFFFFF;
+    md.w32_parts.lsw = 0xFFFFFFFF;
+    *pd = sd;
 }
 
 /** If a value is a valid argument for sin(), cos(), tan().
diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h
index ea514ff75..81103dcd6 100644
--- a/sal/inc/rtl/uuid.h
+++ b/sal/inc/rtl/uuid.h
@@ -201,8 +201,6 @@ void SAL_CALL rtl_createNamedUuid(
 #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
 #elif MACOSX
 #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000
-#elif IRIX
-#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10
 #else
 #error "System time resolution must be calculated!"
 #endif
diff --git a/sal/inc/sal/alloca.h b/sal/inc/sal/alloca.h
index 2eb04de8f..bfbddf424 100644
--- a/sal/inc/sal/alloca.h
+++ b/sal/inc/sal/alloca.h
@@ -31,7 +31,7 @@
 #ifndef INCLUDED_SAL_ALLOCA_H
 #define INCLUDED_SAL_ALLOCA_H
 
-#if defined (SOLARIS) || defined (LINUX) || defined (IRIX) || defined(__EMX__)
+#if defined (SOLARIS) || defined (LINUX) || defined(__EMX__)
 
 #ifndef INCLUDED_ALLOCA_H
 #include <alloca.h>
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 5cacfc8e2..702f87b2a 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -102,7 +102,7 @@ extern "C" {
 #define SAL_SYSCONFIGFILE( name ) name ".ini"
 #endif
 
-#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) || defined(IRIX)
+#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO)
 #define SAL_UNX
 #define SAL_DLLEXTENSION ".so"
 #define SAL_DLLPREFIX "lib"
diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx
index b967cf197..4b370c329 100644
--- a/sal/osl/os2/file.cxx
+++ b/sal/osl/os2/file.cxx
@@ -2343,7 +2343,7 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
 #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
 #endif /* LINUX */
 
-#if defined(SOLARIS) || defined(IRIX)
+#if defined(SOLARIS)
 #   define __OSL_STATFS_STRUCT          		 struct statvfs
 #   define __OSL_STATFS(dir, sfs)	    		 statvfs((dir), (sfs))
 #   define __OSL_STATFS_BLKSIZ(a)       		 ((sal_uInt64)((a).f_frsize))
@@ -2355,7 +2355,7 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
    of the target platforms fix it!!!! */
 #	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
 #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* SOLARIS || IRIX*/
+#endif /* SOLARIS */
 
 #   define __OSL_STATFS_INIT(a) 	    (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
 
diff --git a/sal/osl/os2/nlsupport.c b/sal/osl/os2/nlsupport.c
index 7fb63981d..eacf5d486 100644
--- a/sal/osl/os2/nlsupport.c
+++ b/sal/osl/os2/nlsupport.c
@@ -411,9 +411,6 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 
 int _imp_setProcessLocale( rtl_Locale * pLocale )
 {
-#ifdef IRIX
-    char env_buf[80];
-#endif
     char locale_buf[64];
     
     /* convert rtl_Locale to locale string */
@@ -421,11 +418,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
     {
         /* only change env vars that exist already */
         if( getenv( "LC_ALL" ) ) {
-#if defined( IRIX )
-            snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
-            env_buf[sizeof(env_buf)] = '\0';
-            putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
+#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
             setenv( "LC_ALL", locale_buf, 1);
 #else
             setenv( "LC_ALL", locale_buf );
@@ -433,11 +426,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
         }
 
         if( getenv( "LC_CTYPE" ) ) {
-#if defined( IRIX )
-            snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
-            env_buf[sizeof(env_buf)] = '\0';
-            putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
+#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
             setenv("LC_CTYPE", locale_buf, 1 );
 #else
             setenv( "LC_CTYPE", locale_buf );
@@ -445,11 +434,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
         }
 
         if( getenv( "LANG" ) ) {
-#if defined( IRIX )
-            snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
-            env_buf[sizeof(env_buf)] = '\0';
-            putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
+#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || defined( __EMX__ )
             setenv("LC_CTYPE", locale_buf, 1 );
 #else
             setenv( "LANG", locale_buf );
diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c
index 0497b7447..770fa0226 100644
--- a/sal/osl/os2/socket.c
+++ b/sal/osl/os2/socket.c
@@ -48,7 +48,7 @@
 #undef HAVE_POLL_H
 #endif
 
-#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) || defined (MACOSX)
+#if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || defined (MACOSX)
 #include <sys/poll.h>
 #define HAVE_POLL_H
 #endif /* HAVE_POLL_H */
diff --git a/sal/osl/os2/system.h b/sal/osl/os2/system.h
index e693bf830..acbc0d5ef 100644
--- a/sal/osl/os2/system.h
+++ b/sal/osl/os2/system.h
@@ -306,36 +306,6 @@ extern unsigned int nanosleep(unsigned int);
 #	define  PTHREAD_SIGACTION 			cma_sigaction
 #endif
 
-#ifdef IRIX
-#   define  AF_IPX -1
-#	include <pthread.h>
-#	include <semaphore.h>
-#	include <sched.h>
-#	include <sys/socket.h>
-#	include <sys/un.h>
-#	include <sys/stropts.h>
-#	include <netinet/tcp.h>
-#	include <procfs/procfs.h>
-#   include <sys/endian.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#	undef _BIG_ENDIAN
-#	undef _PDP_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#	undef _LITTLE_ENDIAN
-#	undef _PDP_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#	undef _LITTLE_ENDIAN
-#	undef _BIG_ENDIAN
-#   endif
-#	define  SA_FAMILY_DECL \
-        union { struct { short sa_family2; } sa_generic; } sa_union
-#	define  PTR_SIZE_T(s)				((int *)&(s))
-#	define  NO_PTHREAD_PRIORITY
-#	include <dlfcn.h>
-#	define 	IOCHANNEL_TRANSFER_BSD
-extern char *strdup(const char *);
-#endif
-
 #ifdef SOLARIS
 #	include <shadow.h>
 #	include <sys/procfs.h>
@@ -389,7 +359,7 @@ char *macxp_tempnam( const char *tmpdir, const char *prefix );
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
     !defined(AIX)     && !defined(HPUX)   && \
-    !defined(SOLARIS) && !defined(IRIX)   && !defined(MAC) && \
+    !defined(SOLARIS) && !defined(MAC) && \
     !defined(MACOSX)
 #	error "Target plattform not specified !"
 #endif
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index def6d3192..07c54f5f4 100755
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -207,54 +207,6 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 }
 #endif /* defined FREEBSD */
 
-#if defined(IRIX)
-#include <stdio.h>
-#include <rld_interface.h>
-#include <exception.h>
-#include <sys/signal.h>
-#include <unistd.h>
- 
-/* Need extra libs -lexc -ldwarf -lelf */
-
-int backtrace( void **buffer, int max_frames )
-{
-    struct sigcontext context;
-    int i = 0;
-
-    memset(&context, 0, sizeof(struct sigcontext));
-
-    exc_setjmp(&context);
-    while(context.sc_pc != 1 && i < max_frames) { 
-        exc_unwind(&context, 0); 
-        if(context.sc_pc != 1) {
-            *(buffer++) = (void *)context.sc_pc;
-            i++;
-        }
-    }       
-    return(i);
-}
-
-void backtrace_symbols_fd( void **buffer, int size, int fd )
-{
-    FILE	*fp = fdopen( fd, "w" );
-    struct sigcontext context;
-    char *name;
-
-    if ( fp ) {
-        while(context.sc_pc!=1) {
-            if(context.sc_pc != 1) {
-                exc_unwind_name(&context, 0, &name); 
-                fprintf(fp, " 0x%012lx %.100s\n", context.sc_pc, name ? name : "<unknown function>");
-                free(name);
-            }
-        }
-
-        fflush( fp );
-        fclose( fp );
-    }
-}
-#endif /* defined IRIX */
-
 #ifdef LINUX
 
 #ifndef _GNU_SOURCE
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 66a0cef5e..47cc37bdd 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -76,16 +76,6 @@ static const sal_Char* MOUNTTAB="/etc/mtab";
  * This information is stored only in the kernel. */
 /* static const sal_Char* MOUNTTAB="/etc/mtab"; */
 
-#elif defined(IRIX)
-
-#include <mntent.h>
-#include <sys/mount.h>
-#include <sys/statvfs.h>
-#define  HAVE_STATFS_H
-#include <sys/quota.h>
-//#include <ctype.h>
-static const sal_Char* MOUNTTAB="/etc/mtab";
-
 #elif defined(MACOSX)
 
 #include <ufs/ufs/quota.h>
@@ -140,12 +130,6 @@ static sal_Bool       osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice);
 static sal_Bool       osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem);
 #endif /* LINUX */
 
-
-#if defined(IRIX)
-static sal_Bool       osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice);
-static sal_Bool       osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem);
-#endif /* IRIX */
-
 #ifdef DEBUG_OSL_FILE
 static void           osl_printFloppyHandle(oslVolumeDeviceHandleImpl* hFloppy);
 #endif /* DEBUG_OSL_FILE */
@@ -220,7 +204,7 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI
 #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
 #endif /* LINUX */
 
-#if defined(SOLARIS) || defined(IRIX)
+#if defined(SOLARIS)
 #   define __OSL_STATFS_STRUCT          		 struct statvfs
 #   define __OSL_STATFS(dir, sfs)	    		 statvfs((dir), (sfs))
 #   define __OSL_STATFS_BLKSIZ(a)       		 ((sal_uInt64)((a).f_frsize))
@@ -232,7 +216,7 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI
    of the target platforms fix it!!!! */
 #	define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a)	 (1)
 #	define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* SOLARIS || IRIX*/
+#endif /* SOLARIS */
 
 #   define __OSL_STATFS_INIT(a) 	    (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))
 
@@ -1093,411 +1077,6 @@ osl_isFloppyMounted (oslVolumeDeviceHandleImpl* pDevice)
 }
 #endif /* LINUX */
 
-/******************************************************************************
- *
- *                  IRIX FLOPPY FUNCTIONS
- *
- *****************************************************************************/
-
-#if defined(IRIX)
-static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath)
-{
-    oslVolumeDeviceHandleImpl* pItem = osl_newVolumeDeviceHandleImpl ();    
-    sal_Bool bRet = sal_False;
-    
-#ifdef TRACE_OSL_FILE   
-    fprintf(stderr,"In  osl_isFloppyDrive\n");
-#endif
-
-    bRet=osl_getFloppyMountEntry(pszPath,pItem);
-
-    if ( bRet == sal_False )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_isFloppyDrive [not a floppy]\n");
-#endif
-        rtl_freeMemory(pItem);
-        return 0;
-    }
-
-    
-#ifdef DEBUG_OSL_FILE
-    osl_printFloppyHandle(pItem);
-#endif
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_isFloppyDrive [ok]\n");
-#endif
-    
-    return (oslVolumeDeviceHandle) pItem;
-}
-
-
-static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy)
-{       
-    sal_Bool bRet = sal_False;
-    oslVolumeDeviceHandleImpl* pItem=0;
-    int nRet;
-    sal_Char  pszCmd[PATH_MAX];
-    sal_Char* pszMountProg = "mount";
-    sal_Char* pszSuDo = 0;
-    sal_Char* pszTmp = 0;
-
-    pszCmd[0] = '\0';
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_mountFloppy\n");
-#endif
-
-    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
-    
-    if ( pItem == 0 )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_mountFloppy [pItem == 0]\n");
-#endif
-        
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_mountFloppy [invalid handle]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-    
-    bRet = osl_isFloppyMounted(pItem);
-    if ( bRet == sal_True )
-    {
-#ifdef DEBUG_OSL_FILE
-        fprintf(stderr,"detected mounted floppy at '%s'\n",pItem->pszMountPoint);
-#endif
-        return osl_File_E_BUSY;
-    }
-
-    /* mfe: we can't use the mount(2) system call!!!   */
-    /*      even if we are root                        */
-    /*      since mtab is not updated!!!               */
-    /*      but we need it to be updated               */
-    /*      some "magic" must be done                  */
-
-/*      nRet = mount(pItem->pszDevice,pItem->pszMountPoint,0,0,0); */
-/*      if ( nRet != 0 ) */
-/*      { */
-/*          nRet=errno; */
-/*  #ifdef DEBUG_OSL_FILE */
-/*          perror("mount"); */
-/*  #endif */
-/*      } */
-
-    pszTmp = getenv("SAL_MOUNT_MOUNTPROG");
-    if ( pszTmp != 0 )
-    {
-        pszMountProg=pszTmp;
-    }
-
-    pszTmp=getenv("SAL_MOUNT_SU_DO");
-    if ( pszTmp != 0 )
-    {
-        pszSuDo=pszTmp;
-    }
-    
-    if ( pszSuDo != 0 )
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s %s",pszSuDo,pszMountProg,pItem->pszDevice,pItem->pszMountPoint);
-    }
-    else
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszMountProg,pItem->pszMountPoint);        
-    }
-    
-    
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"executing '%s'\n",pszCmd);
-#endif
-    
-    nRet = system(pszCmd);    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"call returned '%i'\n",nRet);
-    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
-#endif
-    
-    
-    switch ( WEXITSTATUS(nRet) )
-    {
-    case 0:
-        nRet=0;
-        break;
-        
-    case 2:
-        nRet=EPERM;
-        break;
-
-    case 4:
-        nRet=ENOENT;
-        break;
-
-    case 8:
-        nRet=EINTR;
-        break;
-
-    case 16:
-        nRet=EPERM;
-        break;
-
-    case 32:
-        nRet=EBUSY;
-        break;
-
-    case 64:
-        nRet=EAGAIN;
-        break;
-
-    default:
-        nRet=EBUSY;
-        break;
-    }
-    
-    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
-}
-
-static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy)
-{
-    oslVolumeDeviceHandleImpl* pItem=0;
-    int nRet=0;
-    sal_Char pszCmd[PATH_MAX];
-    sal_Char* pszTmp = 0;
-    sal_Char* pszSuDo = 0;
-    sal_Char* pszUmountProg = "umount";
-
-    pszCmd[0] = '\0';
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_unmountFloppy\n");
-#endif    
-
-    pItem = (oslVolumeDeviceHandleImpl*) hFloppy;
-    
-    if ( pItem == 0 )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_unmountFloppy [pItem==0]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-
-    if ( pItem->ident[0] != 'O' || pItem->ident[1] != 'V' || pItem->ident[2] != 'D' || pItem->ident[3] != 'H' )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_unmountFloppy [invalid handle]\n");
-#endif
-        return osl_File_E_INVAL;
-    }
-
-    /* mfe: we can't use the umount(2) system call!!!  */
-    /*      even if we are root                        */
-    /*      since mtab is not updated!!!               */
-    /*      but we need it to be updated               */
-    /*      some "magic" must be done                  */
-
-/*      nRet=umount(pItem->pszDevice); */
-/*      if ( nRet != 0 ) */
-/*      { */
-/*          nRet = errno; */
-        
-/*  #ifdef DEBUG_OSL_FILE */
-/*          perror("mount"); */
-/*  #endif */
-/*      } */
-    
-    
-    pszTmp = getenv("SAL_MOUNT_UMOUNTPROG");
-    if ( pszTmp != 0 )
-    {
-        pszUmountProg=pszTmp;
-    }
-
-    pszTmp = getenv("SAL_MOUNT_SU_DO");
-    if ( pszTmp != 0 )
-    {
-        pszSuDo=pszTmp;
-    }
-
-    if ( pszSuDo != 0 )
-    {    
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s %s",pszSuDo,pszUmountProg,pItem->pszMountPoint);        
-    }
-    else
-    {
-        snprintf(pszCmd, sizeof(pszCmd), "%s %s",pszUmountProg,pItem->pszMountPoint);
-    }
-    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"executing '%s'\n",pszCmd);
-#endif
-    
-    nRet = system(pszCmd);    
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"call returned '%i'\n",nRet);
-    fprintf(stderr,"exit status is '%i'\n", WEXITSTATUS(nRet));
-#endif
-    
-    switch ( WEXITSTATUS(nRet) )
-    {
-    case 0:
-        nRet=0;
-        break;
-
-    default:
-        nRet=EBUSY;
-        break;
-    }
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_unmountFloppy [ok]\n");
-#endif    
-
-    return ((0 == nRet) ? oslTranslateFileError(OSL_FET_SUCCESS, nRet) : oslTranslateFileError(OSL_FET_ERROR, nRet));
-    
-/*    return osl_File_E_None;*/
-}
-
-static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem)
-{
-    struct mntent* pMountEnt=0;
-    sal_Char buffer[PATH_MAX];
-    FILE* mntfile=0;
-    int nRet=0;
-
-    buffer[0] = '\0';
-    
-    mntfile = setmntent(MOUNTTAB,"r");
-
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_getFloppyMountEntry\n");
-#endif
-
-    memset(buffer, 0, sizeof(buffer));
-    strncpy(buffer, pszPath, sizeof(buffer) - 1);
-    
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Checking mount of %s\n",buffer);
-#endif
-
-    
-    if ( mntfile == 0 )
-    {
-        nRet=errno;
-#ifdef DEBUG_OSL_FILE
-        perror("mounttab");
-#endif
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_getFloppyMountEntry [mntfile]\n");
-#endif
-        return sal_False;
-    }
-
-    pMountEnt=getmntent(mntfile);
-    while ( pMountEnt != 0 )
-    {
-#ifdef DEBUG_OSL_FILE
-/*           fprintf(stderr,"mnt_fsname : %s\n",pMountEnt->mnt_fsname); */
-/*           fprintf(stderr,"mnt_dir    : %s\n",pMountEnt->mnt_dir); */
-/*        fprintf(stderr,"mnt_type   : %s\n",pMountEnt->mnt_type);*/
-#endif
-        if ( strcmp(pMountEnt->mnt_dir,buffer) == 0 &&
-             strncmp(pMountEnt->mnt_fsname,"/dev/fd",strlen("/dev/fd")) == 0 )
-        {
-            
-            memset(pItem->pszMountPoint, 0, sizeof(pItem->pszMountPoint));			
-            strncpy(pItem->pszMountPoint, pMountEnt->mnt_dir, sizeof(pItem->pszMountPoint) - 1);
-            
-            memset(pItem->pszFilePath, 0, sizeof(pItem->pszFilePath));
-            strncpy(pItem->pszFilePath, pMountEnt->mnt_dir, sizeof(pItem->pszFilePath) - 1);
-            
-            memset(pItem->pszDevice, 0, sizeof(pItem->pszDevice));
-            strncpy(pItem->pszDevice, pMountEnt->mnt_fsname, sizeof(pItem->pszDevice) - 1);
-                                    
-            fclose(mntfile);
-#ifdef DEBUG_OSL_FILE
-            fprintf(stderr,"Mount Point found '%s'\n",pItem->pszMountPoint);
-#endif
-#ifdef TRACE_OSL_FILE
-            fprintf(stderr,"Out osl_getFloppyMountEntry [found]\n");
-#endif
-            return sal_True;
-        }
-#ifdef DEBUG_OSL_FILE
-/*        fprintf(stderr,"=================\n");*/
-#endif
-        pMountEnt=getmntent(mntfile);
-    }    
-
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_getFloppyMountEntry [not found]\n");
-#endif
-
-    fclose(mntfile);
-    return sal_False;
-}
-
-static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice)
-{
-    sal_Char buffer[PATH_MAX];
-    oslVolumeDeviceHandleImpl* pItem=0;    
-    sal_Bool bRet=0;
-
-    buffer[0] = '\0';
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"In  osl_isFloppyMounted\n");
-#endif
-
-    pItem = osl_newVolumeDeviceHandleImpl ();
-    if ( pItem == 0 )
-        return osl_File_E_NOMEM;
-    
-    memset(buffer, 0, sizeof(buffer));	
-    strncpy(buffer, pDevice->pszMountPoint, sizeof(buffer) - 1);
-
-#ifdef DEBUG_OSL_FILE
-    fprintf(stderr,"Checking mount of %s\n",buffer);
-#endif
-
-    bRet = osl_getFloppyMountEntry(buffer,pItem);
-
-    if ( bRet == sal_False )
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_isFloppyMounted [not mounted]\n");
-#endif
-        return sal_False;
-    }
-
-    if (strcmp(pItem->pszMountPoint, pDevice->pszMountPoint) == 0 &&
-        strcmp(pItem->pszDevice,pDevice->pszDevice) == 0)
-    {
-#ifdef TRACE_OSL_FILE
-        fprintf(stderr,"Out osl_isFloppyMounted [is mounted]\n");
-#endif
-        rtl_freeMemory(pItem);
-        return sal_True;
-    }
-    
-#ifdef TRACE_OSL_FILE
-    fprintf(stderr,"Out osl_isFloppyMounted [may be EBUSY]\n");
-#endif
-
-    rtl_freeMemory(pItem);
-    return sal_False;    
-}
-#endif /* IRIX */
-
-
 /* NetBSD floppy functions have to be added here. Until we have done that, 
  * we use the MACOSX definitions for nonexistent floppy.
  * */
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index 4ae21e196..72fda2611 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -35,32 +35,6 @@
 #include <osl/process.h>
 #include <osl/file.h>
 
-#ifdef IRIX
-#ifndef _RLD_INTERFACE_DLFCN_H_DLADDR
-#define _RLD_INTERFACE_DLFCN_H_DLADDR
-typedef struct DL_INFO {
-       const char * dli_fname;
-       void       * dli_fbase;
-       const char * dli_sname;
-       void       * dli_saddr;
-       int          dli_version;
-       int          dli_reserved1;
-       long         dli_reserved[4];
-} Dl_info;
-#endif
-#include <rld_interface.h>
-#define _RLD_DLADDR             14
-int dladdr(void *address, Dl_info *dl);
-
-int dladdr(void *address, Dl_info *dl)
-{
-       void *v;
-       v = _rld_new_interface(_RLD_DLADDR,address,dl);
-
-       return (int)v;
-}
-#endif
-
 #include "system.h"
 
 #if OSL_DEBUG_LEVEL > 1
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index 92b52e042..ca3a54d08 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -33,7 +33,7 @@
 #include <osl/process.h>
 #include <rtl/memory.h>
 
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(MACOSX)
 #include <pthread.h>
 #ifndef MACOSX
  #include <locale.h>
@@ -42,7 +42,7 @@
 #include <osl/module.h>
 #include <osl/thread.h>
 #endif	/* !MACOSX */
-#endif	/* LINUX || SOLARIS || IRIX || NETBSD || MACOSX */
+#endif	/* LINUX || SOLARIS || NETBSD || MACOSX */
 
 #include <string.h>
 
@@ -229,13 +229,12 @@ static rtl_Locale * _parse_locale( const char * locale )
     return NULL;
 }
         
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD)
 
 /*
  * This implementation of osl_getTextEncodingFromLocale maps
  * from nl_langinfo(CODESET) to rtl_textencoding defines.
- * nl_langinfo() is supported only on Linux and Solaris.
- * nl_langinfo() is supported only on Linux, Solaris and IRIX,
+ * nl_langinfo() is supported only on Linux, Solaris,
  * >= NetBSD 1.6 and >= FreeBSD 4.4
  *
  * This routine is SLOW because of the setlocale call, so
@@ -299,24 +298,6 @@ const _pair _nl_language_list[] = {
 
 /* XXX MS-874 is an extension to tis620, so this is not
  * really equivalent */
-#elif defined(IRIX)
-
-const _pair _nl_language_list[] = {
-   { "big5",		RTL_TEXTENCODING_BIG5		}, /* China - Traditional Chinese */
-   { "eucCN",		RTL_TEXTENCODING_EUC_CN		}, /* China */
-   { "eucgbk",		RTL_TEXTENCODING_DONTKNOW	}, /* China - Simplified Chinese */
-   { "eucJP",		RTL_TEXTENCODING_EUC_JP 	}, /* Japan */
-   { "eucKR",		RTL_TEXTENCODING_EUC_KR		}, /* Korea */
-   { "eucTW",		RTL_TEXTENCODING_EUC_TW		}, /* Taiwan - Traditional Chinese */
-   { "gbk",		RTL_TEXTENCODING_GBK		}, /* China - Simplified Chinese */
-   { "ISO8859-1",  	RTL_TEXTENCODING_ISO_8859_1	}, /* Western */
-   { "ISO8859-2",  	RTL_TEXTENCODING_ISO_8859_2     }, /* Central European */
-   { "ISO8859-5",  	RTL_TEXTENCODING_ISO_8859_5     }, /* Cyrillic */
-   { "ISO8859-7",  	RTL_TEXTENCODING_ISO_8859_7    	}, /* Greek */
-   { "ISO8859-9",  	RTL_TEXTENCODING_ISO_8859_9     }, /* Turkish */
-   { "ISO8859-15", 	RTL_TEXTENCODING_ISO_8859_15    }, /* Western Updated (w/Euro sign) */
-   { "sjis",		RTL_TEXTENCODING_SHIFT_JIS	} /* Japan */
-};
 
 #elif defined(LINUX) || defined(NETBSD)
 
@@ -552,7 +533,7 @@ const _pair _nl_language_list[] = {
     { "UTF-8",         RTL_TEXTENCODING_UTF8           }  /* ISO-10646/UTF-8 */
 };
 
-#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
+#endif /* ifdef SOLARIS LINUX FREEBSD NETBSD */
 
 static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -927,9 +908,6 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
 
 int _imp_setProcessLocale( rtl_Locale * pLocale )
 {
-#ifdef IRIX
-    char env_buf[80];
-#endif
     char locale_buf[64];
     
     /* convert rtl_Locale to locale string */
@@ -937,11 +915,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
     {
         /* only change env vars that exist already */
         if( getenv( "LC_ALL" ) ) {
-#if defined( IRIX )
-            snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
-            env_buf[sizeof(env_buf)] = '\0';
-            putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
+#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
             setenv( "LC_ALL", locale_buf, 1);
 #else
             setenv( "LC_ALL", locale_buf );
@@ -949,11 +923,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
         }
 
         if( getenv( "LC_CTYPE" ) ) {
-#if defined( IRIX )
-            snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
-            env_buf[sizeof(env_buf)] = '\0';
-            putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
+#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
             setenv("LC_CTYPE", locale_buf, 1 );
 #else
             setenv( "LC_CTYPE", locale_buf );
@@ -961,11 +931,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale )
         }
 
         if( getenv( "LANG" ) ) {
-#if defined( IRIX )
-            snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
-            env_buf[sizeof(env_buf)] = '\0';
-            putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
+#if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX )
             setenv("LC_CTYPE", locale_buf, 1 );
 #else
             setenv( "LANG", locale_buf );
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 946103af6..08fa4eb7a 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -49,7 +49,7 @@
 #endif
 
 #include "system.h"
-#if defined(SOLARIS) || defined(IRIX)
+#if defined(SOLARIS)
 # include <sys/procfs.h>
 #endif
 #include <osl/diagnose.h>
@@ -269,7 +269,7 @@ static sal_Bool sendFdPipe(int PipeFD, int SocketFD)
     cmptr->cmsg_level = SOL_SOCKET;
     cmptr->cmsg_type = SCM_RIGHTS;
     cmptr->cmsg_len = CONTROLLEN;
-    *(int*)CMSG_DATA(cmptr) = SocketFD;
+    memcpy(CMSG_DATA(cmptr), &SocketFD, sizeof(int));
 
 #endif
     
@@ -360,7 +360,7 @@ static oslSocket receiveFdPipe(int PipeFD)
          ( msghdr.msg_controllen == CONTROLLEN ) )
     {
         OSL_TRACE("receiveFdPipe : received '%i' bytes\n",nRead);
-        newfd = *(int*)CMSG_DATA(cmptr);        
+        memcpy(&newfd, CMSG_DATA(cmptr), sizeof(int));
     }
 #endif
     else
@@ -431,10 +431,8 @@ oslSocket osl_receiveResourcePipe(oslPipe pPipe)
 
 static void ChildStatusProc(void *pData)
 {
-    int   i;
-/*	int   first = 0;*/
-    pid_t pid;
-/*	int   status;*/
+    pid_t pid = -1;
+    int   status = 0;
     int   channel[2];
     ProcessData  data;
     ProcessData *pdata;
@@ -447,25 +445,31 @@ static void ChildStatusProc(void *pData)
        in our child process */
     memcpy(&data, pData, sizeof(data));
 
-    socketpair(AF_UNIX, SOCK_STREAM, 0, channel);
+    if (socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == -1)
+        status = errno;
 
     fcntl(channel[0], F_SETFD, FD_CLOEXEC);
     fcntl(channel[1], F_SETFD, FD_CLOEXEC);
 
     /* Create redirected IO pipes */
+    if ( status == 0 && data.m_pInputWrite )
+        if (pipe( stdInput ) == -1)
+            status = errno;
 
-    if ( data.m_pInputWrite )
-        pipe( stdInput );
-
-    if ( data.m_pOutputRead )
-        pipe( stdOutput );
+    if ( status == 0 && data.m_pOutputRead )
+        if (pipe( stdOutput ) == -1)
+            status = errno;
 
-    if ( data.m_pErrorRead )
-        pipe( stdError );
+    if ( status == 0 && data.m_pErrorRead )
+        if (pipe( stdError ) == -1)
+            status = errno;
 
-    if ((pid = fork()) == 0)
+    if ( (status == 0) && ((pid = fork()) == 0) )
     {
         /* Child */
+        int chstatus = 0;
+        sal_Int32 nWrote;
+
         if (channel[0] != -1) close(channel[0]);
 
         if ((data.m_uid != (uid_t)-1) && ((data.m_uid != getuid()) || (data.m_gid != getgid())))
@@ -481,20 +485,15 @@ static void ChildStatusProc(void *pData)
 #endif
         }
 
-           if ((data.m_uid == (uid_t)-1) || ((data.m_uid == getuid()) && (data.m_gid == getgid())))
+          if (data.m_pszDir)
+              chstatus = chdir(data.m_pszDir);
 
+           if (chstatus == 0 && ((data.m_uid == (uid_t)-1) || ((data.m_uid == getuid()) && (data.m_gid == getgid()))))
         {
-              if (data.m_pszDir)
-                  chdir(data.m_pszDir);
-
+            int i;
             for (i = 0; data.m_pszEnv[i] != NULL; i++)
                  putenv(data.m_pszEnv[i]);
 
-#if defined(LINUX) && !defined(NPTL)
-            /* mfe: linux likes to have just one thread when the exec family is called */
-            /*      this np function has this purpose ...                              */
-            pthread_kill_other_threads_np();
-#endif
             OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
      
             /* Connect std IO to pipe ends */
@@ -537,7 +536,9 @@ static void ChildStatusProc(void *pData)
         OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
         
         /* if we reach here, something went wrong */
-        write(channel[1], &errno, sizeof(errno));
+        nWrote = write(channel[1], &errno, sizeof(errno));
+        if (nWrote != sizeof(errno))
+            OSL_TRACE("sendFdPipe : sending failed (%s)",strerror(errno));
 
         if (channel[1] != -1) close(channel[1]);
 
@@ -545,8 +546,7 @@ static void ChildStatusProc(void *pData)
     }
     else
     {   /* Parent  */
-        int   status;
-
+        int i = -1;
         if (channel[1] != -1) close(channel[1]);
 
         /* Close unused pipe ends */
@@ -554,15 +554,17 @@ static void ChildStatusProc(void *pData)
         if (stdOutput[1] != -1) close( stdOutput[1] );
         if (stdError[1] != -1) close( stdError[1] );
 
-        while (((i = read(channel[0], &status, sizeof(status))) < 0))
+        if (pid > 0)
         {
-            if (errno != EINTR)
-                break;
+            while (((i = read(channel[0], &status, sizeof(status))) < 0))
+            {
+                if (errno != EINTR)
+                    break;
+            }
         }
 
         if (channel[0] != -1) close(channel[0]);
 
-
         if ((pid > 0) && (i == 0))
         {
             pid_t	child_pid;
@@ -1368,48 +1370,6 @@ oslProcessError SAL_CALL osl_getProcessInfo(oslProcess Process, oslProcessData F
             return (pInfo->Fields == Fields) ? osl_Process_E_None : osl_Process_E_Unknown;
         }
 
-#elif defined(IRIX)
-
-        int  fd;
-        sal_Char name[PATH_MAX + 1];
-
-        snprintf(name, sizeof(name), "/proc/%u", pid);
-
-        if ((fd = open(name, O_RDONLY)) >= 0)
-        {
-            prstatus_t prstatus;
-            prpsinfo_t prpsinfo;
-
-            if (ioctl(fd, PIOCSTATUS, &prstatus) >= 0 &&
-                ioctl(fd, PIOCPSINFO, &prpsinfo) >= 0)
-            {
-                if (Fields & osl_Process_CPUTIMES)
-                {
-                    pInfo->UserTime.Seconds   = prstatus.pr_utime.tv_sec;
-                    pInfo->UserTime.Nanosec   = prstatus.pr_utime.tv_nsec;
-                    pInfo->SystemTime.Seconds = prstatus.pr_stime.tv_sec;
-                    pInfo->SystemTime.Nanosec = prstatus.pr_stime.tv_nsec;
-
-                    pInfo->Fields |= osl_Process_CPUTIMES;
-                }
-
-                if (Fields & osl_Process_HEAPUSAGE)
-                {
-                    int pagesize = getpagesize();
-
-                    pInfo->HeapUsage = prpsinfo.pr_size*pagesize;
-
-                    pInfo->Fields |= osl_Process_HEAPUSAGE;
-                }
-
-                close(fd);
-
-                return (pInfo->Fields == Fields) ? osl_Process_E_None : osl_Process_E_Unknown;
-            }
-            else
-                close(fd);
-        }
-
 #elif defined(LINUX)
 
         if ( (Fields & osl_Process_CPUTIMES) || (Fields & osl_Process_HEAPUSAGE) )
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index 8f89a226f..aa65b0ce3 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -263,12 +263,9 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
 
     pProfile->m_Stamp = OslProfile_getFileStamp(pFile);
     bRet=loadProfile(pFile, pProfile);
+    bRet &= realpath(pszProfileName, pProfile->m_FileName) != NULL;
     OSL_ASSERT(bRet);
 
-    /* #109261# using osl profiles is deprecated */
-    /* OSL_VERIFY(NULL != realpath(pszProfileName, pProfile->m_FileName)); */
-    realpath(pszProfileName, pProfile->m_FileName);
-    
     if (pProfile->m_pFile == NULL)
         closeFileImpl(pFile,pProfile->m_Flags);
 
@@ -1338,6 +1335,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags)
 
 static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
 {
+    sal_Bool bRet = sal_True;
 #ifdef TRACE_OSL_PROFILE
     OSL_TRACE("In  osl_OslProfile_rewindFile\n");
 #endif
@@ -1349,14 +1347,14 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
 #ifdef DEBUG_OSL_PROFILE
         OSL_TRACE("rewinding\n");
 #endif
-        lseek(pFile->m_Handle, SEEK_SET, 0L);
+        bRet = (lseek(pFile->m_Handle, SEEK_SET, 0L) == 0L);
 
         if (bTruncate)
         {
 #ifdef DEBUG_OSL_PROFILE
             OSL_TRACE("truncating\n");
 #endif
-            ftruncate(pFile->m_Handle, 0L);
+            bRet &= (ftruncate(pFile->m_Handle, 0L) == 0);
         }
 
     }
@@ -1364,7 +1362,7 @@ static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
 #ifdef TRACE_OSL_PROFILE
     OSL_TRACE("Out osl_OslProfile_rewindFile [ok]\n");
 #endif
-    return (sal_True);
+    return bRet;
 }
 
 
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 44f065191..feba9a218 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -48,7 +48,7 @@
 #undef HAVE_POLL_H
 #endif
 
-#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) || defined (MACOSX)
+#if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || defined (MACOSX)
 #include <sys/poll.h>
 #define HAVE_POLL_H
 #endif /* HAVE_POLL_H */
@@ -1869,10 +1869,13 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
     if ( pSocket->m_bIsAccepting == sal_True )
     {
         int nConnFD;
-        struct sockaddr aSockAddr;
-        socklen_t nSockLen = sizeof(aSockAddr);
+        union {
+            struct sockaddr aSockAddr;
+            struct sockaddr_in aSockAddrIn;
+        } s;
+        socklen_t nSockLen = sizeof(s.aSockAddr);
 
-        nRet = getsockname(nFD, &aSockAddr, &nSockLen);
+        nRet = getsockname(nFD, &s.aSockAddr, &nSockLen);
 #if OSL_DEBUG_LEVEL > 1
         if ( nRet < 0 )
         {
@@ -1880,13 +1883,11 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
         }
 #endif /* OSL_DEBUG_LEVEL */
 
-        if ( aSockAddr.sa_family == AF_INET )
+        if ( s.aSockAddr.sa_family == AF_INET )
         {
-            struct sockaddr_in* pSockAddrIn = (struct sockaddr_in*) &aSockAddr;
-
-            if ( pSockAddrIn->sin_addr.s_addr == htonl(INADDR_ANY) )
+            if ( s.aSockAddrIn.sin_addr.s_addr == htonl(INADDR_ANY) )
             {
-                pSockAddrIn->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+                s.aSockAddrIn.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
             }
 
             nConnFD = socket(AF_INET, SOCK_STREAM, 0);
@@ -1897,7 +1898,7 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
             }
 #endif /* OSL_DEBUG_LEVEL */
 
-            nRet = connect(nConnFD, &aSockAddr, sizeof(aSockAddr));
+            nRet = connect(nConnFD, &s.aSockAddr, sizeof(s.aSockAddr));
 #if OSL_DEBUG_LEVEL > 1
             if ( nRet < 0 )
             {
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 8eaaa7bee..b2f71be18 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -270,34 +270,6 @@ extern unsigned int nanosleep(unsigned int);
 #	define  PTHREAD_SIGACTION 			cma_sigaction
 #endif
 
-#ifdef IRIX
-#   define  AF_IPX -1
-#	include <pthread.h>
-#	include <semaphore.h>
-#	include <sched.h>
-#	include <sys/socket.h>
-#	include <sys/un.h>
-#	include <sys/stropts.h>
-#	include <netinet/tcp.h>
-#   include <sys/endian.h>
-#   if BYTE_ORDER == LITTLE_ENDIAN
-#	undef _BIG_ENDIAN
-#	undef _PDP_ENDIAN
-#   elif BYTE_ORDER == BIG_ENDIAN
-#	undef _LITTLE_ENDIAN
-#	undef _PDP_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#	undef _LITTLE_ENDIAN
-#	undef _BIG_ENDIAN
-#   endif
-#	define  SA_FAMILY_DECL \
-        union { struct { short sa_family2; } sa_generic; } sa_union
-#	define  NO_PTHREAD_PRIORITY
-#	include <dlfcn.h>
-#	define 	IOCHANNEL_TRANSFER_BSD
-extern char *strdup(const char *);
-#endif
-
 #ifdef SOLARIS
 #	include <shadow.h>
 #	include <sys/un.h>
@@ -364,8 +336,7 @@ int macxp_resolveAlias(char *path, int buflen);
 #if !defined(_WIN32)  && !defined(_WIN16) && !defined(OS2)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO)  && \
     !defined(AIX)     && !defined(HPUX)   && \
-    !defined(SOLARIS) && !defined(IRIX)   && \
-    !defined(MACOSX)
+    !defined(SOLARIS) && !defined(MACOSX)
 #	error "Target platform not specified!"
 #endif
 
diff --git a/sal/rtl/source/alloc.c b/sal/rtl/source/alloc.c
index 0453763ba..6998090fb 100644
--- a/sal/rtl/source/alloc.c
+++ b/sal/rtl/source/alloc.c
@@ -78,7 +78,7 @@ static sal_Size __rtl_memory_vmpagesize (void)
     /* xBSD */
     return (sal_Size)(getpagesize());
 }
-#elif defined(IRIX) || defined(LINUX) || defined(SOLARIS)
+#elif defined(LINUX) || defined(SOLARIS)
 static sal_Size __rtl_memory_vmpagesize (void)
 {
     /* POSIX */
@@ -90,7 +90,7 @@ static sal_Size __rtl_memory_vmpagesize (void)
     /* other */
     return (sal_Size)(0x2000);
 }
-#endif /* FREEBSD || NETBSD || MACOSX || IRIX || LINUX || SOLARIS */
+#endif /* FREEBSD || NETBSD || MACOSX || LINUX || SOLARIS */
 
 #ifndef PROT_HEAP
 #define PROT_HEAP (PROT_READ | PROT_WRITE | PROT_EXEC)
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 4081dc89b..b421b221a 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -820,8 +820,8 @@ void SAL_CALL rtl_bootstrap_set (
     rtl_uString * pValue
 ) SAL_THROW_EXTERN_C()
 {
-    OUString const & name = *reinterpret_cast< OUString const * >( &pName );
-    OUString const & value = *reinterpret_cast< OUString const * >( &pValue );
+    const OUString name( pName );
+    const OUString value( pValue );
 
     osl::MutexGuard guard( osl::Mutex::getGlobalMutex() );
 
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx
index bfb10c6b2..776ce9b76 100644
--- a/sal/rtl/source/macro.hxx
+++ b/sal/rtl/source/macro.hxx
@@ -49,8 +49,6 @@
 #define THIS_OS "NetBSD"
 #elif defined FREEBSD
 #define THIS_OS "FreeBSD"
-#elif defined IRIX
-#define THIS_OS "Irix"
 #endif
 
 #if ! defined THIS_OS
@@ -76,8 +74,6 @@ this is inserted for the case that the preprocessor ignores error
 #else
 #    define THIS_ARCH "SPARC"
 #endif
-#elif defined IRIX
-#    define THIS_ARCH "MIPS"
 #elif defined MIPS
 #    ifdef OSL_BIGENDIAN
 #        define THIS_ARCH "MIPS_EB"
diff --git a/sal/rtl/source/math.cxx b/sal/rtl/source/math.cxx
index 731ab18c6..86efd4ac7 100644
--- a/sal/rtl/source/math.cxx
+++ b/sal/rtl/source/math.cxx
@@ -879,8 +879,13 @@ inline double stringToDouble(CharT const * pBegin, CharT const * pEnd,
             rtl::math::setNan( &fVal );
             if (bSign)
             {
-                reinterpret_cast< sal_math_Double * >(&fVal)->w32_parts.msw
-                    |= 0x80000000; // create negative NaN
+                union {
+                    double sd;
+                    sal_math_Double md;
+                } m;
+                m.sd = fVal;
+                m.md.w32_parts.msw |= 0x80000000; // create negative NaN
+                fVal = m.sd;
                 bSign = false; // don't negate again
             }
             // Eat any further digits:
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index bc8026aa8..a43f09e2e 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -127,9 +127,6 @@ SHL1STDLIBS= -Bdynamic -ldl -lpthread -lposix4 -lsocket -lnsl
 SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
 .ENDIF # C50
 .ENDIF # SOLARIS
-.IF "$(OS)"=="IRIX"
-SHL1STDLIBS= -lexc
-.ENDIF
 .ENDIF # UNX
 
 .IF "$(GUI)"=="OS2"
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
index 7a09031fc..3f46cc9bc 100755
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -69,7 +69,7 @@ void SimpleReferenceObject::operator delete(void * pPtr) SAL_THROW(())
 void SimpleReferenceObject::operator delete(void * pPtr, std::nothrow_t const &)
     SAL_THROW(())
 {
-#if defined WNT || (defined IRIX && !defined GCC)
+#if defined WNT
     ::operator delete(pPtr); // WNT lacks a global nothrow operator delete...
 #else // WNT
     ::operator delete(pPtr, std::nothrow);
-- 
cgit v1.2.3


From 5a3c6c9a56fb531a6a64d52cbf181dbaa45c1156 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Wed, 27 Jan 2010 16:23:59 +0100
Subject: sb118: changed tools/debug to never fall back from writing to shell
 to writing to file, and read DBGSV_INIT from rtl::Bootstrap; the latter
 causes problems if tools/debug is called from static code executing before
 SAL_MAIN has called osl_setCommandArgs -> removed statics from code and added
 assertions to osl/process; various improvements to smoketests.cxx (incl.
 passing an appropriate dbgsv.ini for non-pro builds)

---
 sal/osl/os2/process_impl.cxx | 5 ++++-
 sal/osl/unx/process_impl.cxx | 4 ++++
 sal/osl/w32/process.c        | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/sal/osl/os2/process_impl.cxx b/sal/osl/os2/process_impl.cxx
index ce1e97e9e..b59b90ebb 100644
--- a/sal/osl/os2/process_impl.cxx
+++ b/sal/osl/os2/process_impl.cxx
@@ -144,6 +144,7 @@ oslProcessError SAL_CALL osl_getExecutableFile (rtl_uString ** ppustrFile)
     oslProcessError result = osl_Process_E_NotFound;
 
     osl_acquireMutex(g_command_args.m_mutex);
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > 0)
     {
         /* CommandArgs set. Obtain argv[0]. */
@@ -163,6 +164,7 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount (void)
     sal_uInt32 result = 0;
 
     osl_acquireMutex(g_command_args.m_mutex);
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > 0)
         result = g_command_args.m_nCount - 1;
     osl_releaseMutex(g_command_args.m_mutex);
@@ -178,6 +180,7 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strC
     oslProcessError result = osl_Process_E_NotFound;
 
     osl_acquireMutex(g_command_args.m_mutex);
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > (nArg + 1))
     {
         rtl_uString_assign (strCommandArg, g_command_args.m_ppArgs[nArg + 1]);
@@ -193,7 +196,7 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strC
  **************************************/
 void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
 {
-
+    OSL_ASSERT(argc > 0);
     osl_acquireMutex(g_command_args.m_mutex);
     OSL_ENSURE (g_command_args.m_nCount == 0, "osl_setCommandArgs(): CommandArgs already set.");
     if (g_command_args.m_nCount == 0)
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 809ebf54c..03226b665 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -187,6 +187,7 @@ oslProcessError SAL_CALL osl_getExecutableFile (rtl_uString ** ppustrFile)
     oslProcessError result = osl_Process_E_NotFound;
 
     pthread_mutex_lock (&(g_command_args.m_mutex));
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > 0)
     {
         /* CommandArgs set. Obtain argv[0]. */
@@ -206,6 +207,7 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount (void)
     sal_uInt32 result = 0;
 
     pthread_mutex_lock (&(g_command_args.m_mutex));
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > 0)
         result = g_command_args.m_nCount - 1;
     pthread_mutex_unlock (&(g_command_args.m_mutex));
@@ -221,6 +223,7 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strC
     oslProcessError result = osl_Process_E_NotFound;
 
     pthread_mutex_lock (&(g_command_args.m_mutex));
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > (nArg + 1))
     {
         rtl_uString_assign (strCommandArg, g_command_args.m_ppArgs[nArg + 1]);
@@ -236,6 +239,7 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strC
  **************************************/
 void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
 {
+    OSL_ASSERT(argc > 0);
     pthread_mutex_lock (&(g_command_args.m_mutex));
     OSL_ENSURE (g_command_args.m_nCount == 0, "osl_setCommandArgs(): CommandArgs already set.");
     if (g_command_args.m_nCount == 0)
diff --git a/sal/osl/w32/process.c b/sal/osl/w32/process.c
index cd61d9369..ebf30e390 100644
--- a/sal/osl/w32/process.c
+++ b/sal/osl/w32/process.c
@@ -323,6 +323,7 @@ oslProcessError SAL_CALL osl_getExecutableFile( rtl_uString **ppustrFile )
     oslProcessError result = osl_Process_E_NotFound;
 
     osl_acquireMutex (*osl_getGlobalMutex());
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > 0)
     {
         /* CommandArgs set. Obtain arv[0]. */
@@ -341,6 +342,7 @@ sal_uInt32 SAL_CALL osl_getCommandArgCount(void)
     sal_uInt32 result = 0;
 
     osl_acquireMutex (*osl_getGlobalMutex());
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > 0)
     {
         /* We're not counting argv[0] here. */
@@ -358,6 +360,7 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32 nArg, rtl_uString **strCo
     oslProcessError result = osl_Process_E_NotFound;
 
     osl_acquireMutex (*osl_getGlobalMutex());
+    OSL_ASSERT(g_command_args.m_nCount > 0);
     if (g_command_args.m_nCount > (nArg + 1))
     {
         /* We're not counting argv[0] here. */
@@ -373,6 +376,7 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32 nArg, rtl_uString **strCo
 
 void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
 {
+    OSL_ASSERT(argc > 0);
     osl_acquireMutex (*osl_getGlobalMutex());
     if (g_command_args.m_nCount == 0)
     {
-- 
cgit v1.2.3


From c37c9bf77d3ae02fb14b1d053e8c249a584f5e00 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 29 Jan 2010 17:01:54 +0100
Subject: sb118: #i108776# changed addsym.awk to also export STLport num_put
 symbols, and simplified it by requiring that first section is labeled
 UDK_3_0_0; adapted map files accordingly, replacing many individual ones with
 solenv/src templates

---
 bridges/test/java_uno/acquire/makefile.mk          |  2 +-
 bridges/test/java_uno/acquire/testacquire.map      |  8 ----
 bridges/test/java_uno/any/test_javauno_any.map     |  2 +-
 bridges/test/java_uno/equals/makefile.mk           |  2 +-
 bridges/test/java_uno/equals/testequals.map        |  8 ----
 cli_ure/source/native/msvc.map                     |  2 +-
 cppuhelper/qa/ifcontainer/export.map               |  2 +-
 cppuhelper/qa/propertysetmixin/comp.map            | 40 --------------------
 cppuhelper/qa/propertysetmixin/makefile.mk         |  9 +----
 cppuhelper/qa/propertysetmixin/test.gcc3.map       | 44 ----------------------
 cppuhelper/qa/unourl/export.map                    |  2 +-
 cppuhelper/test/cfg_test.map                       |  8 ----
 io/source/TextInputStream/makefile.mk              |  2 +-
 io/source/TextInputStream/tinstrm.map              |  9 -----
 io/source/TextOutputStream/makefile.mk             |  2 +-
 io/source/TextOutputStream/toutstrm.map            |  9 -----
 io/source/acceptor/acceptor.map                    |  9 -----
 io/source/acceptor/makefile.mk                     |  2 +-
 io/source/connector/connectr.map                   |  9 -----
 io/source/connector/makefile.mk                    |  2 +-
 io/source/stm/makefile.mk                          |  2 +-
 io/source/stm/stm.map                              |  9 -----
 javaunohelper/source/javaunohelper.map             |  2 +-
 jvmaccess/util/cc5_solaris_sparc.map               |  4 +-
 jvmaccess/util/gcc3.map                            |  4 +-
 jvmaccess/util/msvc_win32_intel.map                |  4 +-
 remotebridges/source/bridge/makefile.mk            |  2 +-
 remotebridges/source/bridge/remotebridge.map       |  9 -----
 remotebridges/source/factory/brdgfctr.map          |  9 -----
 remotebridges/source/factory/makefile.mk           |  2 +-
 remotebridges/source/unourl_resolver/makefile.mk   |  2 +-
 .../source/unourl_resolver/uuresolver.map          |  9 -----
 sal/qa/export.map                                  |  2 +-
 sal/qa/osl/module/export_dll.map                   |  2 +-
 sal/qa/rtl/textenc/gcc3_export.map                 | 40 --------------------
 sal/qa/rtl/textenc/makefile.mk                     |  8 ----
 salhelper/test/rtti/sols.map                       |  2 +-
 stoc/source/corereflection/corefl.map              |  9 -----
 stoc/source/corereflection/makefile.mk             |  2 +-
 stoc/source/inspect/introspection.map              |  8 ----
 stoc/source/inspect/makefile.mk                    |  2 +-
 stoc/source/invocation/inv.map                     |  9 -----
 stoc/source/invocation/makefile.mk                 |  2 +-
 stoc/source/invocation_adapterfactory/invadp.map   |  9 -----
 stoc/source/invocation_adapterfactory/makefile.mk  |  2 +-
 stoc/source/javaloader/javaloader.map              |  8 ----
 stoc/source/javaloader/makefile.mk                 |  2 +-
 stoc/source/javavm/jen.map                         |  8 ----
 stoc/source/javavm/makefile.mk                     |  2 +-
 stoc/source/namingservice/makefile.mk              |  2 +-
 stoc/source/namingservice/namingservice.map        |  9 -----
 stoc/source/proxy_factory/makefile.mk              |  2 +-
 stoc/source/proxy_factory/proxyfac.map             |  9 -----
 stoc/test/registry_tdprovider/makefile.mk          |  7 +---
 .../testregistrytdprovider.gcc3.map                | 42 ---------------------
 .../registry_tdprovider/testregistrytdprovider.map | 40 --------------------
 stoc/test/tdmanager/makefile.mk                    |  7 +---
 stoc/test/tdmanager/testtdmanager.gcc3.map         | 42 ---------------------
 stoc/test/tdmanager/testtdmanager.map              | 40 --------------------
 stoc/test/testsmgr_cpnt.map                        |  2 +-
 stoc/util/bootstrap.map                            |  9 -----
 stoc/util/makefile.mk                              |  4 +-
 stoc/util/stocservices.map                         |  9 -----
 ure/source/uretest/version.map                     |  2 +
 64 files changed, 41 insertions(+), 533 deletions(-)
 delete mode 100644 bridges/test/java_uno/acquire/testacquire.map
 delete mode 100644 bridges/test/java_uno/equals/testequals.map
 delete mode 100644 cppuhelper/qa/propertysetmixin/comp.map
 delete mode 100644 cppuhelper/qa/propertysetmixin/test.gcc3.map
 delete mode 100644 cppuhelper/test/cfg_test.map
 delete mode 100644 io/source/TextInputStream/tinstrm.map
 delete mode 100644 io/source/TextOutputStream/toutstrm.map
 delete mode 100644 io/source/acceptor/acceptor.map
 delete mode 100644 io/source/connector/connectr.map
 delete mode 100644 io/source/stm/stm.map
 delete mode 100644 remotebridges/source/bridge/remotebridge.map
 delete mode 100644 remotebridges/source/factory/brdgfctr.map
 delete mode 100644 remotebridges/source/unourl_resolver/uuresolver.map
 delete mode 100644 sal/qa/rtl/textenc/gcc3_export.map
 delete mode 100644 stoc/source/corereflection/corefl.map
 delete mode 100644 stoc/source/inspect/introspection.map
 delete mode 100644 stoc/source/invocation/inv.map
 delete mode 100644 stoc/source/invocation_adapterfactory/invadp.map
 delete mode 100644 stoc/source/javaloader/javaloader.map
 delete mode 100644 stoc/source/javavm/jen.map
 delete mode 100644 stoc/source/namingservice/namingservice.map
 delete mode 100644 stoc/source/proxy_factory/proxyfac.map
 delete mode 100644 stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
 delete mode 100644 stoc/test/registry_tdprovider/testregistrytdprovider.map
 delete mode 100644 stoc/test/tdmanager/testtdmanager.gcc3.map
 delete mode 100644 stoc/test/tdmanager/testtdmanager.map
 delete mode 100644 stoc/util/bootstrap.map
 delete mode 100644 stoc/util/stocservices.map

diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index dc4ad8658..f4f0a070a 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES = $(SLO)$/testacquire.obj
 SHL1TARGET = testacquire.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL1VERSIONMAP = testacquire.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1IMPLIB = itestacquire
 
 JAVAFILES = TestAcquire.java
diff --git a/bridges/test/java_uno/acquire/testacquire.map b/bridges/test/java_uno/acquire/testacquire.map
deleted file mode 100644
index 227274db9..000000000
--- a/bridges/test/java_uno/acquire/testacquire.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3.1 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/bridges/test/java_uno/any/test_javauno_any.map b/bridges/test/java_uno/any/test_javauno_any.map
index 4959db8fc..c50f7b162 100644
--- a/bridges/test/java_uno/any/test_javauno_any.map
+++ b/bridges/test/java_uno/any/test_javauno_any.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         Java_test_java_1uno_anytest_TestJni_create_1jni_1transport;
     local:
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index f95f1c0ad..2bf1ea1a2 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -54,7 +54,7 @@ SLOFILES = $(SLO)$/testequals.obj
 SHL1TARGET = testequals.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL1VERSIONMAP = testequals.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1IMPLIB = itestequals
 
 JAVAFILES = TestEquals.java
diff --git a/bridges/test/java_uno/equals/testequals.map b/bridges/test/java_uno/equals/testequals.map
deleted file mode 100644
index 227274db9..000000000
--- a/bridges/test/java_uno/equals/testequals.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3.1 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/cli_ure/source/native/msvc.map b/cli_ure/source/native/msvc.map
index 2fba6b6d3..429f750cc 100644
--- a/cli_ure/source/native/msvc.map
+++ b/cli_ure/source/native/msvc.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
 
     local:
diff --git a/cppuhelper/qa/ifcontainer/export.map b/cppuhelper/qa/ifcontainer/export.map
index 4ca70fa85..879fa8953 100644
--- a/cppuhelper/qa/ifcontainer/export.map
+++ b/cppuhelper/qa/ifcontainer/export.map
@@ -1,4 +1,4 @@
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/cppuhelper/qa/propertysetmixin/comp.map b/cppuhelper/qa/propertysetmixin/comp.map
deleted file mode 100644
index c8fddfd5b..000000000
--- a/cppuhelper/qa/propertysetmixin/comp.map
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: comp.map,v $
-#
-# $Revision: 1.3 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index fa3db6129..bfd10bf02 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -54,20 +54,15 @@ INCPRE += -I$(MISC)/$(TARGET)/inc
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)/test_propertysetmixin.obj
+SHL1VERSIONMAP = test.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1RPATH = NONE
 DEF1NAME = $(SHL1TARGET)
 
-.IF "$(COMNAME)" == "gcc3"
-SHL1VERSIONMAP = test.gcc3.map
-.ELSE
-SHL1VERSIONMAP = test.map
-.ENDIF
-
 SHL2TARGET = $(TARGET).uno
 SHL2OBJS = $(SLO)/comp_propertysetmixin.obj
-SHL2VERSIONMAP = comp.map
+SHL2VERSIONMAP = $(SOLARENV)/src/component.map
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL2IMPLIB = i$(SHL2TARGET)
 SH21RPATH = NONE
diff --git a/cppuhelper/qa/propertysetmixin/test.gcc3.map b/cppuhelper/qa/propertysetmixin/test.gcc3.map
deleted file mode 100644
index 246034ea6..000000000
--- a/cppuhelper/qa/propertysetmixin/test.gcc3.map
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-#   OpenOffice.org - a multi-platform office productivity suite
-#
-#   $RCSfile: test.gcc3.map,v $
-#
-#   $Revision: 1.2 $
-#
-#   last change: $Author: ihi $ $Date: 2008-04-24 16:58:39 $
-#
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
-#
-#
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-        _ZN4_STL7num_put*; # STLport
-
-    local:
-        *;
-};
diff --git a/cppuhelper/qa/unourl/export.map b/cppuhelper/qa/unourl/export.map
index 4ca70fa85..879fa8953 100644
--- a/cppuhelper/qa/unourl/export.map
+++ b/cppuhelper/qa/unourl/export.map
@@ -1,4 +1,4 @@
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/cppuhelper/test/cfg_test.map b/cppuhelper/test/cfg_test.map
deleted file mode 100644
index ac2c3750b..000000000
--- a/cppuhelper/test/cfg_test.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk
index 1fb5aa337..5c2457eab 100644
--- a/io/source/TextInputStream/makefile.mk
+++ b/io/source/TextInputStream/makefile.mk
@@ -44,7 +44,7 @@ SLOFILES= \
     $(SLO)$/TextInputStream.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = tinstrm.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/io/source/TextInputStream/tinstrm.map b/io/source/TextInputStream/tinstrm.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/io/source/TextInputStream/tinstrm.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/io/source/TextOutputStream/makefile.mk b/io/source/TextOutputStream/makefile.mk
index 7a4c0d6ba..3c8a4aef8 100644
--- a/io/source/TextOutputStream/makefile.mk
+++ b/io/source/TextOutputStream/makefile.mk
@@ -45,7 +45,7 @@ SLOFILES= \
     $(SLO)$/TextOutputStream.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = toutstrm.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/io/source/TextOutputStream/toutstrm.map b/io/source/TextOutputStream/toutstrm.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/io/source/TextOutputStream/toutstrm.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/io/source/acceptor/acceptor.map b/io/source/acceptor/acceptor.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/io/source/acceptor/acceptor.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index 843f26296..9e3f74ead 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -56,7 +56,7 @@ SLOFILES= \
         $(SLO)$/acc_socket.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = acceptor.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1RPATH=URELIB
 
 SHL1STDLIBS= \
diff --git a/io/source/connector/connectr.map b/io/source/connector/connectr.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/io/source/connector/connectr.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index 471f6b9d2..ec988b1bd 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -56,7 +56,7 @@ SLOFILES= \
     $(SLO)$/ctr_socket.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = connectr.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1RPATH=URELIB
 
 SHL1STDLIBS= \
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
index 43b6f2566..f443e07f9 100644
--- a/io/source/stm/makefile.mk
+++ b/io/source/stm/makefile.mk
@@ -57,7 +57,7 @@ SLOFILES = 	$(SLO)$/opipe.obj\
         $(SLO)$/opump.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = stm.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB) 	 \
diff --git a/io/source/stm/stm.map b/io/source/stm/stm.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/io/source/stm/stm.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/javaunohelper/source/javaunohelper.map b/javaunohelper/source/javaunohelper.map
index a7bf6b072..dcbe0506a 100644
--- a/javaunohelper/source/javaunohelper.map
+++ b/javaunohelper/source/javaunohelper.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
     Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo;
     Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory;
diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map
index 6a104199b..f7691f8fb 100644
--- a/jvmaccess/util/cc5_solaris_sparc.map
+++ b/jvmaccess/util/cc5_solaris_sparc.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         # jvmaccess/virtualmachine.hxx:
         __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -56,7 +56,7 @@ UDK_3.2 {
         __1cJjvmaccesscQ__RTTI__1CpnJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException *
         __1cJjvmaccesscR__RTTI__1CpknJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException const *
         __1cJjvmaccessOVirtualMachine2t5B6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) #Nvariant 1
-} UDK_3.1;
+} UDK_3_0_0;
 
 UDK_3.3 {
     global:
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 23101f3eb..3d63cacaa 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         # jvmaccess/virtualmachine.hxx:
         _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -63,7 +63,7 @@ UDK_3.2 {
     # We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
         _*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
         _*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-} UDK_3.1;
+} UDK_3_0_0;
 
 UDK_3.3 {
     global:
diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map
index fd148b189..4620b1caa 100644
--- a/jvmaccess/util/msvc_win32_intel.map
+++ b/jvmaccess/util/msvc_win32_intel.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         # jvmaccess/virtualmachine.hxx:
         ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -15,7 +15,7 @@ UDK_3.1 {
 
 UDK_3.2 {
     global:
-} UDK_3.1;
+} UDK_3_0_0;
 
 UDK_3.3 {
     global:
diff --git a/remotebridges/source/bridge/makefile.mk b/remotebridges/source/bridge/makefile.mk
index 75b5f3a61..8ccebe709 100644
--- a/remotebridges/source/bridge/makefile.mk
+++ b/remotebridges/source/bridge/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES= \
         $(SLO)$/bridge_connection.obj\
         $(SLO)$/bridge_provider.obj 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = remotebridge.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/remotebridges/source/bridge/remotebridge.map b/remotebridges/source/bridge/remotebridge.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/remotebridges/source/bridge/remotebridge.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/remotebridges/source/factory/brdgfctr.map b/remotebridges/source/factory/brdgfctr.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/remotebridges/source/factory/brdgfctr.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk
index 97eb02415..bdbaf3463 100644
--- a/remotebridges/source/factory/makefile.mk
+++ b/remotebridges/source/factory/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES= \
     $(SLO)$/bridgeimpl.obj 
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = brdgfctr.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk
index 81f8b1c67..b0f584444 100644
--- a/remotebridges/source/unourl_resolver/makefile.mk
+++ b/remotebridges/source/unourl_resolver/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES= \
         $(SLO)$/unourl_resolver.obj
 
 SHL1TARGET=	$(TARGET)
-SHL1VERSIONMAP = uuresolver.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)		\
diff --git a/remotebridges/source/unourl_resolver/uuresolver.map b/remotebridges/source/unourl_resolver/uuresolver.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/remotebridges/source/unourl_resolver/uuresolver.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/sal/qa/export.map b/sal/qa/export.map
index 3d8914023..55e7f1c97 100755
--- a/sal/qa/export.map
+++ b/sal/qa/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         cppunitTestPlugIn;
 
diff --git a/sal/qa/osl/module/export_dll.map b/sal/qa/osl/module/export_dll.map
index 134a4c587..5f016af62 100644
--- a/sal/qa/osl/module/export_dll.map
+++ b/sal/qa/osl/module/export_dll.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         firstfunc;
 
diff --git a/sal/qa/rtl/textenc/gcc3_export.map b/sal/qa/rtl/textenc/gcc3_export.map
deleted file mode 100644
index 18f970ebd..000000000
--- a/sal/qa/rtl/textenc/gcc3_export.map
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: gcc3_export.map,v $
-#
-# $Revision: 1.3 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
-
-        _ZN4_STL7num_put*; # STLport
-
-    local:
-        *;
-};
diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk
index 31f700b7b..177ae7cf2 100644
--- a/sal/qa/rtl/textenc/makefile.mk
+++ b/sal/qa/rtl/textenc/makefile.mk
@@ -51,11 +51,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-.IF "$(COMNAME)" == "gcc3"
-SHL1VERSIONMAP = gcc3_export.map
-.ELSE
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-.ENDIF
 
 # END --------------------------------------------------------------
 
@@ -67,11 +63,7 @@ SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
-.IF "$(COMNAME)" == "gcc3"
-SHL2VERSIONMAP = gcc3_export.map
-.ELSE
 SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
-.ENDIF
 
 # END --------------------------------------------------------------
 
diff --git a/salhelper/test/rtti/sols.map b/salhelper/test/rtti/sols.map
index 962d64847..babf2c901 100644
--- a/salhelper/test/rtti/sols.map
+++ b/salhelper/test/rtti/sols.map
@@ -1,4 +1,4 @@
-SAMPLELIB {
+UDK_3_0_0 {
     global:
 GetVersionInfo;
 _fini;
diff --git a/stoc/source/corereflection/corefl.map b/stoc/source/corereflection/corefl.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/stoc/source/corereflection/corefl.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk
index ecfb94c31..542ea9257 100644
--- a/stoc/source/corereflection/makefile.mk
+++ b/stoc/source/corereflection/makefile.mk
@@ -59,7 +59,7 @@ NOOPTFILES += $(SLO)$/criface.obj
 .ENDIF
 
 SHL1TARGET=	$(TARGET)
-SHL1VERSIONMAP = corefl.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1STDLIBS= \
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
diff --git a/stoc/source/inspect/introspection.map b/stoc/source/inspect/introspection.map
deleted file mode 100644
index c2806d230..000000000
--- a/stoc/source/inspect/introspection.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3.1 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk
index 1f60c8d30..2158d8fc6 100644
--- a/stoc/source/inspect/makefile.mk
+++ b/stoc/source/inspect/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-SHL1VERSIONMAP = introspection.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1RPATH=URELIB
 
 SHL1DEPN=
diff --git a/stoc/source/invocation/inv.map b/stoc/source/invocation/inv.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/stoc/source/invocation/inv.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk
index 92740c6ec..ecb042e6b 100644
--- a/stoc/source/invocation/makefile.mk
+++ b/stoc/source/invocation/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-SHL1VERSIONMAP = inv.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1DEPN=
 SHL1IMPLIB=	i$(TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
diff --git a/stoc/source/invocation_adapterfactory/invadp.map b/stoc/source/invocation_adapterfactory/invadp.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/stoc/source/invocation_adapterfactory/invadp.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk
index 99d5cfdea..568724bd8 100644
--- a/stoc/source/invocation_adapterfactory/makefile.mk
+++ b/stoc/source/invocation_adapterfactory/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS=	\
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-SHL1VERSIONMAP = invadp.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1RPATH=URELIB
 
 SHL1DEPN=
diff --git a/stoc/source/javaloader/javaloader.map b/stoc/source/javaloader/javaloader.map
deleted file mode 100644
index ac2c3750b..000000000
--- a/stoc/source/javaloader/javaloader.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk
index 2b29baa82..bfd4e7856 100644
--- a/stoc/source/javaloader/makefile.mk
+++ b/stoc/source/javaloader/makefile.mk
@@ -56,7 +56,7 @@ SHL1STDLIBS=\
         $(SALLIB) \
         $(JVMACCESSLIB)
 
-SHL1VERSIONMAP = javaloader.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1DEPN=		
 SHL1IMPLIB=		i$(TARGET)
 SHL1LIBS= 		$(SLB)$/$(TARGET).lib 
diff --git a/stoc/source/javavm/jen.map b/stoc/source/javavm/jen.map
deleted file mode 100644
index ac2c3750b..000000000
--- a/stoc/source/javavm/jen.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk
index ffd00418b..90e61016c 100644
--- a/stoc/source/javavm/makefile.mk
+++ b/stoc/source/javavm/makefile.mk
@@ -58,7 +58,7 @@ SLOFILES= \
         $(SLO)$/interact.obj 
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = jen.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS= \
         $(CPPUHELPERLIB) 	\
         $(CPPULIB)	    	\
diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk
index c5a975a3f..60cbcd121 100644
--- a/stoc/source/namingservice/makefile.mk
+++ b/stoc/source/namingservice/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-SHL1VERSIONMAP = namingservice.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(TARGET)
diff --git a/stoc/source/namingservice/namingservice.map b/stoc/source/namingservice/namingservice.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/stoc/source/namingservice/namingservice.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk
index 53917afd4..42464067d 100644
--- a/stoc/source/proxy_factory/makefile.mk
+++ b/stoc/source/proxy_factory/makefile.mk
@@ -49,7 +49,7 @@ SLOFILES= \
         $(SLO)$/proxyfac.obj
 
 SHL1TARGET=$(TARGET)
-SHL1VERSIONMAP = proxyfac.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
     $(CPPULIB)		\
diff --git a/stoc/source/proxy_factory/proxyfac.map b/stoc/source/proxy_factory/proxyfac.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/stoc/source/proxy_factory/proxyfac.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/test/registry_tdprovider/makefile.mk b/stoc/test/registry_tdprovider/makefile.mk
index 2571e5036..e9295b6b1 100644
--- a/stoc/test/registry_tdprovider/makefile.mk
+++ b/stoc/test/registry_tdprovider/makefile.mk
@@ -44,16 +44,11 @@ SLOFILES = $(SLO)$/testregistrytdprovider.obj
 
 SHL1TARGET = testregistrytdprovider.uno
 SHL1OBJS = $(SLOFILES)
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1IMPLIB = itestregistrytdprovider
 DEF1NAME = $(SHL1TARGET)
 
-.IF "$(COMNAME)" == "gcc3"
-SHL1VERSIONMAP = testregistrytdprovider.gcc3.map
-.ELSE
-SHL1VERSIONMAP = testregistrytdprovider.map
-.ENDIF
-
 .INCLUDE: target.mk
 
 ALLTAR: test
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map b/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
deleted file mode 100644
index df3e26978..000000000
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: testregistrytdprovider.gcc3.map,v $
-#
-# $Revision: 1.3 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-        _ZN4_STL7num_put*; # STLport
-
-    local:
-        *;
-};
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.map b/stoc/test/registry_tdprovider/testregistrytdprovider.map
deleted file mode 100644
index f573fb154..000000000
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.map
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: testregistrytdprovider.map,v $
-#
-# $Revision: 1.4 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/stoc/test/tdmanager/makefile.mk b/stoc/test/tdmanager/makefile.mk
index 594cf1d94..6502b8010 100644
--- a/stoc/test/tdmanager/makefile.mk
+++ b/stoc/test/tdmanager/makefile.mk
@@ -44,16 +44,11 @@ SLOFILES = $(SLO)$/testtdmanager.obj
 
 SHL1TARGET = testtdmanager.uno
 SHL1OBJS = $(SLOFILES)
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1IMPLIB = itesttdmanager
 DEF1NAME = $(SHL1TARGET)
 
-.IF "$(COMNAME)" == "gcc3"
-SHL1VERSIONMAP = testtdmanager.gcc3.map
-.ELSE
-SHL1VERSIONMAP = testtdmanager.map
-.ENDIF
-
 .INCLUDE: target.mk
 
 ALLTAR: test
diff --git a/stoc/test/tdmanager/testtdmanager.gcc3.map b/stoc/test/tdmanager/testtdmanager.gcc3.map
deleted file mode 100644
index e2b84cfb0..000000000
--- a/stoc/test/tdmanager/testtdmanager.gcc3.map
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: testtdmanager.gcc3.map,v $
-#
-# $Revision: 1.3 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-        _ZN4_STL7num_put*; # STLport
-
-    local:
-        *;
-};
diff --git a/stoc/test/tdmanager/testtdmanager.map b/stoc/test/tdmanager/testtdmanager.map
deleted file mode 100644
index 409358b2c..000000000
--- a/stoc/test/tdmanager/testtdmanager.map
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: testtdmanager.map,v $
-#
-# $Revision: 1.4 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/stoc/test/testsmgr_cpnt.map b/stoc/test/testsmgr_cpnt.map
index d8c4047c5..ab5ed357b 100644
--- a/stoc/test/testsmgr_cpnt.map
+++ b/stoc/test/testsmgr_cpnt.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         component_getImplementationEnvironment;
         component_writeInfo;
diff --git a/stoc/util/bootstrap.map b/stoc/util/bootstrap.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/stoc/util/bootstrap.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/util/makefile.mk b/stoc/util/makefile.mk
index aa0cb8f6e..53703fe6f 100644
--- a/stoc/util/makefile.mk
+++ b/stoc/util/makefile.mk
@@ -54,7 +54,7 @@ LIB1FILES=	$(SLB)$/bootstrap.lib \
         $(SLB)$/regtypeprov.lib \
         $(SLB)$/typemgr.lib
 
-SHL1VERSIONMAP = bootstrap.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(CPPULIB)		\
@@ -79,7 +79,7 @@ LIB2FILES=	\
         $(SLB)$/typeconverter.lib \
         $(SLB)$/uriproc.lib 
 
-SHL2VERSIONMAP = stocservices.map
+SHL2VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL2STDLIBS= \
         $(CPPULIB)		\
diff --git a/stoc/util/stocservices.map b/stoc/util/stocservices.map
deleted file mode 100644
index 30c5bb729..000000000
--- a/stoc/util/stocservices.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/ure/source/uretest/version.map b/ure/source/uretest/version.map
index 2ef46fc65..4ac0048b3 100644
--- a/ure/source/uretest/version.map
+++ b/ure/source/uretest/version.map
@@ -38,6 +38,8 @@ UDK_3_0_0 {
         _ZTI*;
         _ZTS*;
 
+        _ZN4_STL7num_put*; # for STLport
+
     local:
         *;
 };
-- 
cgit v1.2.3


From 88214f635241cf2ef901ce97d7e732cbb061a9b6 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Wed, 3 Feb 2010 11:16:28 +0100
Subject: sb118: makefile dependencies fix

---
 cppuhelper/qa/propertysetmixin/makefile.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index bfd10bf02..2e8cf1088 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -113,11 +113,9 @@ $(MISC)/$(TARGET)/javamaker.flag: $(MISC)/$(TARGET)/types.rdb
     $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -Gc -X$(SOLARBINDIR)/types.rdb $<
     $(TOUCH) $@
 
-# The following dependency (to execute javac whenever javamaker has run) does
-# not work reliably, see #i28827#:
-$(JAVAFILES) $(JAVACLASSFILES): $(MISC)/$(TARGET)/javamaker.flag
+$(JAVATARGET): $(MISC)/$(TARGET)/javamaker.flag
 
-$(MISC)/$(TARGET)/$(TARGET).uno.jar: $(JAVACLASSFILES) \
+$(MISC)/$(TARGET)/$(TARGET).uno.jar: $(JAVATARGET) \
         $(MISC)/$(TARGET)/javamaker.flag manifest
     jar cfm $@ manifest -C $(CLASSDIR) test/cppuhelper/propertysetmixin
 
-- 
cgit v1.2.3


From 9baadd8346d9d75e2d86541abd51d03ea5258812 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 18 Feb 2010 09:51:41 +0100
Subject: sb118: eliminated dead code, causing warnings/errors

---
 sal/qa/OStringBuffer/rtl_String_Const.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index aa0901edd..b1a7ebe22 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -545,7 +545,6 @@ static const sal_Int32  expValStrLastNormal[nStrLastNormalCount] =
             0,-1,0,4,-1,-1,-1,-1,-1,3,15,11
         };
 //------------------------------------------------------------------------
-static const sal_Int32 kNonSInt64Max = LONG_MIN;
 static const sal_Int32 kNonSInt32Max = INT_MIN;
 static const sal_Int32 kNonSInt16Max = SHRT_MIN;
 //------------------------------------------------------------------------
-- 
cgit v1.2.3


From 646f85db3940b991ed01ac28b3aca05e0b628b49 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 18 Feb 2010 21:44:35 +0100
Subject: sb118: #i109415# fixed x86_64::classify_argument

---
 bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 29 +++++++++---------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index b51947b8a..1124e00fc 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -103,8 +103,6 @@ enum x86_64_reg_class
 
 #define MAX_CLASSES 4
 
-#define ALIGN(v, a) (((((size_t) (v))-1) | ((a)-1))+1)
-
 /* x86-64 register passing implementation.  See x86-64 ABI for details.  Goal
    of this code is to classify each 8bytes of incoming argument by the register
    class and assign registers accordingly.  */
@@ -156,11 +154,8 @@ merge_classes (enum x86_64_reg_class class1, enum x86_64_reg_class class2)
    See the x86-64 PS ABI for details.
 */
 static int
-classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int &rByteOffset )
+classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int byteOffset )
 {
-    /* First, align to the right place.  */
-    rByteOffset = ALIGN( rByteOffset, pTypeRef->pType->nAlignment );
-
     switch ( pTypeRef->eTypeClass )
     {
         case typelib_TypeClass_VOID:
@@ -176,13 +171,13 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
         case typelib_TypeClass_HYPER:
         case typelib_TypeClass_UNSIGNED_HYPER:
         case typelib_TypeClass_ENUM:
-            if ( ( rByteOffset % 8 + pTypeRef->pType->nSize ) <= 4 )
+            if ( ( byteOffset % 8 + pTypeRef->pType->nSize ) <= 4 )
                 classes[0] = X86_64_INTEGERSI_CLASS;
             else
                 classes[0] = X86_64_INTEGER_CLASS;
             return 1;
         case typelib_TypeClass_FLOAT:
-            if ( ( rByteOffset % 8 ) == 0 )
+            if ( ( byteOffset % 8 ) == 0 )
                 classes[0] = X86_64_SSESF_CLASS;
             else
                 classes[0] = X86_64_SSE_CLASS;
@@ -229,9 +224,9 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
                 for ( sal_Int32 nMember = 0; nMember < pStruct->nMembers; ++nMember )
                 {
                     typelib_TypeDescriptionReference *pTypeInStruct = pStruct->ppTypeRefs[ nMember ];
-                    rByteOffset = pStruct->pMemberOffsets[ nMember ];
+                    int offset = byteOffset + pStruct->pMemberOffsets[ nMember ];
 
-                    int num = classify_argument( pTypeInStruct, subclasses, rByteOffset );
+                    int num = classify_argument( pTypeInStruct, subclasses, offset );
 
                     if ( num == 0 )
                     {
@@ -241,7 +236,7 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
 
                     for ( int i = 0; i < num; i++ )
                     {
-                        int pos = rByteOffset / 8;
+                        int pos = offset / 8;
                         classes[i + pos] = merge_classes( subclasses[i], classes[i + pos] );
                     }
                 }
@@ -284,10 +279,9 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
 bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE )
 {
     enum x86_64_reg_class classes[MAX_CLASSES];
-    int offset = 0;
     int n;
 
-    n = classify_argument( pTypeRef, classes, offset );
+    n = classify_argument( pTypeRef, classes, 0 );
 
     if ( n == 0 )
         return false;
@@ -333,10 +327,9 @@ bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef
 void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64 *pGPR, const double *pSSE, void *pStruct )
 {
     enum x86_64_reg_class classes[MAX_CLASSES];
-    int offset = 0;
     int n;
 
-    n = classify_argument( pTypeRef, classes, offset );
+    n = classify_argument( pTypeRef, classes, 0 );
 
     sal_uInt64 *pStructAlign = reinterpret_cast<sal_uInt64 *>( pStruct );
     for ( n--; n >= 0; n-- )
@@ -444,10 +437,10 @@ ffi_prep_args (stackLayout *stack, extended_cif *ecif)
       /* All easy cases are eliminated. Now fire the big guns.  */
 
       enum x86_64_reg_class classes[MAX_CLASSES];
-      int offset = 0, j, num;
+      int j, num;
       void *a;
 
-      num = classify_argument (*p_arg, classes, &offset);
+      num = classify_argument (*p_arg, classes, 0);
       for (j=0, a=*p_argv; j<num; j++, a+=8)
         {
           switch (classes[j])
@@ -574,7 +567,7 @@ ffi_fill_return_value (return_value *rv, extended_cif *ecif)
             ;
     }
 
-    num = classify_argument (ecif->cif->rtype, classes, &i);
+    num = classify_argument (ecif->cif->rtype, classes, 0);
 
     if (num == 0)
         /* Return in memory.  */
-- 
cgit v1.2.3


From 77d8ea18969da46f1466f82b02e84a0a19884438 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 25 Feb 2010 14:34:54 +0100
Subject: sb118: #i109125# change source file copyright notice from Sun
 Microsystems to Oracle

---
 sal/cppunittester/cppunittester.cxx | 4 +++-
 sal/cppunittester/makefile.mk       | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index ad3ff5a98..1082e6ff9 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -1,7 +1,8 @@
 /*************************************************************************
+*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
-* Copyright 2010 by Sun Microsystems, Inc.
+* Copyright 2000, 2010 Oracle and/or its affiliates.
 *
 * OpenOffice.org - a multi-platform office productivity suite
 *
@@ -21,6 +22,7 @@
 * version 3 along with OpenOffice.org.  If not, see
 * <http://www.openoffice.org/license.html>
 * for a copy of the LGPLv3 License.
+*
 ************************************************************************/
 
 #include "precompiled_sal.hxx"
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index a87d1b182..a75fcb904 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -1,14 +1,11 @@
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,6 +22,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 PRJ = ..
-- 
cgit v1.2.3


From e3f6821818e5071dbc5d407b2887ca28c3da02a8 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 2 Mar 2010 15:37:18 +0100
Subject: sb118: vector::resize instead of vector::reserve to not access
 elements beyond vector::size

---
 sal/osl/w32/procimpl.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 2eb22829e..a2e645426 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -204,9 +204,9 @@ namespace /* private */
         if (!create_merged_environment(environment_vars, n_environment_vars, &merged_env))
             return false;
                 
-        // reserve enough space for the '\0'-separated environment strings and  
+        // allocate enough space for the '\0'-separated environment strings and
         // a final '\0'        
-        environment.reserve(calc_sum_of_string_lengths(merged_env) + 1);
+        environment.resize(calc_sum_of_string_lengths(merged_env) + 1);
                                            
         string_container_const_iterator_t iter = merged_env.begin();
         string_container_const_iterator_t iter_end = merged_env.end();
-- 
cgit v1.2.3


From 4341bb04cb3903ac6a22102863ca5418c241ffc8 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Wed, 3 Mar 2010 21:01:44 +0100
Subject: sb118: add --with-system-cppunit

---
 sal/prj/build.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 838384f76..c96c3977f 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,4 +1,4 @@
-sa	sal	:	xml2cmp stlport external BOOST:boost cppunit NULL 
+sa	sal	:	xml2cmp stlport external BOOST:boost CPPUNIT:cppunit NULL 
 sa	sal										usr1	-	all	sa_mkout NULL
 sa	sal\inc									nmake	-	all	sa_inc NULL
 sa	sal\typesconfig							nmake	-	u	sa_tc sa_inc NULL
-- 
cgit v1.2.3


From 3b9036d06f7a2030846a9b7ba2f6356fc443fea8 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Wed, 3 Mar 2010 21:57:02 +0100
Subject: sb118: CFLAGS += $(CPPUNIT_CFLAGS)

---
 sal/cppunittester/makefile.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index a75fcb904..1a9f84c02 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS += $(CPPUNIT_CFLAGS)
+.ENDIF
+
 OBJFILES = $(APP1OBJS)
 
 APP1OBJS = $(OBJ)/cppunittester.obj
-- 
cgit v1.2.3


From ac02cff0a3dd3d0bfb045407469d049ecb47bc92 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Thu, 4 Mar 2010 00:11:19 +0100
Subject: sb118: add missing CFLAGS+= $(CPPUNIT_CFLAGS) to loads of other
 makefiles, too

---
 codemaker/test/cppumaker/makefile.mk       | 4 ++++
 cppu/qa/makefile.mk                        | 4 ++++
 cppuhelper/qa/ifcontainer/makefile.mk      | 3 +++
 cppuhelper/qa/propertysetmixin/makefile.mk | 4 ++++
 cppuhelper/qa/unourl/makefile.mk           | 3 +++
 cppuhelper/qa/weak/makefile.mk             | 4 ++++
 sal/qa/rtl/alloc/makefile.mk               | 5 +++++
 sal/qa/rtl/bootstrap/makefile.mk           | 5 +++++
 sal/qa/rtl/cipher/makefile.mk              | 5 +++++
 sal/qa/rtl/crc32/makefile.mk               | 5 +++++
 sal/qa/rtl/digest/makefile.mk              | 5 +++++
 sal/qa/rtl/doublelock/makefile.mk          | 5 +++++
 sal/qa/rtl/locale/makefile.mk              | 5 +++++
 sal/qa/rtl/logfile/makefile.mk             | 5 +++++
 sal/qa/rtl/math/makefile.mk                | 5 +++++
 sal/qa/rtl/ostring/makefile.mk             | 5 +++++
 sal/qa/rtl/oustring/makefile.mk            | 5 +++++
 sal/qa/rtl/oustringbuffer/makefile.mk      | 5 +++++
 sal/qa/rtl/process/makefile.mk             | 5 +++++
 sal/qa/rtl/random/makefile.mk              | 5 +++++
 sal/qa/rtl/strings/makefile.mk             | 5 +++++
 sal/qa/rtl/textenc/makefile.mk             | 5 +++++
 sal/qa/rtl/uri/makefile.mk                 | 5 +++++
 sal/qa/rtl/uuid/makefile.mk                | 5 +++++
 salhelper/qa/makefile.mk                   | 4 ++++
 stoc/test/uriproc/makefile.mk              | 4 ++++
 26 files changed, 120 insertions(+)

diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index 3aa9dc65d..7bece447d 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 DLLPRE = # no leading "lib" on .so files
 
 INCPRE += $(MISC)$/$(TARGET)$/inc
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 51d9dfe22..3724f22d9 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 DLLPRE = # no leading "lib" on .so files
 
 INCPRE += $(MISC)$/$(TARGET)$/inc
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index 1e93701d3..4f3357d13 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
@@ -35,6 +35,9 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 03eb14b5c..5597dd4f1 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -45,6 +45,10 @@ my_file = file:///
 my_file = file://
 .END
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 DLLPRE = # no leading "lib" on .so files
 INCPRE += -I$(MISC)/$(TARGET)/inc
 
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index 9c4e3bc86..86a6671bf 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -35,6 +35,9 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
index 771edb26c..4fb9fda55 100644
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index ea22fbc27..be281236d 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:jobfile by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/bootstrap/makefile.mk b/sal/qa/rtl/bootstrap/makefile.mk
index e17f3c410..a678b0f18 100644
--- a/sal/qa/rtl/bootstrap/makefile.mk
+++ b/sal/qa/rtl/bootstrap/makefile.mk
@@ -50,6 +50,11 @@ MY_SCRIPTCAT=tr -d "\015" <
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index 73bf673f6..c3e6aa9a1 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index c936b51a3..1105f83de 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:jobfile by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk
index fceb9eac8..46307b651 100644
--- a/sal/qa/rtl/digest/makefile.mk
+++ b/sal/qa/rtl/digest/makefile.mk
@@ -41,6 +41,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 #----------------------------------- OStringBuffer -----------------------------------
 
 SHL1OBJS= \
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index a914dfa86..21be86341 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:testjob by codegen.pl
 
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index 490ee7b22..ea87ababe 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:locale by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/logfile/makefile.mk b/sal/qa/rtl/logfile/makefile.mk
index 92e3d30dd..ce1f8aef3 100644
--- a/sal/qa/rtl/logfile/makefile.mk
+++ b/sal/qa/rtl/logfile/makefile.mk
@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
     $(SLO)$/rtl_logfile.obj
diff --git a/sal/qa/rtl/math/makefile.mk b/sal/qa/rtl/math/makefile.mk
index a5cd21da6..8b7d68268 100644
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@ -41,6 +41,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 #----------------------------------- OStringBuffer -----------------------------------
 
 SHL1OBJS= \
diff --git a/sal/qa/rtl/ostring/makefile.mk b/sal/qa/rtl/ostring/makefile.mk
index bfb6c74c3..abbb7d292 100644
--- a/sal/qa/rtl/ostring/makefile.mk
+++ b/sal/qa/rtl/ostring/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/oustring/makefile.mk b/sal/qa/rtl/oustring/makefile.mk
index e65611410..e5232f0b9 100644
--- a/sal/qa/rtl/oustring/makefile.mk
+++ b/sal/qa/rtl/oustring/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk
index 7ba01bceb..03249f188 100644
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/process/makefile.mk b/sal/qa/rtl/process/makefile.mk
index ef79fc46c..6dca1aa70 100644
--- a/sal/qa/rtl/process/makefile.mk
+++ b/sal/qa/rtl/process/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk
index b97599240..c29cae93d 100644
--- a/sal/qa/rtl/random/makefile.mk
+++ b/sal/qa/rtl/random/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:job by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index e1a5dd3af..ccb9c35f3 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS := TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 SHL1TARGET := $(TARGET)
 SHL1OBJS := \
     $(SLO)$/test_oustringbuffer_utf32.obj \
diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk
index c9ab23910..942739b12 100644
--- a/sal/qa/rtl/textenc/makefile.mk
+++ b/sal/qa/rtl/textenc/makefile.mk
@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
     $(SLO)$/rtl_textcvt.obj
diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk
index 1858f5864..290a8ea0d 100644
--- a/sal/qa/rtl/uri/makefile.mk
+++ b/sal/qa/rtl/uri/makefile.mk
@@ -39,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
     $(SLO)$/rtl_Uri.obj
diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk
index 93890f0da..9c28af8e7 100644
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+CXXFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
 SHL1OBJS=  \
diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
index 1ce9ccb6f..8a9182ad8 100644
--- a/salhelper/qa/makefile.mk
+++ b/salhelper/qa/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_api.obj
 SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk
index 56349eea5..2195e7b9d 100644
--- a/stoc/test/uriproc/makefile.mk
+++ b/stoc/test/uriproc/makefile.mk
@@ -37,6 +37,10 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(SYSTEN_CPPUNIT)"=="YES"
+CFLAGS+= $(CPPUNIT_CFLAGS)
+.ENDIF
+
 DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
-- 
cgit v1.2.3


From 9952b402bafc2cf788458808b002ccd271db9f6f Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Thu, 4 Mar 2010 22:13:08 +0100
Subject: sb118: #i109791# improved CPPUNIT_CFLAGS handling

---
 codemaker/test/cppumaker/makefile.mk       | 4 +---
 cppu/qa/makefile.mk                        | 4 +---
 cppuhelper/qa/ifcontainer/makefile.mk      | 4 +---
 cppuhelper/qa/propertysetmixin/makefile.mk | 5 +----
 cppuhelper/qa/unourl/makefile.mk           | 4 +---
 cppuhelper/qa/weak/makefile.mk             | 5 +----
 sal/cppunittester/makefile.mk              | 4 +---
 sal/qa/ByteSequence/makefile.mk            | 2 ++
 sal/qa/OStringBuffer/makefile.mk           | 2 ++
 sal/qa/osl/mutex/makefile.mk               | 2 ++
 sal/qa/osl/pipe/makefile.mk                | 2 ++
 sal/qa/osl/profile/makefile.mk             | 2 ++
 sal/qa/rtl/alloc/makefile.mk               | 5 +----
 sal/qa/rtl/bootstrap/makefile.mk           | 5 +----
 sal/qa/rtl/cipher/makefile.mk              | 5 +----
 sal/qa/rtl/crc32/makefile.mk               | 5 +----
 sal/qa/rtl/digest/makefile.mk              | 5 +----
 sal/qa/rtl/doublelock/makefile.mk          | 5 +----
 sal/qa/rtl/locale/makefile.mk              | 5 +----
 sal/qa/rtl/logfile/makefile.mk             | 5 +----
 sal/qa/rtl/math/makefile.mk                | 5 +----
 sal/qa/rtl/ostring/makefile.mk             | 5 +----
 sal/qa/rtl/oustring/makefile.mk            | 5 +----
 sal/qa/rtl/oustringbuffer/makefile.mk      | 5 +----
 sal/qa/rtl/process/makefile.mk             | 5 +----
 sal/qa/rtl/random/makefile.mk              | 5 +----
 sal/qa/rtl/strings/makefile.mk             | 5 +----
 sal/qa/rtl/textenc/makefile.mk             | 5 +----
 sal/qa/rtl/uri/makefile.mk                 | 5 +----
 sal/qa/rtl/uuid/makefile.mk                | 5 +----
 salhelper/qa/makefile.mk                   | 4 +---
 stoc/test/uriproc/makefile.mk              | 5 +----
 32 files changed, 37 insertions(+), 102 deletions(-)

diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index 7bece447d..964ae166c 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 DLLPRE = # no leading "lib" on .so files
 
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 3724f22d9..b40d3512e 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 DLLPRE = # no leading "lib" on .so files
 
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index 4f3357d13..3277b4c20 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
@@ -35,9 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 5597dd4f1..edd4795fc 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -45,12 +45,9 @@ my_file = file:///
 my_file = file://
 .END
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
-
 DLLPRE = # no leading "lib" on .so files
 INCPRE += -I$(MISC)/$(TARGET)/inc
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)/test_propertysetmixin.obj
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index 86a6671bf..de2c05d40 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -35,9 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
index 4fb9fda55..543e87118 100644
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
@@ -33,10 +33,7 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
-
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index 1a9f84c02..938b63d90 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS += $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 OBJFILES = $(APP1OBJS)
 
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index a85aca06b..972444ca8 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -45,6 +45,8 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 #----------------------------------- OStringBuffer -----------------------------------
 
 SHL1OBJS= \
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index ade99a6bf..d46168dc4 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -45,6 +45,8 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies
 # SLOFILES= \
diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk
index a4a962981..de4121e3a 100755
--- a/sal/qa/osl/mutex/makefile.mk
+++ b/sal/qa/osl/mutex/makefile.mk
@@ -43,6 +43,8 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Socket by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/osl/pipe/makefile.mk b/sal/qa/osl/pipe/makefile.mk
index 9bb672639..6350cdba0 100644
--- a/sal/qa/osl/pipe/makefile.mk
+++ b/sal/qa/osl/pipe/makefile.mk
@@ -43,6 +43,8 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Pipe by codegen.pl
 SHL1OBJS=  \
diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk
index 631e4d0d4..a95db211c 100644
--- a/sal/qa/osl/profile/makefile.mk
+++ b/sal/qa/osl/profile/makefile.mk
@@ -44,6 +44,8 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 # BEGIN ----------------------------------------------------------------
 SHL1OBJS=  \
     $(SLO)$/osl_old_testprofile.obj
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index be281236d..37ae3718b 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:jobfile by codegen.pl
diff --git a/sal/qa/rtl/bootstrap/makefile.mk b/sal/qa/rtl/bootstrap/makefile.mk
index a678b0f18..d32f9db35 100644
--- a/sal/qa/rtl/bootstrap/makefile.mk
+++ b/sal/qa/rtl/bootstrap/makefile.mk
@@ -50,10 +50,7 @@ MY_SCRIPTCAT=tr -d "\015" <
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index c3e6aa9a1..b89e392d7 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index 1105f83de..6bd3bd89d 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:jobfile by codegen.pl
diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk
index 46307b651..415183b7e 100644
--- a/sal/qa/rtl/digest/makefile.mk
+++ b/sal/qa/rtl/digest/makefile.mk
@@ -41,10 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 #----------------------------------- OStringBuffer -----------------------------------
 
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 21be86341..b13ccf420 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:testjob by codegen.pl
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index ea87ababe..329769b5d 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:locale by codegen.pl
diff --git a/sal/qa/rtl/logfile/makefile.mk b/sal/qa/rtl/logfile/makefile.mk
index ce1f8aef3..9b52e0a45 100644
--- a/sal/qa/rtl/logfile/makefile.mk
+++ b/sal/qa/rtl/logfile/makefile.mk
@@ -39,10 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/math/makefile.mk b/sal/qa/rtl/math/makefile.mk
index 8b7d68268..3b35e52ab 100644
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@ -41,10 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 #----------------------------------- OStringBuffer -----------------------------------
 
diff --git a/sal/qa/rtl/ostring/makefile.mk b/sal/qa/rtl/ostring/makefile.mk
index abbb7d292..06469b38a 100644
--- a/sal/qa/rtl/ostring/makefile.mk
+++ b/sal/qa/rtl/ostring/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/sal/qa/rtl/oustring/makefile.mk b/sal/qa/rtl/oustring/makefile.mk
index e5232f0b9..6f1563765 100644
--- a/sal/qa/rtl/oustring/makefile.mk
+++ b/sal/qa/rtl/oustring/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk
index 03249f188..544f7b7df 100644
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/sal/qa/rtl/process/makefile.mk b/sal/qa/rtl/process/makefile.mk
index 6dca1aa70..5df9dc015 100644
--- a/sal/qa/rtl/process/makefile.mk
+++ b/sal/qa/rtl/process/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk
index c29cae93d..cd57ec9bc 100644
--- a/sal/qa/rtl/random/makefile.mk
+++ b/sal/qa/rtl/random/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:job by codegen.pl
diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index ccb9c35f3..3c1b92196 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -37,10 +37,7 @@ ENABLE_EXCEPTIONS := TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 SHL1TARGET := $(TARGET)
 SHL1OBJS := \
diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk
index 942739b12..597309d9b 100644
--- a/sal/qa/rtl/textenc/makefile.mk
+++ b/sal/qa/rtl/textenc/makefile.mk
@@ -39,10 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk
index 290a8ea0d..d4a8814cc 100644
--- a/sal/qa/rtl/uri/makefile.mk
+++ b/sal/qa/rtl/uri/makefile.mk
@@ -39,10 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- BEGIN --------------------------------------------------------
 SHL1OBJS=  \
diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk
index 9c28af8e7..40e583f8b 100644
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -40,10 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-CXXFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:joblist by codegen.pl
diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
index 8a9182ad8..fe2aff745 100644
--- a/salhelper/qa/makefile.mk
+++ b/salhelper/qa/makefile.mk
@@ -33,9 +33,7 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_api.obj
diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk
index 2195e7b9d..cfdc33e75 100644
--- a/stoc/test/uriproc/makefile.mk
+++ b/stoc/test/uriproc/makefile.mk
@@ -37,10 +37,7 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-.IF "$(SYSTEN_CPPUNIT)"=="YES"
-CFLAGS+= $(CPPUNIT_CFLAGS)
-.ENDIF
-
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
 SHL1TARGET = $(TARGET)
-- 
cgit v1.2.3


From c4d2bd89eb5c97d6ddb60cc72c9cd5061342bd63 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Fri, 5 Mar 2010 13:47:05 +0100
Subject: fix build of sal/qa (missing #include <stringh.h>)

---
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 2 ++
 sal/qa/osl/pipe/osl_Pipe.cxx               | 1 +
 2 files changed, 3 insertions(+)

diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 5e1861d52..2b091f440 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -40,6 +40,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
 
+#include <string.h>
+
 using namespace rtl;
 
 //------------------------------------------------------------------------
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 518e57374..5a6e9afc5 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -55,6 +55,7 @@
 #ifdef UNX
 #include <unistd.h>
 #endif
+#include <string.h>
 
 using namespace osl;
 using namespace rtl;
-- 
cgit v1.2.3


From d3a43dc6533c83be670643f8b66ff1ec8435ef62 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@openoffice.org>
Date: Thu, 11 Mar 2010 07:19:31 +0100
Subject: dtardon02: #i108502# remove empty file in salhelper

---
 salhelper/source/staticmb.cxx | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 salhelper/source/staticmb.cxx

diff --git a/salhelper/source/staticmb.cxx b/salhelper/source/staticmb.cxx
deleted file mode 100644
index 41cf7b326..000000000
--- a/salhelper/source/staticmb.cxx
+++ /dev/null
@@ -1,26 +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.
- *
- ************************************************************************/
-- 
cgit v1.2.3


From 4e6cbcc5afa6ea5819994e94af051c794baf29c3 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Tue, 6 Apr 2010 14:03:50 +0100
Subject: dtardon02: #i108502# remove SCO makefile.mk entry

---
 salhelper/source/makefile.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index 4eb278f42..a6b83cb5e 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -48,11 +48,6 @@ SLOFILES=	\
     $(SLO)$/dynload.obj \
     $(SLO)$/simplereferenceobject.obj
 
-# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "$(OS)"=="SCO"
-SLOFILES+=$(SLO)$/staticmb.obj
-.ENDIF
-
 .IF "$(GUI)" == "WNT"
 SHL1TARGET=	$(TARGET)$(UDK_MAJOR)$(COMID)
 .ELIF "$(GUI)" == "OS2"
-- 
cgit v1.2.3