Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (185 commits)
chart52: cleanup unused legend entry stuff in preparation of issue #i82802#
masterfix: #i10000# add missing dependency in offapi
sb138: #i115619# fix for MinGW
sb138: #i115619#, #i116038# use osl_setThreadName in binaryurp
sb138: #i115619# osl_setThreadName
gridsort: i116682: update UnoControlDialog to reflect XDialog
gridsort: minor changes to the new API: - renamed XMutableGridDataModel::setRowHeading to updateRowHeading for consistency reasons - renamed XSortableGridDataModel to XSortableGridData - actually, this is not a full-fledged model in itself.
gridsort: grid control related unit tests (first set, more to come)
sb138: #i116038# fresh implementation of binary URP bridge
chart52: #28670# make the legend within charts resizeable - part 2
gridsort: re-did the column resizing - introduced XGridColumn.Flexibility, determining to which degree the column is resized during auto-column-resizing - removed XGridColumn.PreferredWidth - there really is no need for this anymore now - documented the relationship between XGridColumn.Flexibility and XGridColumn.Resizeable - re-implemented TableControl_Impl::impl_ni_updateColumnWidths, with (hopefully) less magic
sb139: #i116530# improve Java URP bridge error notification by utilizing the java.lang.Throwable cause facility
gridsort: document the relationship between soorting the data and notifying XGridDataListeners
gridsort: introduce XGridColumn::DataModelIndex. this allows for column removal/insertion at the GridColumnModel, without the need to touch the GridDataModel
locales34: #i112431# adapt documentation to reality
gridsort: introduce XSortableGridDataModel::removeColumnSort
gridsort: #163172# added UNO API support for sorting grid data. Implementation still unfinished. Things missing in the SortableGridData implementation - add as listener to the delegator, so we're notified of changes - translate and multiplex those changes - do own notifications (XGridDataListener.dataChanged) when the sort order changed - (possibly) update the sort order when the data in the current sort-column changed
gridsort: made the row title a row heading, being an Any instead of a string
gridsort: XMutableGridData: renamed updateRow to updateRowData for consistency; introduced updateRowToolTip as shortcut for multiple updateCellToolTip calls
gridsort: updateCell->updateCellData, setCellToolTip->updateCellToolTip; in both methods, have (Col,Row) params instead of (Row,Col), for consistency reasons
...

Conflicts:
bridges/inc/bridges/remote/bridgeimpl.hxx
bridges/inc/bridges/remote/connection.h
bridges/inc/bridges/remote/context.h
bridges/inc/bridges/remote/helper.hxx
bridges/inc/bridges/remote/mapping.hxx
bridges/inc/bridges/remote/proxy.hxx
bridges/inc/bridges/remote/remote.h
bridges/inc/bridges/remote/remote.hxx
bridges/inc/bridges/remote/stub.hxx
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
bridges/source/remote/context/context.cxx
bridges/source/remote/static/helper.cxx
bridges/source/remote/static/mapping.cxx
bridges/source/remote/static/proxy.cxx
bridges/source/remote/static/remote.cxx
bridges/source/remote/static/remote_types.cxx
bridges/source/remote/static/remote_types.hxx
bridges/source/remote/static/stub.cxx
bridges/source/remote/urp/urp_bridgeimpl.cxx
bridges/source/remote/urp/urp_bridgeimpl.hxx
bridges/source/remote/urp/urp_cache.h
bridges/source/remote/urp/urp_cache.hxx
bridges/source/remote/urp/urp_dispatch.cxx
bridges/source/remote/urp/urp_dispatch.hxx
bridges/source/remote/urp/urp_environment.cxx
bridges/source/remote/urp/urp_job.cxx
bridges/source/remote/urp/urp_job.hxx
bridges/source/remote/urp/urp_log.cxx
bridges/source/remote/urp/urp_log.hxx
bridges/source/remote/urp/urp_marshal.cxx
bridges/source/remote/urp/urp_marshal.hxx
bridges/source/remote/urp/urp_marshal_decl.hxx
bridges/source/remote/urp/urp_property.hxx
bridges/source/remote/urp/urp_propertyobject.cxx
bridges/source/remote/urp/urp_propertyobject.hxx
bridges/source/remote/urp/urp_reader.cxx
bridges/source/remote/urp/urp_reader.hxx
bridges/source/remote/urp/urp_replycontainer.hxx
bridges/source/remote/urp/urp_threadid.cxx
bridges/source/remote/urp/urp_threadid.hxx
bridges/source/remote/urp/urp_unmarshal.cxx
bridges/source/remote/urp/urp_unmarshal.hxx
bridges/source/remote/urp/urp_writer.cxx
bridges/source/remote/urp/urp_writer.hxx
cppu/source/threadpool/threadpool.cxx
cppu/util/target.pmk
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
cppuhelper/source/interfacecontainer.cxx
cpputools/source/regcomplazy/regcomplazy.cxx
jurt/prj/d.lst
jvmfwk/source/elements.cxx
offapi/com/sun/star/awt/grid/GridDataEvent.idl
offapi/com/sun/star/awt/grid/XGridColumn.idl
offapi/com/sun/star/awt/tab/makefile.mk
offapi/com/sun/star/chart2/ExplicitIncrementData.idl
offapi/com/sun/star/chart2/XPlotter.idl
offapi/com/sun/star/chart2/XUndoHelper.idl
offapi/com/sun/star/document/MediaDescriptor.idl
offapi/com/sun/star/document/makefile.mk
offapi/com/sun/star/linguistic2/XLanguageGuessing.idl
offapi/com/sun/star/script/ModuleInfo.idl
offapi/com/sun/star/script/ModuleType.idl
offapi/com/sun/star/text/TextMarkupType.idl
offapi/com/sun/star/util/XTextSearch.idl
offapi/com/sun/star/xml/sax/XFastAttributeList.idl
pyuno/source/loader/makefile.mk
remotebridges/source/bridge/bridge_connection.cxx
remotebridges/source/bridge/bridge_connection.hxx
remotebridges/source/bridge/bridge_provider.cxx
remotebridges/source/bridge/remote_bridge.cxx
remotebridges/source/bridge/remote_bridge.hxx
remotebridges/source/dynamicloader/dynamicloader.cxx
remotebridges/source/factory/bridgefactory.cxx
remotebridges/source/factory/bridgeimpl.cxx
remotebridges/source/factory/bridgeimpl.hxx
remotebridges/source/factory/makefile.mk
sal/cppunittester/cppunittester.cxx
sal/inc/osl/diagnose.h
sal/osl/os2/system.h
sal/osl/unx/diagnose.c
sal/osl/unx/file_misc.cxx
sal/osl/unx/process_impl.cxx
sal/osl/w32/diagnose.c
sal/osl/w32/process.cxx
sal/prj/build.lst
sal/qa/rtl/math/makefile.mk
sal/qa/rtl/math/rtl_math.cxx
sal/qa/rtl/math/rtl_old_testint64.cxx
sal/qa/rtl/math/test_rtl_math.cxx
sal/systools/win32/kill/kill.cxx
sal/textenc/tencinfo.c
sal/util/sal.map
stoc/source/inspect/introspection.cxx
stoc/source/security/file_policy.cxx
stoc/source/simpleregistry/simpleregistry.cxx

1 files changed, 44 insertions, 43 deletions

diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 6edf247e5061..055c1440ecee 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -37,6 +37,7 @@
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
+#include "test/uniquepipename.hxx"
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
@@ -184,8 +185,8 @@ namespace osl_Pipe
         void ctors_name_option( )
             {
                 /// create a named pipe.
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
-                ::osl::Pipe aAssignPipe( aTestPipeName, osl_Pipe_OPEN );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
+                ::osl::Pipe aAssignPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
 
                 bRes = aPipe.is( ) && aAssignPipe.is( );
 
@@ -197,7 +198,7 @@ namespace osl_Pipe
             {
                 /// create a security pipe.
                 const ::osl::Security rSecurity;
-                ::osl::Pipe aSecurityPipe( aTestPipeName, osl_Pipe_CREATE, rSecurity );
+                ::osl::Pipe aSecurityPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSecurity );
 
                 bRes = aSecurityPipe.is( );
 
@@ -208,7 +209,7 @@ namespace osl_Pipe
         void ctors_copy( )
             {
                 /// create a pipe.
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 /// create a pipe using copy constructor.
                 ::osl::Pipe aCopyPipe( aPipe );
 
@@ -231,7 +232,7 @@ namespace osl_Pipe
         void ctors_no_acquire( )
             {
                 /// create a pipe.
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 /// constructs a pipe reference without acquiring the handle.
                 ::osl::Pipe aNoAcquirePipe( aPipe.getHandle( ), SAL_NO_ACQUIRE );
 
@@ -247,7 +248,7 @@ namespace osl_Pipe
         void ctors_acquire( )
             {
                 /// create a base pipe.
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 /// constructs two pipes without acquiring the handle on the base pipe.
                 ::osl::Pipe aAcquirePipe( aPipe.getHandle( ) );
                 ::osl::Pipe aAcquirePipe1( NULL );
@@ -285,14 +286,14 @@ namespace osl_Pipe
 
         void is_002( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), a normal pipe creation.", sal_True == aPipe.is( ) );
             }
 
         void is_003( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test is(), an invalid case.", sal_False == aPipe.is( ) );
@@ -335,8 +336,8 @@ namespace osl_Pipe
             {
                 const Security rSec;
                 ::osl::Pipe aPipe;
-                bRes = aPipe.create( aTestPipeName, osl_Pipe_CREATE, rSec );
-                bRes1 = aPipe.create( aTestPipeName, osl_Pipe_CREATE, rSec );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSec );
+                bRes1 = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSec );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation.",
@@ -347,8 +348,8 @@ namespace osl_Pipe
             {
                 const Security rSec;
                 ::osl::Pipe aPipe, aPipe1;
-                bRes = aPipe.create( aTestPipeName, osl_Pipe_CREATE, rSec );
-                bRes1 = aPipe1.create( aTestPipeName, osl_Pipe_OPEN, rSec );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSec );
+                bRes1 = aPipe1.create( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN, rSec );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation and open.",
@@ -358,8 +359,8 @@ namespace osl_Pipe
         void create_named_001( )
             {
                 ::osl::Pipe aPipe;
-                bRes = aPipe.create( aTestPipeName, osl_Pipe_CREATE );
-                bRes1 = aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
+                bRes1 = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation.",
@@ -369,8 +370,8 @@ namespace osl_Pipe
         void create_named_002( )
             {
                 ::osl::Pipe aPipe, aPipe1;
-                bRes = aPipe.create( aTestPipeName, osl_Pipe_CREATE );
-                bRes1 = aPipe1.create( aTestPipeName, osl_Pipe_OPEN );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
+                bRes1 = aPipe1.create( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test creation and open.",
@@ -380,7 +381,7 @@ namespace osl_Pipe
         void create_named_003( )
             {
                 ::osl::Pipe aPipe;
-                bRes = aPipe.create( aTestPipeName );
+                bRes = aPipe.create( test::uniquePipeName(aTestPipeName) );
                 aPipe.clear( );
 
                 CPPUNIT_ASSERT_MESSAGE( "#test comment#: test default option is open.",
@@ -408,7 +409,7 @@ namespace osl_Pipe
         void clear_001( )
             {
                 ::osl::Pipe aPipe;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe.clear( );
                 bRes = aPipe.is( );
 
@@ -434,7 +435,7 @@ namespace osl_Pipe
         void assign_ref( )
             {
                 ::osl::Pipe aPipe, aPipe1;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe1 = aPipe;
                 bRes = aPipe1.is( );
                 bRes1 = aPipe == aPipe1;
@@ -448,7 +449,7 @@ namespace osl_Pipe
         void assign_handle( )
             {
                 ::osl::Pipe aPipe, aPipe1;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 aPipe1 = aPipe.getHandle( );
                 bRes = aPipe1.is( );
                 bRes1 = aPipe == aPipe1;
@@ -498,7 +499,7 @@ namespace osl_Pipe
         void isEqual_001( )
             {
                 ::osl::Pipe aPipe;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 bRes  = aPipe == aPipe;
                 aPipe.close( );
 
@@ -509,10 +510,10 @@ namespace osl_Pipe
         void isEqual_002( )
             {
                 ::osl::Pipe aPipe, aPipe1, aPipe2;
-                aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
 
                 aPipe1 = aPipe;
-                aPipe2.create( aTestPipeName, osl_Pipe_CREATE );
+                aPipe2.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
 
                 bRes  = aPipe == aPipe1;
                 bRes1 = aPipe == aPipe2;
@@ -541,7 +542,7 @@ namespace osl_Pipe
 
         void close_001( )
             {
-                ::osl::Pipe aPipe( aTestPipe1, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipe1), osl_Pipe_CREATE );
                 aPipe.close( );
                 bRes = aPipe.is( );
 
@@ -554,7 +555,7 @@ namespace osl_Pipe
 
         void close_002( )
             {
-                ::osl::StreamPipe aPipe( aTestPipe1, osl_Pipe_CREATE );
+                ::osl::StreamPipe aPipe( test::uniquePipeName(aTestPipe1), osl_Pipe_CREATE );
                 aPipe.close( );
                 int nRet = aPipe.send( m_pTestString1.getStr(), 3 );
 
@@ -622,7 +623,7 @@ namespace osl_Pipe
 
         void getError_001( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_OPEN );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
                 oslPipeError nError = aPipe.getError( );
                 printPipeError( aPipe );
                 aPipe.clear( );
@@ -633,8 +634,8 @@ namespace osl_Pipe
 
         void getError_002( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
-                ::osl::Pipe aPipe1( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
+                ::osl::Pipe aPipe1( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 oslPipeError nError = aPipe.getError( );
                 printPipeError( aPipe );
                 aPipe.clear( );
@@ -661,7 +662,7 @@ namespace osl_Pipe
 
         void getHandle_001( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_OPEN );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
                 bRes = aPipe == aPipe.getHandle( );
                 aPipe.clear( );
 
@@ -671,7 +672,7 @@ namespace osl_Pipe
 
         void getHandle_002( )
             {
-                ::osl::Pipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::Pipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 ::osl::Pipe aPipe1( aPipe.getHandle( ) );
                 bRes = aPipe == aPipe1;
                 aPipe.clear( );
@@ -724,7 +725,7 @@ namespace osl_StreamPipe
         void ctors_none( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aStreamPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aStreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // create an unattached pipe.
                 ::osl::StreamPipe aStreamPipe1;
                 bRes  = aStreamPipe1.is( );
@@ -742,7 +743,7 @@ namespace osl_StreamPipe
         void ctors_handle( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aStreamPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aStreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // create a pipe with last handle.
                 ::osl::StreamPipe aStreamPipe1( aStreamPipe.getHandle( ) );
                 bRes  = aStreamPipe1.is( ) && aStreamPipe == aStreamPipe1;
@@ -756,7 +757,7 @@ namespace osl_StreamPipe
         void ctors_copy( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aStreamPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aStreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // create an unattached pipe.
                 ::osl::StreamPipe aStreamPipe1( aStreamPipe );
                 bRes  = aStreamPipe1.is( ) && aStreamPipe == aStreamPipe1;
@@ -770,9 +771,9 @@ namespace osl_StreamPipe
         void ctors_name_option( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aStreamPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aStreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // create an unattached pipe.
-                ::osl::StreamPipe aStreamPipe1( aTestPipeName, osl_Pipe_OPEN );
+                ::osl::StreamPipe aStreamPipe1( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );
                 bRes  = aStreamPipe1.is( ) && aStreamPipe.is( );
                 aStreamPipe.clear( );
                 aStreamPipe1.clear( );
@@ -785,7 +786,7 @@ namespace osl_StreamPipe
             {
                 /// create a security pipe.
                 const ::osl::Security rSecurity;
-                ::osl::StreamPipe aSecurityPipe( aTestPipeName, osl_Pipe_CREATE, rSecurity );
+                ::osl::StreamPipe aSecurityPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE, rSecurity );
 
                 bRes = aSecurityPipe.is( );
                 aSecurityPipe.clear( );
@@ -807,7 +808,7 @@ namespace osl_StreamPipe
         void ctors_no_acquire( )
             {
                 // create a pipe.
-                ::osl::StreamPipe aPipe( aTestPipeName, osl_Pipe_CREATE );
+                ::osl::StreamPipe aPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 // constructs a pipe reference without acquiring the handle.
                 ::osl::StreamPipe aNoAcquirePipe( aPipe.getHandle( ), SAL_NO_ACQUIRE );
 
@@ -844,7 +845,7 @@ namespace osl_StreamPipe
        void assign_ref( )
        {
        ::osl::StreamPipe aPipe, aPipe1;
-       aPipe.create( aTestPipeName, osl_Pipe_CREATE );
+       aPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
        aPipe1 = aPipe;
        bRes = aPipe1.is( );
        bRes1 = aPipe == aPipe1;
@@ -857,7 +858,7 @@ namespace osl_StreamPipe
 
        void assign_handle( )
        {
-       ::osl::StreamPipe * pPipe = new ::osl::StreamPipe( aTestPipeName, osl_Pipe_CREATE );
+       ::osl::StreamPipe * pPipe = new ::osl::StreamPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
        ::osl::StreamPipe * pAssignPipe = new ::osl::StreamPipe;
        *pAssignPipe = pPipe->getHandle( );
 
@@ -912,7 +913,7 @@ namespace osl_StreamPipe
                 sal_Int32 nChars = 0;
 
                 printf("open pipe\n");
-                ::osl::StreamPipe aSenderPipe( aTestPipeName, osl_Pipe_OPEN );  // aTestPipeName is a string = "TestPipe"
+                ::osl::StreamPipe aSenderPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_OPEN );  // test::uniquePipeName(aTestPipeName) is a string = "TestPipe"
                 if ( aSenderPipe.is() == sal_False )
                 {
                     printf("pipe open failed! \n");
@@ -945,13 +946,13 @@ namespace osl_StreamPipe
     {
     public:
         sal_Char buf[256];
-        //::osl::StreamPipe aListenPipe;  //( aTestPipeName, osl_Pipe_CREATE );
+        //::osl::StreamPipe aListenPipe;  //( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
         ::osl::Pipe aListenPipe;
         ::osl::StreamPipe aConnectionPipe;
         Pipe_DataSource_Thread( )
             {
                 printf("create pipe\n");
-                aListenPipe.create( aTestPipeName, osl_Pipe_CREATE );
+                aListenPipe.create( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
             }
         ~Pipe_DataSource_Thread( )
             {
@@ -962,7 +963,7 @@ namespace osl_StreamPipe
             {
                 //create pipe.
                 sal_Int32 nChars;
-                //::osl::StreamPipe aListenPipe( aTestPipeName, osl_Pipe_CREATE );
+                //::osl::StreamPipe aListenPipe( test::uniquePipeName(aTestPipeName), osl_Pipe_CREATE );
                 printf("listen\n");
                 if ( aListenPipe.is() == sal_False )
                 {