diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 16:12:08 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 16:48:34 -0500 |
| commit | acb7bd175abe6c7f793cc673feaab46c90b9a260 (patch) | |
| tree | 206be73ecd4a2af07310e8efe348f9647382d331 | |
| parent | d29d9399d48f85989cc8040f5ba334c38b40a544 (diff) | |
targeted string re-work
Change-Id: I145731d9f28faf0065f5960f2c5a32f27d8c8620
41 files changed, 1111 insertions, 1241 deletions
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 7a54cd234209..06b4c5411a89 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -120,7 +120,7 @@ void ODataStreamTest::testInvariant( throw ( IllegalArgumentException, RuntimeException) { - if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ) { + if( OUString("com.sun.star.io.DataInputStream") == TestName ) { Reference < XConnectable > connect( TestObject , UNO_QUERY ); Reference < XActiveDataSink > active( TestObject , UNO_QUERY ); Reference < XInputStream > input( TestObject , UNO_QUERY ); @@ -133,7 +133,7 @@ void ODataStreamTest::testInvariant( } - else if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ) { + else if( OUString("com.sun.star.io.DataInputStream") == TestName ) { Reference < XConnectable > connect( TestObject , UNO_QUERY ); Reference < XActiveDataSource > active( TestObject , UNO_QUERY ); Reference < XOutputStream > output( TestObject , UNO_QUERY ); @@ -151,7 +151,7 @@ void ODataStreamTest::testInvariant( if( info.is() ) { ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" ); - ERROR_ASSERT( ! info->supportsService( OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" ); + ERROR_ASSERT( ! info->supportsService( OUString("bla bluzb") ) , "XServiceInfo test failed" ); } } @@ -164,8 +164,8 @@ sal_Int32 ODataStreamTest::test( throw ( IllegalArgumentException, RuntimeException) { - if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName || - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) == TestName ) { + if( OUString("com.sun.star.io.DataInputStream") == TestName || + OUString("com.sun.star.io.DataOutputStream") == TestName ) { try { @@ -181,21 +181,21 @@ sal_Int32 ODataStreamTest::test( Reference < XInterface > x = m_rFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe" ))); + OUString( "com.sun.star.io.Pipe" )); Reference < XInputStream > rPipeInput( x , UNO_QUERY ); Reference < XOutputStream > rPipeOutput( x , UNO_QUERY ); if( ! rSink.is() ) { x = m_rFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) ); + OUString( "com.sun.star.io.DataInputStream") ); rInput = Reference < XDataInputStream > ( x , UNO_QUERY); rSink = Reference< XActiveDataSink > ( x , UNO_QUERY ); } else if ( !rSource.is() ) { x = m_rFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream") ) ); + OUString( "com.sun.star.io.DataOutputStream" ) ); rOutput = Reference< XDataOutputStream > ( x , UNO_QUERY ); rSource = Reference< XActiveDataSource > ( x, UNO_QUERY ); } @@ -290,8 +290,8 @@ void ODataStreamTest::testSimple( const Reference < XDataInputStream > &rInput rOutput->writeHyper( 0x123456789abcdefLL ); ERROR_ASSERT( rInput->readHyper() == 0x123456789abcdefLL , "int64 read/write mismatch" ); - rOutput->writeUTF( OUString(RTL_CONSTASCII_USTRINGPARAM("Live long and prosper !")) ); - ERROR_ASSERT( rInput->readUTF() == OUString(RTL_CONSTASCII_USTRINGPARAM("Live long and prosper !")) , + rOutput->writeUTF( OUString("Live long and prosper !") ); + ERROR_ASSERT( rInput->readUTF() == OUString("Live long and prosper !") , "UTF read/write mismatch" ); Sequence<sal_Unicode> wc(0x10001); @@ -365,10 +365,10 @@ Sequence<OUString> ODataStreamTest_getSupportedServiceNames( int i) throw () OUString ODataStreamTest_getServiceName( int i) throw () { if( 1 == i ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.DataInputStream" )); + return OUString( "test.com.sun.star.io.DataInputStream" ); } else { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.DataOutputStream" )); + return OUString( "test.com.sun.star.io.DataOutputStream" ); } } @@ -376,11 +376,10 @@ OUString ODataStreamTest_getImplementationName( int i) throw () { if( 1 == i ) { return OUString( - RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.DataInputStream") ); + "test.com.sun.star.comp.extensions.stm.DataInputStream" ); } else { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "test.com.sun.star.comp.extensions.stm.DataOutputStream" ) ); + return OUString( "test.com.sun.star.comp.extensions.stm.DataOutputStream" ); } } @@ -394,7 +393,7 @@ public: m_b( sal_True ), m_byte( 42 ), m_c( 429 ), - m_s( OUString( RTL_CONSTASCII_USTRINGPARAM( "foo" ) ) ) + m_s( OUString( "foo" ) ) {} MyPersistObject( const OUString & sServiceName ) : m_sServiceName( sServiceName ) {} @@ -639,12 +638,12 @@ Sequence<OUString> OMyPersistObject_getSupportedServiceNames( ) throw () OUString OMyPersistObject_getServiceName( ) throw () { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest" )); + return OUString( "test.com.sun.star.io.PersistTest" ); } OUString OMyPersistObject_getImplementationName( ) throw () { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.io.PersistTest" ) ); + return OUString( "test.com.sun.star.io.PersistTest" ); } class OObjectStreamTest : @@ -680,7 +679,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName, throw ( IllegalArgumentException, RuntimeException) { - if( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.ObjectInputStream" ) ) + if( OUString( "com.sun.star.io.ObjectInputStream" ) == TestName ) { ODataStreamTest::testInvariant( TestName , TestObject ); @@ -689,7 +688,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName, ERROR_ASSERT( dataInput.is() , "XObjectInputStream cannot be queried" ); ERROR_ASSERT( markable.is() , "XMarkableStream cannot be queried" ); } - else if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectOutputStream") ) + else if( OUString( "com.sun.star.io.ObjectOutputStream" ) == TestName ) { ODataStreamTest::testInvariant( TestName , TestObject ); @@ -704,7 +703,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName, if( info.is() ) { ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" ); - ERROR_ASSERT( ! info->supportsService( OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" ); + ERROR_ASSERT( ! info->supportsService( OUString("bla bluzb") ) , "XServiceInfo test failed" ); } } @@ -726,7 +725,7 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, else if( DATASTREAM_TEST_MAX_HANDLE >= hTestHandle ) { sal_Int32 hOldHandle = hTestHandle; hTestHandle = ODataStreamTest::test( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream" )), + OUString( "com.sun.star.io.DataInputStream" ), TestObject , hTestHandle ); if( hTestHandle == -1 ){ hTestHandle = hOldHandle; @@ -742,19 +741,19 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, Reference < XInterface > x = m_rFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe" )) ); + OUString( "com.sun.star.io.Pipe" ) ); Reference <XInputStream > rPipeInput( x , UNO_QUERY ); Reference <XOutputStream > rPipeOutput( x , UNO_QUERY ); x = m_rFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream") ) ); + OUString( "com.sun.star.io.MarkableInputStream" ) ); Reference <XInputStream > markableInput( x , UNO_QUERY ); Reference <XActiveDataSink> markableSink( x , UNO_QUERY ); x = m_rFactory->createInstance( OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableOutputStream" ) ) ); + "com.sun.star.io.MarkableOutputStream" ) ); Reference <XOutputStream > markableOutput( x , UNO_QUERY ); Reference <XActiveDataSource > markableSource( x , UNO_QUERY ); @@ -768,13 +767,13 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName, if( ! rSink.is() ) { x = m_rFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectInputStream") )); + OUString( "com.sun.star.io.ObjectInputStream" )); rInput = Reference < XObjectInputStream > ( x , UNO_QUERY ); rSink = Reference < XActiveDataSink > ( x , UNO_QUERY ); } else if ( !rSource.is() ) { x = m_rFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectOutputStream" ))); + OUString( "com.sun.star.io.ObjectOutputStream" )); rOutput = Reference <XObjectOutputStream > ( x , UNO_QUERY ); rSource = Reference <XActiveDataSource>( x, UNO_QUERY ); } @@ -822,57 +821,57 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp { sal_Bool b = sal_True; - if( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ).getValueType() == getCppuVoidType() || - r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ).getValueType() == getCppuVoidType() ) { + if( r1->getPropertyValue( OUString("long") ).getValueType() == getCppuVoidType() || + r2->getPropertyValue( OUString("long") ).getValueType() == getCppuVoidType() ) { // one of the objects is not the correct propertyset ! fprintf( stderr, "compareMyPropertySet: 1\n" ); return sal_False; } - b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ) == - r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ) ); + b = b && ( r1->getPropertyValue( OUString("long") ) == + r2->getPropertyValue( OUString("long") ) ); if( ! b ) fprintf( stderr, "compareMyPropertySet: 2\n" ); - b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) == - r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) ); + b = b && ( r1->getPropertyValue( OUString("float") ) == + r2->getPropertyValue( OUString("float") ) ); if( ! b ){ float f1(0.0); float f2(0.0); - r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) >>= f1; - r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) >>= f2; + r1->getPropertyValue( OUString("float") ) >>= f1; + r2->getPropertyValue( OUString("float") ) >>= f2; fprintf( stderr, "compareMyPropertySet: %f %f 3\n",f1,f2 ); } - b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("double")) ) == - r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("double" ))) ); + b = b && ( r1->getPropertyValue( OUString("double") ) == + r2->getPropertyValue( OUString("double" )) ); if( ! b ) fprintf( stderr, "compareMyPropertySet: 4\n" ); sal_Bool b1(sal_False), b2(sal_False); - Any a =r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ); + Any a =r1->getPropertyValue( OUString("bool") ); a >>= b1; - a = r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ); + a = r2->getPropertyValue( OUString("bool") ); a >>= b2; b = b && ( (b1 && b2) || b1 == b2 ); if( ! b ) fprintf( stderr, "compareMyPropertySet: 5\n" ); -// b = b && r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ) == -// r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ) ); +// b = b && r1->getPropertyValue( OUString("bool") ) == +// r2->getPropertyValue( OUString("bool") ) ); - b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("byte")) ) == - r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("byte")) ) ); + b = b && ( r1->getPropertyValue( OUString("byte") ) == + r2->getPropertyValue( OUString("byte") ) ); if( ! b ) fprintf( stderr, "compareMyPropertySet: 6\n" ); - b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("char")) ) == - r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("char")) ) ); + b = b && ( r1->getPropertyValue( OUString("char") ) == + r2->getPropertyValue( OUString("char") ) ); if( ! b ) fprintf( stderr, "compareMyPropertySet: 7\n" ); - b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("string")) ) == - r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("string")) )); + b = b && ( r1->getPropertyValue( OUString("string") ) == + r2->getPropertyValue( OUString("string") )); if( ! b ) fprintf( stderr, "compareMyPropertySet: 8\n" ); - Any o1 = r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) ); - Any o2 = r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) ); + Any o1 = r1->getPropertyValue( OUString("object") ); + Any o2 = r2->getPropertyValue( OUString("object") ); if( o1.getValueType() == getCppuType( (Reference<XPersistObject>*)0 ) ) { @@ -916,7 +915,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > // reading the data behind the object ! { Reference < XInterface > x = * new MyPersistObject( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla blubs")) ); + OUString( "bla blubs") ); Reference< XPersistObject > persistRef( x , UNO_QUERY ); ERROR_ASSERT( persistRef.is() , "couldn't instantiate PersistTest object" ); @@ -942,7 +941,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > { Reference < XInterface > x = m_rFactory->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest"))); + OUString( "test.com.sun.star.io.PersistTest")); Reference< XPersistObject > persistRef( x , UNO_QUERY ); ERROR_ASSERT( persistRef.is() , "couldn't instantiate PersistTest object" ); @@ -953,34 +952,34 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > Any any; sal_Int32 i = 0x83482; any <<= i; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("long")) , any ); + rProp->setPropertyValue( OUString( "long") , any ); float f = (float)42.23; any <<= f; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("float")) , any ); + rProp->setPropertyValue( OUString( "float") , any ); double d = 233.321412; any <<= d; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("double")) , any ); + rProp->setPropertyValue( OUString( "double") , any ); sal_Bool b = sal_True; any.setValue( &b , getCppuBooleanType() ); - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("bool")) , any ); + rProp->setPropertyValue( OUString( "bool") , any ); sal_Int8 by = 120; any <<= by; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("byte")) , any ); + rProp->setPropertyValue( OUString( "byte") , any ); sal_Unicode c = 'h'; any.setValue( &c , getCppuCharType() ); - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("char")) , any ); + rProp->setPropertyValue( OUString( "char") , any ); - OUString str( RTL_CONSTASCII_USTRINGPARAM( "hi du !" ) ); + OUString str( "hi du !" ); any <<= str; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("string")) , any ); + rProp->setPropertyValue( OUString( "string") , any ); any <<= persistRef; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("object")) , any ); + rProp->setPropertyValue( OUString( "object") , any ); // do read and write rOut->writeObject( persistRef ); @@ -991,8 +990,8 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > ERROR_ASSERT( compareMyPropertySet( rProp , rPropRead ) , "objects has not been read properly !" ); // destroy selfreferences - rProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")), Any() ); - rPropRead->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")), Any() ); + rProp->setPropertyValue( OUString("object"), Any() ); + rPropRead->setPropertyValue( OUString("object"), Any() ); } { @@ -1003,7 +1002,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > // buffering and marks work correctly for( int i = 0 ; i < 2000 ; i ++ ) { - Reference < XInterface > x = m_rFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest"))); + Reference < XInterface > x = m_rFactory->createInstance(OUString("test.com.sun.star.io.PersistTest")); Reference< XPersistObject > persistRef( x , UNO_QUERY ); Reference < XPropertySet > rProp( persistRef , UNO_QUERY ); @@ -1012,39 +1011,39 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > Any any; sal_Int32 i = 0x83482; any <<= i; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("long")) , any ); + rProp->setPropertyValue( OUString( "long") , any ); float f = 42.23; any <<= f; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("float")) , any ); + rProp->setPropertyValue( OUString( "float") , any ); double d = 233.321412; any <<= d; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("double")) , any ); + rProp->setPropertyValue( OUString( "double") , any ); sal_Bool b = sal_True; any.setValue( &b , getCppuBooleanType() ); - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("bool")) , any ); + rProp->setPropertyValue( OUString( "bool") , any ); sal_Int8 by = 120; any <<= by; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("byte")) , any ); + rProp->setPropertyValue( OUString( "byte") , any ); sal_Unicode c = 'h'; any.setValue( &c , getCppuCharType() ); - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("char")) , any ); + rProp->setPropertyValue( OUString( "char") , any ); - OUString str( RTL_CONSTASCII_USTRINGPARAM( "hi du !" ) ); + OUString str( "hi du !" ); any <<= str; - rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("string")) , any ); + rProp->setPropertyValue( OUString( "string") , any ); - x = m_rFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest"))); + x = m_rFactory->createInstance(OUString("test.com.sun.star.io.PersistTest")); Reference <XPersistObject > persist2ndRef( x , UNO_QUERY ); // Note : persist2ndRef contains coincident values, but also coincident values must be // saved properly ! any <<= persist2ndRef; - rProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) , any ); + rProp->setPropertyValue( OUString("object") , any ); // simply test, if markable operations and object operations do not interfere sal_Int32 nMark = markableOut->createMark(); @@ -1090,20 +1089,20 @@ Sequence<OUString> OObjectStreamTest_getSupportedServiceNames( int i) throw () OUString OObjectStreamTest_getServiceName( int i) throw () { if( 1 == i ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.ObjectInputStream" )); + return OUString( "test.com.sun.star.io.ObjectInputStream" ); } else { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.ObjectOutputStream")); + return OUString( "test.com.sun.star.io.ObjectOutputStream"); } } OUString OObjectStreamTest_getImplementationName( int i) throw () { if( 1 == i ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.ObjectInputStream" )); + return OUString( "test.com.sun.star.comp.extensions.stm.ObjectInputStream" ); } else { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.ObjectOutputStream")); + return OUString( "test.com.sun.star.comp.extensions.stm.ObjectOutputStream"); } } diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index d0d9976e49c6..ef0aace779d5 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -119,7 +119,7 @@ void OMarkableOutputStreamTest::testInvariant( const OUString& TestName, { ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" ); ERROR_ASSERT( ! info->supportsService( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" ); + OUString( "bla bluzb") ) , "XServiceInfo test failed" ); } } @@ -130,7 +130,7 @@ sal_Int32 OMarkableOutputStreamTest::test( sal_Int32 hTestHandle) throw ( IllegalArgumentException, RuntimeException) { - if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableOutputStream") ) + if( OUString( "com.sun.star.io.MarkableOutputStream" ) == TestName ) { try { @@ -140,7 +140,7 @@ sal_Int32 OMarkableOutputStreamTest::test( } else { - Reference < XInterface > x = m_rFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))); + Reference < XInterface > x = m_rFactory->createInstance( OUString("com.sun.star.io.Pipe")); Reference< XOutputStream > rPipeOutput( x , UNO_QUERY ); Reference < XInputStream > rPipeInput( x , UNO_QUERY ); @@ -395,12 +395,12 @@ Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames(void) thro OUString OMarkableOutputStreamTest_getServiceName() throw () { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.MarkableOutputStream")); + return OUString( "test.com.sun.star.io.MarkableOutputStream"); } OUString OMarkableOutputStreamTest_getImplementationName() throw () { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.starextensions.stm.MarkableOutputStream")); + return OUString( "test.com.sun.starextensions.stm.MarkableOutputStream"); } @@ -474,7 +474,7 @@ void OMarkableInputStreamTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) { - if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream")) + if( OUString( "com.sun.star.io.MarkableInputStream") == TestName ) { Reference <XServiceInfo > info( TestObject, UNO_QUERY ); ERROR_ASSERT( info.is() , "XServiceInfo not supported !" ); @@ -483,7 +483,7 @@ void OMarkableInputStreamTest::testInvariant( ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" ); ERROR_ASSERT( ! info->supportsService( - OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , + OUString("bla bluzb") ) , "XServiceInfo test failed" ); } } @@ -499,7 +499,7 @@ sal_Int32 OMarkableInputStreamTest::test( const Reference < XInterface >& TestObject, sal_Int32 hTestHandle) throw ( IllegalArgumentException, RuntimeException) { - if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream")) == TestName ) + if( OUString( "com.sun.star.io.MarkableInputStream") == TestName ) { try { @@ -507,7 +507,7 @@ sal_Int32 OMarkableInputStreamTest::test( testInvariant( TestName , TestObject ); } else { - Reference < XInterface > x = m_rFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))); + Reference < XInterface > x = m_rFactory->createInstance( OUString("com.sun.star.io.Pipe")); Reference< XOutputStream > rPipeOutput( x , UNO_QUERY ); Reference < XInputStream > rPipeInput( x , UNO_QUERY ); @@ -667,12 +667,12 @@ Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames(void) throw OUString OMarkableInputStreamTest_getServiceName() throw () { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.MarkableInputStream")); + return OUString( "test.com.sun.star.io.MarkableInputStream"); } OUString OMarkableInputStreamTest_getImplementationName() throw () { - return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.extensions.stm.MarkableInputStream" )); + return OUString( "test.com.sun.star.extensions.stm.MarkableInputStream" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index 3f60c4c91597..d8b3fe631ec8 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -132,7 +132,7 @@ void OPumpTest::testInvariant( const OUString& TestName, const Reference < XInte { ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" ); ERROR_ASSERT( ! info->supportsService( - OUString( RTL_CONSTASCII_USTRINGPARAM("bla bluzb") ) ), "XServiceInfo test failed" ); + OUString( "bla bluzb" ) ), "XServiceInfo test failed" ); } Reference < XActiveDataSource > xActiveDataSource( TestObject, UNO_QUERY ); @@ -151,7 +151,7 @@ sal_Int32 OPumpTest::test( sal_Int32 hTestHandle) throw ( IllegalArgumentException, RuntimeException) { - if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pump") ) == TestName ) { + if( OUString( "com.sun.star.io.Pump" ) == TestName ) { try { if( 0 == hTestHandle ) { @@ -321,7 +321,7 @@ private: Reference< XOutputStream > createPipe() { Reference< XOutputStream > rOut( m_rSmgr->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))),UNO_QUERY); + OUString("com.sun.star.io.Pipe")),UNO_QUERY); return rOut; } }; @@ -413,9 +413,9 @@ void OPumpTest::testWrongUsage( const Reference< XInterface > &r ) Reference< XActiveDataControl > rControl( r, UNO_QUERY ); Reference< XInputStream > rIn( m_rSmgr->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream"))),UNO_QUERY); + OUString("com.sun.star.io.DataInputStream")),UNO_QUERY); Reference< XOutputStream > rOut( m_rSmgr->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream"))),UNO_QUERY); + OUString("com.sun.star.io.DataOutputStream")),UNO_QUERY); rSink->setInputStream( rIn ); rSource->setOutputStream( rOut ); @@ -439,12 +439,12 @@ Sequence<OUString> OPumpTest_getSupportedServiceNames(void) throw() } OUString OPumpTest_getServiceName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.io.Pump" ) ); + return OUString( "test.com.sun.star.io.Pump" ); } OUString OPumpTest_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.comp.io.Pump") ); + return OUString( "test.com.sun.star.comp.io.Pump" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index 6e789dba6e10..4114e14f6f2f 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -62,7 +62,7 @@ int main (int argc, char **argv) // create service manager Reference< XMultiServiceFactory > xSMgr = createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ) ); + OUString( "applicat.rdb" ) ); Reference < XImplementationRegistration > xReg; Reference < XSimpleRegistry > xSimpleReg; @@ -71,7 +71,7 @@ int main (int argc, char **argv) { // Create registration service Reference < XInterface > x = xSMgr->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ); + OUString("com.sun.star.registry.ImplementationRegistration") ); xReg = Reference< XImplementationRegistration > ( x , UNO_QUERY ); } catch( Exception & ) { @@ -88,7 +88,7 @@ int main (int argc, char **argv) for( int n = 2 ; n <argc ; n ++ ) { OUString aDllName = OStringToOUString( argv[n] , RTL_TEXTENCODING_ASCII_US ); xReg->registerImplementation( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), + OUString("com.sun.star.loader.SharedLibrary"), aDllName, xSimpleReg ); } @@ -109,13 +109,13 @@ int main (int argc, char **argv) #if defined(SAL_W32) OUString aDllName = OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US ); #else - OUString aDllName(RTL_CONSTASCII_USTRINGPARAM("lib")); + OUString aDllName("lib"); aDllName += OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US ); - aDllName += OUString(RTL_CONSTASCII_USTRINGPARAM(".so")); + aDllName += OUString(".so"); #endif xReg->registerImplementation( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")) , + OUString("com.sun.star.loader.SharedLibrary") , aDllName, xSimpleReg ); } diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx index f1940c07cd70..61df62878a0b 100644 --- a/registry/test/testmerge.cxx +++ b/registry/test/testmerge.cxx @@ -48,7 +48,7 @@ sal_Int32 lValue2 = 54321; sal_Int32 lValue3 = 111333111; sal_Int32 lValue4 = 333111333; sal_Char* sValue = (sal_Char*)"string Value"; -OUString wValue(RTL_CONSTASCII_USTRINGPARAM("unicode Value")); +OUString wValue("unicode Value"); void test_generateMerge1() @@ -57,21 +57,21 @@ void test_generateMerge1() RegistryKey rootKey, key1, key2, key3, key4, key5, key6, key7, key8, key9; - REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb"))), "testGenerateMerge1 error 1"); + REG_ENSURE(!myRegistry->create(OUString("merge1.rdb")), "testGenerateMerge1 error 1"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "testGenerateMerge1 error 2"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1")), key1), "testGenerateMerge1 error 3"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1")), key2), "testGenerateMerge1 error 4"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), key3), "testGenerateMerge1 error 5"); + REG_ENSURE(!rootKey.createKey(OUString("MergeKey1"), key1), "testGenerateMerge1 error 3"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey1"), key2), "testGenerateMerge1 error 4"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), key3), "testGenerateMerge1 error 5"); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_LONG, &lValue1, sizeof(sal_Int32)), "testGenerateMerge1 error 5a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2")), key4), "testGenerateMerge1 error 6"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), key5), "testGenerateMerge1 error 7"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey2"), key4), "testGenerateMerge1 error 6"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), key5), "testGenerateMerge1 error 7"); REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 7a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3")), key6), "testGenerateMerge1 error 8"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), key7), "testGenerateMerge1 error 9"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey3"), key6), "testGenerateMerge1 error 8"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), key7), "testGenerateMerge1 error 9"); REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 9a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4")), key8), "testGenerateMerge1 error 10"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), key9), "testGenerateMerge1 error 11"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey4"), key8), "testGenerateMerge1 error 10"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), key9), "testGenerateMerge1 error 11"); REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"abcdefghijklmnopqrstuvwxyz", 27), "testGenerateMerge1 error 11a"); @@ -85,18 +85,18 @@ void test_generateMerge1() !key8.closeKey() && !key9.closeKey(), "testGenerateMerge1 error 12"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), key1), "testGenerateMerge1 error 13"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11")), key2), "testGenerateMerge1 error 14"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), key3), "testGenerateMerge1 error 15"); + REG_ENSURE(!rootKey.createKey(OUString("MergeKey1u2"), key1), "testGenerateMerge1 error 13"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey11"), key2), "testGenerateMerge1 error 14"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), key3), "testGenerateMerge1 error 15"); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_LONG, &lValue2, sizeof(sal_Int32)), "testGenerateMerge1 error 15a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12")), key4), "testGenerateMerge1 error 16"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), key5), "testGenerateMerge1 error 17"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey12"), key4), "testGenerateMerge1 error 16"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), key5), "testGenerateMerge1 error 17"); REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 17a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13")), key6), "testGenerateMerge1 error 18"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), key7), "testGenerateMerge1 error 19"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey13"), key6), "testGenerateMerge1 error 18"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), key7), "testGenerateMerge1 error 19"); REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 19a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), key8), "testGenerateMerge1 error 20"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), key9), "testGenerateMerge1 error 21"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK12SubKey1u2"), key8), "testGenerateMerge1 error 20"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), key9), "testGenerateMerge1 error 21"); REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue3, sizeof(sal_Int32)), "testGenerateMerge1 error 21a"); REG_ENSURE(!rootKey.closeKey() && @@ -123,21 +123,21 @@ void test_generateMerge2() RegistryKey rootKey, key1, key2, key3, key4, key5, key6, key7, key8, key9; - REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb"))), "testGenerateMerge2 error 1"); + REG_ENSURE(!myRegistry->create(OUString("merge2.rdb")), "testGenerateMerge2 error 1"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "testGenerateMerge2 error 2"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey2")), key1), "testGenerateMerge2 error 3"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1")), key2), "testGenerateMerge2 error 4"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), key3), "testGenerateMerge2 error 5"); + REG_ENSURE(!rootKey.createKey(OUString("MergeKey2"), key1), "testGenerateMerge2 error 3"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey1"), key2), "testGenerateMerge2 error 4"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), key3), "testGenerateMerge2 error 5"); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"1234567890", 11), "testGenerateMerge1 error 5a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2")), key4), "testGenerateMerge2 error 6"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), key5), "testGenerateMerge2 error 7"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey2"), key4), "testGenerateMerge2 error 6"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), key5), "testGenerateMerge2 error 7"); REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 7a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3")), key6), "testGenerateMerge2 error 8"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), key7), "testGenerateMerge2 error 9"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey3"), key6), "testGenerateMerge2 error 8"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), key7), "testGenerateMerge2 error 9"); REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 9a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4")), key8), "testGenerateMerge2 error 10"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), key9), "testGenerateMerge2 error 11"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey4"), key8), "testGenerateMerge2 error 10"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), key9), "testGenerateMerge2 error 11"); REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue1, sizeof(sal_Int32)), "testGenerateMerge1 error 11a"); REG_ENSURE(!key1.closeKey() && @@ -150,18 +150,18 @@ void test_generateMerge2() !key8.closeKey() && !key9.closeKey(), "testGenerateMerge2 error 12"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), key1), "testGenerateMerge2 error 13"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21")), key2), "testGenerateMerge2 error 14"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), key3), "testGenerateMerge2 error 15"); + REG_ENSURE(!rootKey.createKey(OUString("MergeKey1u2"), key1), "testGenerateMerge2 error 13"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey21"), key2), "testGenerateMerge2 error 14"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), key3), "testGenerateMerge2 error 15"); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"a1b2c3d4e5f6g7h8i9", 19), "testGenerateMerge1 error 15a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22")), key4), "testGenerateMerge2 error 16"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), key5), "testGenerateMerge2 error 17"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey22"), key4), "testGenerateMerge2 error 16"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), key5), "testGenerateMerge2 error 17"); REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_LONG, &lValue2, sizeof(sal_Int32)), "testGenerateMerge1 error 17a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23")), key6), "testGenerateMerge2 error 18"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), key7), "testGenerateMerge2 error 19"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey23"), key6), "testGenerateMerge2 error 18"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), key7), "testGenerateMerge2 error 19"); REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 19a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), key8), "testGenerateMerge2 error 20"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), key9), "testGenerateMerge2 error 21"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK12SubKey1u2"), key8), "testGenerateMerge2 error 20"); + REG_ENSURE(!rootKey.createKey(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), key9), "testGenerateMerge2 error 21"); REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue4, sizeof(sal_Int32)), "testGenerateMerge1 error 21a"); REG_ENSURE(!rootKey.closeKey() && @@ -188,112 +188,112 @@ void test_merge() RegistryKey rootKey, key1, mkey1, key2, mkey2, key1u2, mkey1u2; - REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("mergetest.rdb"))), "testMerge error 1"); + REG_ENSURE(!myRegistry->create(OUString("mergetest.rdb")), "testMerge error 1"); REG_ENSURE(myRegistry->getName() == "mergetest.rdb", "testMerge error 1.a)"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "testMerge error 2"); - REG_ENSURE(!myRegistry->loadKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), - OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb"))), "testMerge error 3"); - REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), - OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb"))), "testMerge error 4"); + REG_ENSURE(!myRegistry->loadKey(rootKey, OUString("/stardiv/IchbineinMergeKey"), + OUString("merge1.rdb")), "testMerge error 3"); + REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString("/stardiv/IchbineinMergeKey"), + OUString("merge2.rdb")), "testMerge error 4"); /////////////////////////////////////////////////////////////////////////// - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1), "testMerge error 5"); + REG_ENSURE(!rootKey.openKey(OUString("/stardiv/IchbineinMergeKey"), key1), "testMerge error 5"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1")), mkey1), "testMerge error 6"); + REG_ENSURE(!key1.openKey(OUString("MergeKey1"), mkey1), "testMerge error 6"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 7"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1")), mkey1), "testMerge error 8"); + REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey1"), mkey1), "testMerge error 8"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 9"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), mkey1), "testMerge error 10"); + REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), mkey1), "testMerge error 10"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 11"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2")), mkey1), "testMerge error 12"); + REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey2"), mkey1), "testMerge error 12"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 13"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), mkey1), "testMerge error 14"); + REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), mkey1), "testMerge error 14"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 15"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3")), mkey1), "testMerge error 16"); + REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey3"), mkey1), "testMerge error 16"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 17"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), mkey1), "testMerge error 18"); + REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), mkey1), "testMerge error 18"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 19"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4")), mkey1), "testMerge error 20"); + REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey4"), mkey1), "testMerge error 20"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 21"); - REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), mkey1), "testMerge error 22"); + REG_ENSURE(!key1.openKey(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), mkey1), "testMerge error 22"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 23"); REG_ENSURE(!key1.closeKey(), "testMerge error 24"); /////////////////////////////////////////////////////////////////////////// - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key2), "testMerge error 25"); + REG_ENSURE(!rootKey.openKey(OUString("/stardiv/IchbineinMergeKey"), key2), "testMerge error 25"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey2")), mkey2), "testMerge error 26"); + REG_ENSURE(!key2.openKey(OUString("MergeKey2"), mkey2), "testMerge error 26"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 27"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1")), mkey2), "testMerge error 28"); + REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey1"), mkey2), "testMerge error 28"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 29"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), mkey2), "testMerge error 30"); + REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), mkey2), "testMerge error 30"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 31"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2")), mkey2), "testMerge error 31"); + REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey2"), mkey2), "testMerge error 31"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 33"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), mkey2), "testMerge error 34"); + REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), mkey2), "testMerge error 34"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 35"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3")), mkey2), "testMerge error 36"); + REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey3"), mkey2), "testMerge error 36"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 37"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), mkey2), "testMerge error 38"); + REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), mkey2), "testMerge error 38"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 39"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4")), mkey2), "testMerge error 40"); + REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey4"), mkey2), "testMerge error 40"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 41"); - REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), mkey2), "testMerge error 42"); + REG_ENSURE(!key2.openKey(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), mkey2), "testMerge error 42"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 43"); REG_ENSURE(!key2.closeKey(), "testMerge error 44"); /////////////////////////////////////////////////////////////////////////// - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1u2), "testMerge error 40"); + REG_ENSURE(!rootKey.openKey(OUString("/stardiv/IchbineinMergeKey"), key1u2), "testMerge error 40"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), mkey1u2), "testMerge error 41"); + REG_ENSURE(!key1u2.openKey(OUString("MergeKey1u2"), mkey1u2), "testMerge error 41"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 42"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11")), mkey1u2), "testMerge error 43"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey11"), mkey1u2), "testMerge error 43"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 44"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), mkey1u2), "testMerge error 45"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), mkey1u2), "testMerge error 45"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 46"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12")), mkey1u2), "testMerge error 47"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey12"), mkey1u2), "testMerge error 47"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 48"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), mkey1u2), "testMerge error 49"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), mkey1u2), "testMerge error 49"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 50"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13")), mkey1u2), "testMerge error 51"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey13"), mkey1u2), "testMerge error 51"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 52"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), mkey1u2), "testMerge error 53"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), mkey1u2), "testMerge error 53"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 54"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21")), mkey1u2), "testMerge error 55"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey21"), mkey1u2), "testMerge error 55"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 56"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), mkey1u2), "testMerge error 57"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), mkey1u2), "testMerge error 57"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 58"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22")), mkey1u2), "testMerge error 59"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey22"), mkey1u2), "testMerge error 59"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 60"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), mkey1u2), "testMerge error 61"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), mkey1u2), "testMerge error 61"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 62"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23")), mkey1u2), "testMerge error 63"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey23"), mkey1u2), "testMerge error 63"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 64"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), mkey1u2), "testMerge error 65"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), mkey1u2), "testMerge error 65"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 66"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), mkey1u2), "testMerge error 67"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK12SubKey1u2"), mkey1u2), "testMerge error 67"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 68"); - REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), mkey1u2), "testMerge error 69"); + REG_ENSURE(!key1u2.openKey(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), mkey1u2), "testMerge error 69"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 70"); REG_ENSURE(!key1u2.closeKey(), "testMerge error 71"); @@ -305,101 +305,101 @@ void test_merge() sal_Int32 int32Value; sal_uInt8 *Value; - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1), "testMerge error 72"); + REG_ENSURE(!rootKey.openKey(OUString("/stardiv/IchbineinMergeKey"), key1), "testMerge error 72"); - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 73"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 73"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 74"); - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 74.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey1/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 74.a)"); REG_ENSURE(int32Value == lValue1, "testMerge error 74.b)"); - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 75"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 75"); REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 76"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), (RegValue)Value), "testMerge error 76.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey2/KeyWithStringValue"), (RegValue)Value), "testMerge error 76.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 76.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 77"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 77"); REG_ENSURE(valueType == RG_VALUETYPE_UNICODE && valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 78"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 78.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 78.a)"); REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 78.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 79"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 79"); REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 27, "testMerge error 80"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 80.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 80.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, "abcdefghijklmnopqrstuvwxyz") == 0, "testMerge error 80.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 81"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 81"); REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 11, "testMerge error 82"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 82.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 82.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, "1234567890") == 0, "testMerge error 82.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 83"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 83"); REG_ENSURE(valueType == RG_VALUETYPE_UNICODE&& valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 84"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 84.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 84.a)"); REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 84.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 85"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 85"); REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 86"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), (RegValue)Value), "testMerge error 86.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey3/KeyWithStringValue"), (RegValue)Value), "testMerge error 86.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 86.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 87"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 87"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 88"); - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 88.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey2/MK2SubKey4/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 88.a)"); REG_ENSURE(int32Value == lValue1, "testMerge error 88.b)"); - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 89"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 89"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 90"); - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 90.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 90.a)"); REG_ENSURE(int32Value == lValue2, "testMerge error 90.b)"); - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 91"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 91"); REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 92"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), (RegValue)Value), "testMerge error 92.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), (RegValue)Value), "testMerge error 92.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 92.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 93"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 93"); REG_ENSURE(valueType == RG_VALUETYPE_UNICODE && valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 94"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 94.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 94.a)"); REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 94.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 95"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 95"); REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 19, "testMerge error 96"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 96.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 96.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, "a1b2c3d4e5f6g7h8i9") == 0, "testMerge error 96.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 97"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 97"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 98"); - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 98.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 98.a)"); REG_ENSURE(int32Value == lValue2, "testMerge error 98.b)"); - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 99"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 99"); REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 100"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), (RegValue)Value), "testMerge error 100.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), (RegValue)Value), "testMerge error 100.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 100.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 101"); + REG_ENSURE(!key1.getValueInfo(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 101"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 102"); - REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 102.a)"); + REG_ENSURE(!key1.getValue(OUString("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 102.a)"); REG_ENSURE(int32Value == lValue4, "testMerge error 102.b)"); @@ -409,8 +409,8 @@ void test_merge() REG_ENSURE(!rootKey.closeKey(), "testMerge error 10"); - REG_ENSURE(!myRegistry->destroy( OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb")) ), "test_registry_CppApi error 11"); - REG_ENSURE(!myRegistry->destroy( OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb")) ), "test_registry_CppApi error 12"); + REG_ENSURE(!myRegistry->destroy( OUString("merge1.rdb") ), "test_registry_CppApi error 11"); + REG_ENSURE(!myRegistry->destroy( OUString("merge2.rdb") ), "test_registry_CppApi error 12"); REG_ENSURE(!myRegistry->destroy( OUString() ), "test_registry_CppApi error 13"); delete myRegistry; diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx index 0517e3bb42b2..623b248dff92 100644 --- a/registry/test/testregcpp.cxx +++ b/registry/test/testregcpp.cxx @@ -50,95 +50,95 @@ void test_coreReflection() RegistryKey rootKey, key1, key2, key3, key4 ,key5, key6, key7, key8; - REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb"))), "testCoreReflection error 1"); + REG_ENSURE(!myRegistry->create(OUString("ucrtest.rdb")), "testCoreReflection error 1"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "testCoreReflection error 2"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("UCR")), key1), "testCoreReflection error 3"); - REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA")), key2), "testCoreReflection error 4"); - REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("StructA")), key3), "testCoreReflection error 5"); - REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("EnumA")), key4), "testCoreReflection error 6"); - REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("XInterfaceA")), key5), "testCoreReflection error 7"); - REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ExceptionA")), key6), "testCoreReflection error 8"); - REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceA")), key7), "testCoreReflection error 8a"); - REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA")), key8), "testCoreReflection error 8b"); + REG_ENSURE(!rootKey.createKey(OUString("UCR"), key1), "testCoreReflection error 3"); + REG_ENSURE(!key1.createKey(OUString("ModuleA"), key2), "testCoreReflection error 4"); + REG_ENSURE(!key2.createKey(OUString("StructA"), key3), "testCoreReflection error 5"); + REG_ENSURE(!key2.createKey(OUString("EnumA"), key4), "testCoreReflection error 6"); + REG_ENSURE(!key2.createKey(OUString("XInterfaceA"), key5), "testCoreReflection error 7"); + REG_ENSURE(!key2.createKey(OUString("ExceptionA"), key6), "testCoreReflection error 8"); + REG_ENSURE(!key2.createKey(OUString("ServiceA"), key7), "testCoreReflection error 8a"); + REG_ENSURE(!key2.createKey(OUString("ConstantsA"), key8), "testCoreReflection error 8b"); { RegistryTypeWriter writer(RT_TYPE_MODULE, - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA")), + OUString("ModuleA"), OUString(), 11, 0, 0); RTConstValue aConst; - writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Modul"))); - writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); + writer.setDoku(OUString("Hallo ich bin ein Modul")); + writer.setFileName(OUString("DummyFile")); aConst.m_type = RT_TYPE_BOOL; aConst.m_value.aBool = sal_True; - writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstBool")), - OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein boolean")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(0, OUString("aConstBool"), + OUString("boolean"), + OUString("ich bin ein boolean"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_BYTE; aConst.m_value.aByte = 127; - writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstByte")), - OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein byte")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(1, OUString("aConstByte"), + OUString("byte"), + OUString("ich bin ein byte"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_INT16; aConst.m_value.aShort = -10; - writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstShort")), - OUString(RTL_CONSTASCII_USTRINGPARAM("short")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein short")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(2, OUString("aConstShort"), + OUString("short"), + OUString("ich bin ein short"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_UINT16; aConst.m_value.aUShort = 10; - writer.setFieldData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstUShort")), - OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned short")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(3, OUString("aConstUShort"), + OUString("unsigned short"), + OUString("ich bin ein unsigned short"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_INT32; aConst.m_value.aLong = -100000; - writer.setFieldData(4, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstLong")), - OUString(RTL_CONSTASCII_USTRINGPARAM("long")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein long")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(4, OUString("aConstLong"), + OUString("long"), + OUString("ich bin ein long"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_UINT32; aConst.m_value.aULong = 100000; - writer.setFieldData(5, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstULong")), - OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned long")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(5, OUString("aConstULong"), + OUString("unsigned long"), + OUString("ich bin ein unsigned long"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_INT64; aConst.m_value.aHyper = -100000000; - writer.setFieldData(6, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstHyper")), - OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein hyper")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(6, OUString("aConstHyper"), + OUString("hyper"), + OUString("ich bin ein hyper"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_UINT64; aConst.m_value.aUHyper = 100000000; - writer.setFieldData(7, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstULong")), - OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned long")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(7, OUString("aConstULong"), + OUString("unsigned long"), + OUString("ich bin ein unsigned long"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_FLOAT; aConst.m_value.aFloat = -2e-10f; - writer.setFieldData(8, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstFloat")), - OUString(RTL_CONSTASCII_USTRINGPARAM("float")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein float")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(8, OUString("aConstFloat"), + OUString("float"), + OUString("ich bin ein float"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_DOUBLE; - aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstDouble")), - OUString(RTL_CONSTASCII_USTRINGPARAM("double")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein double")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString("aConstDouble"), + OUString("double"), + OUString("ich bin ein double"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_STRING; - OUString tmpStr(RTL_CONSTASCII_USTRINGPARAM("dies ist ein unicode string")); + OUString tmpStr("dies ist ein unicode string"); aConst.m_value.aString = tmpStr.getStr(); - writer.setFieldData(10, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstString")), - OUString(RTL_CONSTASCII_USTRINGPARAM("string")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein string")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(10, OUString("aConstString"), + OUString("string"), + OUString("ich bin ein string"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -171,20 +171,20 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_STRUCT, - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")), + OUString("ModuleA/StructA"), OUString(), 3, 0, 0); - writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Struktur"))); - writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); + writer.setDoku(OUString("Hallo ich bin eine Struktur")); + writer.setFileName(OUString("DummyFile")); - writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("asal_uInt32")), - OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")), + writer.setFieldData(0, OUString("asal_uInt32"), + OUString("unsigned long"), OUString(), OUString(), RT_ACCESS_READWRITE); - writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aXInterface")), - OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")), + writer.setFieldData(1, OUString("aXInterface"), + OUString("stardiv/uno/XInterface"), OUString(), OUString(), RT_ACCESS_READWRITE); - writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aSequence")), - OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA/EnumA")), + writer.setFieldData(2, OUString("aSequence"), + OUString("[]ModuleA/EnumA"), OUString(), OUString(), RT_ACCESS_READWRITE); const sal_uInt8* pBlop = writer.getBlop(); @@ -195,7 +195,7 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_ENUM, - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/EnumA")), + OUString("ModuleA/EnumA"), OUString(), 2, 0, 0); RTConstValue aConst; @@ -203,15 +203,15 @@ void test_coreReflection() aConst.m_type = RT_TYPE_UINT32; aConst.m_value.aULong = 10; - writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Enum"))); - writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); + writer.setDoku(OUString("Hallo ich bin ein Enum")); + writer.setFileName(OUString("DummyFile")); - writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ENUM_VAL_1")), - OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein enum value")), + writer.setFieldData(0, OUString("ENUM_VAL_1"), + OUString(), OUString("ich bin ein enum value"), OUString(), RT_ACCESS_CONST, aConst); aConst.m_value.aULong = 10; - writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ENUM_VAL_2")), + writer.setFieldData(1, OUString("ENUM_VAL_2"), OUString(), OUString(), OUString(), RT_ACCESS_CONST, aConst); const sal_uInt8* pBlop = writer.getBlop(); @@ -222,38 +222,38 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_INTERFACE, - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")), - OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")), + OUString("ModuleA/XInterfaceA"), + OUString("stardiv/uno/XInterface"), 4, 1, 0); RTConstValue aConst; RTUik aUik = {1,2,3,4,5}; writer.setUik(aUik); - writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Interface"))); - writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); + writer.setDoku(OUString("Hallo ich bin ein Interface")); + writer.setFileName(OUString("DummyFile")); - writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aString")), - OUString(RTL_CONSTASCII_USTRINGPARAM("string")), OUString(), OUString(), RT_ACCESS_READWRITE); - writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aStruct")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")), + writer.setFieldData(0, OUString("aString"), + OUString("string"), OUString(), OUString(), RT_ACCESS_READWRITE); + writer.setFieldData(1, OUString("aStruct"), + OUString("ModuleA/StructA"), OUString(), OUString(), RT_ACCESS_READONLY); - writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aEnum")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/EnumA")), OUString(), OUString(), RT_ACCESS_BOUND); + writer.setFieldData(2, OUString("aEnum"), + OUString("ModuleA/EnumA"), OUString(), OUString(), RT_ACCESS_BOUND); aConst.m_type = RT_TYPE_UINT16; aConst.m_value.aUShort = 12; - writer.setFieldData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstUShort")), - OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")), OUString(), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); - - writer.setMethodData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("methodA")), - OUString(RTL_CONSTASCII_USTRINGPARAM("double")), RT_MODE_TWOWAY, 2, 1, - OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin die methodA"))); - writer.setParamData(0, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")), - OUString(RTL_CONSTASCII_USTRINGPARAM("aStruct")), RT_PARAM_IN); - writer.setParamData(0, 1, OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")), - OUString(RTL_CONSTASCII_USTRINGPARAM("aShort")), RT_PARAM_INOUT); - writer.setExcData(0, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ExceptionA"))); + writer.setFieldData(3, OUString("aConstUShort"), + OUString("unsigned short"), OUString(), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); + + writer.setMethodData(0, OUString("methodA"), + OUString("double"), RT_MODE_TWOWAY, 2, 1, + OUString("Hallo ich bin die methodA")); + writer.setParamData(0, 0, OUString("ModuleA/StructA"), + OUString("aStruct"), RT_PARAM_IN); + writer.setParamData(0, 1, OUString("unsigned short"), + OUString("aShort"), RT_PARAM_INOUT); + writer.setExcData(0, 0, OUString("ModuleA/ExceptionA")); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -282,14 +282,14 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_EXCEPTION, - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ExceptionA")), + OUString("ModuleA/ExceptionA"), OUString(), 1, 0, 0); - writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Exception"))); + writer.setDoku(OUString("Hallo ich bin eine Exception")); - writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aSource")), - OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein interface member")), + writer.setFieldData(0, OUString("aSource"), + OUString("stardiv/uno/XInterface"), + OUString("ich bin ein interface member"), OUString(), RT_ACCESS_READWRITE); const sal_uInt8* pBlop = writer.getBlop(); @@ -300,26 +300,26 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_SERVICE, - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceA")), + OUString("ModuleA/ServiceA"), OUString(), 1, 0, 4); - writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Service"))); - writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); + writer.setDoku(OUString("Hallo ich bin ein Service")); + writer.setFileName(OUString("DummyFile")); - writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aProperty")), - OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin eine property")), + writer.setFieldData(0, OUString("aProperty"), + OUString("stardiv/uno/XInterface"), + OUString("ich bin eine property"), OUString(), RT_ACCESS_READWRITE); - writer.setReferenceData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")), RT_REF_SUPPORTS, - OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf ein supported interface")), + writer.setReferenceData(0, OUString("ModuleA/XInterfaceA"), RT_REF_SUPPORTS, + OUString("Hallo ich eine Reference auf ein supported interface"), RT_ACCESS_OPTIONAL); - writer.setReferenceData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")), RT_REF_OBSERVES, - OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf ein observed interface"))); - writer.setReferenceData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceB")), RT_REF_EXPORTS, - OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf einen exported service"))); - writer.setReferenceData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceB")), RT_REF_NEEDS, - OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf einen needed service"))); + writer.setReferenceData(1, OUString("ModuleA/XInterfaceA"), RT_REF_OBSERVES, + OUString("Hallo ich eine Reference auf ein observed interface")); + writer.setReferenceData(2, OUString("ModuleA/ServiceB"), RT_REF_EXPORTS, + OUString("Hallo ich eine Reference auf einen exported service")); + writer.setReferenceData(3, OUString("ModuleA/ServiceB"), RT_REF_NEEDS, + OUString("Hallo ich eine Reference auf einen needed service")); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -344,32 +344,32 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_CONSTANTS, - OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ConstansA")), + OUString("ModuleA/ConstansA"), OUString(), 3, 0, 0); RTConstValue aConst; - writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Constants Group"))); - writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); + writer.setDoku(OUString("Hallo ich bin eine Constants Group")); + writer.setFileName(OUString("DummyFile")); aConst.m_type = RT_TYPE_BOOL; aConst.m_value.aBool = sal_True; - writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstBool")), - OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein boolean")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(0, OUString("ConstantsA_aConstBool"), + OUString("boolean"), + OUString("ich bin ein boolean"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_BYTE; aConst.m_value.aByte = 127; - writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstByte")), - OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein byte")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(1, OUString("ConstantsA_aConstByte"), + OUString("byte"), + OUString("ich bin ein byte"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_INT16; aConst.m_value.aShort = -10; - writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstShort")), - OUString(RTL_CONSTASCII_USTRINGPARAM("short")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein short")), - OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + writer.setFieldData(2, OUString("ConstantsA_aConstShort"), + OUString("short"), + OUString("ich bin ein short"), + OUString("DummyFile"), RT_ACCESS_CONST, aConst); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -389,40 +389,40 @@ void test_registry_CppApi() RegistryKey rootKey, key1, key2, key3, key4 ,key5, key6, key7, key8, key9; - REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb"))), "test_registry_CppApi error 1"); + REG_ENSURE(!myRegistry->create(OUString("test.rdb")), "test_registry_CppApi error 1"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 2"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")), key1), "test_registry_CppApi error 3"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), key2), "test_registry_CppApi error 4"); - REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("X")), key3), "test_registry_CppApi error 5"); - REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondSubKey")), key4), "test_registry_CppApi error 6"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")), key5), "test_registry_CppApi error 6a"); + REG_ENSURE(!rootKey.createKey(OUString("myFirstKey"), key1), "test_registry_CppApi error 3"); + REG_ENSURE(!rootKey.createKey(OUString("mySecondKey"), key2), "test_registry_CppApi error 4"); + REG_ENSURE(!key1.createKey(OUString("X"), key3), "test_registry_CppApi error 5"); + REG_ENSURE(!key1.createKey(OUString("mySecondSubKey"), key4), "test_registry_CppApi error 6"); + REG_ENSURE(!rootKey.createKey(OUString("myThirdKey"), key5), "test_registry_CppApi error 6a"); - REG_ENSURE(!key5.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("1")), key4), "test_registry_CppApi error 6b"); - REG_ENSURE(!key4.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("2")), key3), "test_registry_CppApi error 6c"); - REG_ENSURE(!key5.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("1")), key4), "test_registry_CppApi error 6d"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myThirdKey/1")), key4), "test_registry_CppApi error 6e"); + REG_ENSURE(!key5.createKey(OUString("1"), key4), "test_registry_CppApi error 6b"); + REG_ENSURE(!key4.createKey(OUString("2"), key3), "test_registry_CppApi error 6c"); + REG_ENSURE(!key5.openKey(OUString("1"), key4), "test_registry_CppApi error 6d"); + REG_ENSURE(!rootKey.openKey(OUString("/myThirdKey/1"), key4), "test_registry_CppApi error 6e"); REG_ENSURE(key4.getName() == "/myThirdKey/1", "test_registry_CppApi error 6f"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), key6), "test_registry_CppApi error 7"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), key6), "test_registry_CppApi error 7a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), key6), "test_registry_CppApi error 7b"); + REG_ENSURE(!rootKey.createKey(OUString("myFourthKey"), key6), "test_registry_CppApi error 7"); + REG_ENSURE(!rootKey.createKey(OUString("myFifthKey"), key6), "test_registry_CppApi error 7a"); + REG_ENSURE(!rootKey.createKey(OUString("mySixthKey"), key6), "test_registry_CppApi error 7b"); // Link Test // - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X")), key7), "test_registry_CppApi error 7c)");; - REG_ENSURE(!key6.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstLink")), OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7d"); - REG_ENSURE(!key6.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthSubKey")), key7), "test_registry_CppApi error 7e"); + REG_ENSURE(!rootKey.createKey(OUString("/myFourthKey/X"), key7), "test_registry_CppApi error 7c)");; + REG_ENSURE(!key6.createLink(OUString("myFirstLink"), OUString("/myFourthKey/X")), "test_registry_CppApi error 7d"); + REG_ENSURE(!key6.createKey(OUString("mySixthSubKey"), key7), "test_registry_CppApi error 7e"); OUString linkTarget; - REG_ENSURE(!key6.getLinkTarget(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstLink")), linkTarget), "test_registry_CppApi error 7f"); + REG_ENSURE(!key6.getLinkTarget(OUString("myFirstLink"), linkTarget), "test_registry_CppApi error 7f"); REG_ENSURE(linkTarget == "/myFourthKey/X", "test_registry_CppApi error 7g"); RegistryKeyNames* pSubKeyNames = new RegistryKeyNames(); sal_uInt32 nSubKeys=0; - REG_ENSURE(!rootKey.getKeyNames(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), *pSubKeyNames), "test_registry_CppApi error 7h)"); + REG_ENSURE(!rootKey.getKeyNames(OUString("mySixthKey"), *pSubKeyNames), "test_registry_CppApi error 7h)"); REG_ENSURE(pSubKeyNames->getLength() == 2, "test_registry_CppApi error 7i)"); for (sal_uInt32 i=0; i < pSubKeyNames->getLength(); i++) @@ -438,32 +438,32 @@ void test_registry_CppApi() REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7k1"); delete pSubKeyNames; - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink")), key6), "test_registry_CppApi error 7l"); + REG_ENSURE(!rootKey.openKey(OUString("/mySixthKey/myFirstLink"), key6), "test_registry_CppApi error 7l"); // REG_ENSURE(key6.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), key6), "test_registry_CppApi error 7m1"); - REG_ENSURE(!key6.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondLink")), - OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink"))), "test_registry_CppApi error 7m2"); + REG_ENSURE(!rootKey.openKey(OUString("myFifthKey"), key6), "test_registry_CppApi error 7m1"); + REG_ENSURE(!key6.createLink(OUString("mySecondLink"), + OUString("/mySixthKey/myFirstLink")), "test_registry_CppApi error 7m2"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink")), key6), "test_registry_CppApi error 7m3"); + REG_ENSURE(!rootKey.openKey(OUString("/myFifthKey/mySecondLink"), key6), "test_registry_CppApi error 7m3"); // REG_ENSURE(key6.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m4"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink/myFirstLinkSubKey")), key7), "test_registry_CppApi error 7m5"); + REG_ENSURE(!rootKey.createKey(OUString("/myFifthKey/mySecondLink/myFirstLinkSubKey"), key7), "test_registry_CppApi error 7m5"); REG_ENSURE(key7.getName() == "/myFourthKey/X/myFirstLinkSubKey", "test_registry_CppApi error 7m6"); - REG_ENSURE(!key7.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdLink")), OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink"))), "test_registry_CppApi error 7m7"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")), key7), "test_registry_CppApi error 7m8"); -// REG_ENSURE(!key7.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink")), key6), "test_registry_CppApi error 7m9"); + REG_ENSURE(!key7.createLink(OUString("myThirdLink"), OUString("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m7"); + REG_ENSURE(!rootKey.openKey(OUString("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"), key7), "test_registry_CppApi error 7m8"); +// REG_ENSURE(!key7.openKey(OUString("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink"), key6), "test_registry_CppApi error 7m9"); // REG_ENSURE(key7.getName() == "/myFourthKey/X", "test_registry_CppApi error 7m10"); REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7m11"); - REG_ENSURE(!rootKey.deleteLink(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink"))), "test_registry_CppApi error 7m12"); + REG_ENSURE(!rootKey.deleteLink(OUString("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m12"); - REG_ENSURE(!rootKey.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink")), - OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"))), + REG_ENSURE(!rootKey.createLink(OUString("/myFifthKey/mySecondLink"), + OUString("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")), "test_registry_CppApi error 7m13"); -// REG_ENSURE(rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")), key7) == REG_DETECT_RECURSION, +// REG_ENSURE(rootKey.openKey(OUString("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"), key7) == REG_DETECT_RECURSION, // "test_registry_CppApi error 7m14"); // REG_ENSURE(key7.closeKey() == REG_INVALID_KEY, "test_registry_CppApi error 7m11"); @@ -471,7 +471,7 @@ void test_registry_CppApi() RegistryKeyNames subKeyNames; nSubKeys=0; - REG_ENSURE(!rootKey.getKeyNames(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), subKeyNames), "test_registry_CppApi error 7n"); + REG_ENSURE(!rootKey.getKeyNames(OUString("mySixthKey"), subKeyNames), "test_registry_CppApi error 7n"); nSubKeys = subKeyNames.getLength(); REG_ENSURE(nSubKeys == 2, "test_registry_CppApi error 7n1"); @@ -482,7 +482,7 @@ void test_registry_CppApi() RegistryKeyArray subKeys; nSubKeys=0; - REG_ENSURE(!rootKey.openSubKeys(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")), subKeys), "test_registry_CppApi error 7o"); + REG_ENSURE(!rootKey.openSubKeys(OUString("myFirstKey"), subKeys), "test_registry_CppApi error 7o"); nSubKeys = subKeys.getLength(); REG_ENSURE(nSubKeys == 2, "test_registry_CppApi error 7o1"); @@ -492,24 +492,24 @@ void test_registry_CppApi() REG_ENSURE(!rootKey.closeSubKeys(subKeys), "test_registry_CppApi error 7q)"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key8), "test_registry_CppApi error 8"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST/Child1")), key8), "test_registry_CppApi error 8a"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST/Child2")), key8), "test_registry_CppApi error 8a1"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key9), "test_registry_CppApi error 8b"); + REG_ENSURE(!rootKey.createKey(OUString("/TEST"), key8), "test_registry_CppApi error 8"); + REG_ENSURE(!rootKey.createKey(OUString("/TEST/Child1"), key8), "test_registry_CppApi error 8a"); + REG_ENSURE(!rootKey.createKey(OUString("/TEST/Child2"), key8), "test_registry_CppApi error 8a1"); + REG_ENSURE(!rootKey.openKey(OUString("/TEST"), key9), "test_registry_CppApi error 8b"); REG_ENSURE(!key8.closeKey() && !key9.closeKey(), "test_registry_CppApi error 8b1"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key8), "test_registry_CppApi error 8b"); + REG_ENSURE(!rootKey.openKey(OUString("/TEST"), key8), "test_registry_CppApi error 8b"); REG_ENSURE(!key8.closeKey(), "test_registry_CppApi error 8c"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST")), key8), "test_registry_CppApi error 8c"); + REG_ENSURE(!rootKey.openKey(OUString("TEST"), key8), "test_registry_CppApi error 8c"); REG_ENSURE(!key8.closeKey(), "test_registry_CppApi error 8d"); sal_Char* Value=(sal_Char*)"Mein erster Value"; - REG_ENSURE(!rootKey.setValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), RG_VALUETYPE_STRING, Value, 18), "test_registry_CppApi error 9"); + REG_ENSURE(!rootKey.setValue(OUString("mySecondKey"), RG_VALUETYPE_STRING, Value, 18), "test_registry_CppApi error 9"); RegValueType valueType; sal_uInt32 valueSize; sal_Char* readValue; - REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), &valueType, &valueSize), "test_registry_CppApi error 9a"); + REG_ENSURE(!rootKey.getValueInfo(OUString("mySecondKey"), &valueType, &valueSize), "test_registry_CppApi error 9a"); readValue = (sal_Char*)rtl_allocateMemory(valueSize); REG_ENSURE(!key2.getValue(OUString(), readValue), "test_registry_CppApi error 10"); @@ -528,16 +528,16 @@ void test_registry_CppApi() pList[1]=n2; pList[2]=n3; - REG_ENSURE(!rootKey.setStringListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), (sal_Char**)pList, 3), "test_registry_CppApi error 13a"); + REG_ENSURE(!rootKey.setStringListValue(OUString("myFourthKey"), (sal_Char**)pList, 3), "test_registry_CppApi error 13a"); RegistryValueList<sal_Char*> valueList; - REG_ENSURE(!rootKey.getStringListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), valueList), "test_registry_CppApi error 13b"); + REG_ENSURE(!rootKey.getStringListValue(OUString("myFourthKey"), valueList), "test_registry_CppApi error 13b"); REG_ENSURE(strcmp(n1, valueList.getElement(0)) == 0, "test_registry_CppApi error 13c"); REG_ENSURE(strcmp(n2, valueList.getElement(1)) == 0, "test_registry_CppApi error 13d"); REG_ENSURE(strcmp(n3, valueList.getElement(2)) == 0, "test_registry_CppApi error 13e"); - REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), &valueType, &valueSize), "test_registry_CppApi error 13e1"); + REG_ENSURE(!rootKey.getValueInfo(OUString("myFourthKey"), &valueType, &valueSize), "test_registry_CppApi error 13e1"); REG_ENSURE(valueType == RG_VALUETYPE_STRINGLIST, "test_registry_CppApi error 13e2"); REG_ENSURE(valueSize == 3, "test_registry_CppApi error 13e3"); @@ -546,40 +546,40 @@ void test_registry_CppApi() pLong[1] = 456; pLong[2] = 789; - REG_ENSURE(!rootKey.setLongListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), pLong, 3), "test_registry_CppApi error 13f"); + REG_ENSURE(!rootKey.setLongListValue(OUString("myFifthKey"), pLong, 3), "test_registry_CppApi error 13f"); RegistryValueList<sal_Int32> longList; - REG_ENSURE(!rootKey.getLongListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), longList), "test_registry_CppApi error 13g"); + REG_ENSURE(!rootKey.getLongListValue(OUString("myFifthKey"), longList), "test_registry_CppApi error 13g"); REG_ENSURE(pLong[0] == longList.getElement(0), "test_registry_CppApi error 13h"); REG_ENSURE(pLong[1] == longList.getElement(1), "test_registry_CppApi error 13i"); REG_ENSURE(pLong[2] == longList.getElement(2), "test_registry_CppApi error 13j"); - OUString sWTestValue(RTL_CONSTASCII_USTRINGPARAM("Mein erster Unicode Value")); + OUString sWTestValue("Mein erster Unicode Value"); const sal_Unicode* wTestValue= sWTestValue.getStr(); - REG_ENSURE(!rootKey.setValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), RG_VALUETYPE_UNICODE, (void*)wTestValue, + REG_ENSURE(!rootKey.setValue(OUString("mySixthKey"), RG_VALUETYPE_UNICODE, (void*)wTestValue, (rtl_ustr_getLength(wTestValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 13j1"); - REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), &valueType, &valueSize), "test_registry_CppApi error 13j2"); + REG_ENSURE(!rootKey.getValueInfo(OUString("mySixthKey"), &valueType, &valueSize), "test_registry_CppApi error 13j2"); sal_Unicode* pTmpValue = (sal_Unicode*)rtl_allocateMemory(valueSize); - REG_ENSURE(!rootKey.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), pTmpValue), "test_registry_CppApi error 13j3"); + REG_ENSURE(!rootKey.getValue(OUString("mySixthKey"), pTmpValue), "test_registry_CppApi error 13j3"); REG_ENSURE(rtl_ustr_getLength(wTestValue) == rtl_ustr_getLength(pTmpValue), "test_registry_CppApi error 13j4"); REG_ENSURE(rtl_ustr_compare(wTestValue, pTmpValue) == 0, "test_registry_CppApi error 13j4"); const sal_Unicode* pUnicode[3]; - OUString w1(RTL_CONSTASCII_USTRINGPARAM("Hallo")); - OUString w2(RTL_CONSTASCII_USTRINGPARAM("jetzt komm")); - OUString w3(RTL_CONSTASCII_USTRINGPARAM("ich als unicode")); + OUString w1("Hallo"); + OUString w2("jetzt komm"); + OUString w3("ich als unicode"); pUnicode[0]=w1.getStr(); pUnicode[1]=w2.getStr(); pUnicode[2]=w3.getStr(); - REG_ENSURE(!rootKey.setUnicodeListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), (sal_Unicode**)pUnicode, 3), "test_registry_CppApi error 13k"); + REG_ENSURE(!rootKey.setUnicodeListValue(OUString("mySixthKey"), (sal_Unicode**)pUnicode, 3), "test_registry_CppApi error 13k"); RegistryValueList<sal_Unicode*> unicodeList; - REG_ENSURE(!rootKey.getUnicodeListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), unicodeList), "test_registry_CppApi error 13l"); + REG_ENSURE(!rootKey.getUnicodeListValue(OUString("mySixthKey"), unicodeList), "test_registry_CppApi error 13l"); REG_ENSURE(rtl_ustr_compare(w1, unicodeList.getElement(0)) == 0, "test_registry_CppApi error 13m"); REG_ENSURE(rtl_ustr_compare(w2, unicodeList.getElement(1)) == 0, "test_registry_CppApi error 13n"); @@ -591,16 +591,16 @@ void test_registry_CppApi() !key3.closeKey() && !key4.closeKey(), "test_registry_CppApi error 14"); - REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey"))), "test_registry_CppApi error 15"); + REG_ENSURE(!rootKey.deleteKey(OUString("myFirstKey")), "test_registry_CppApi error 15"); REG_ENSURE(!key2.closeKey(), "test_registry_CppApi error 16"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), key2), "test_registry_CppApi error 17"); + REG_ENSURE(!rootKey.openKey(OUString("mySecondKey"), key2), "test_registry_CppApi error 17"); REG_ENSURE(!key5.closeKey(), "test_registry_CppApi error 18"); - REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey"))), "test_registry_CppApi error 19"); + REG_ENSURE(!rootKey.deleteKey(OUString("myThirdKey")), "test_registry_CppApi error 19"); - REG_ENSURE(rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")), key5), "test_registry_CppApi error 20"); + REG_ENSURE(rootKey.openKey(OUString("myThirdKey"), key5), "test_registry_CppApi error 20"); REG_ENSURE(!key2.closeKey() && !rootKey.closeKey(), "test_registry_CppApi error 21"); @@ -610,14 +610,14 @@ void test_registry_CppApi() // Test loadkey RegistryKey rootKey2, key21, key22, key23, key24 , key25; - REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 23"); + REG_ENSURE(!myRegistry->create(OUString("test2.rdb")), "test_registry_CppApi error 23"); REG_ENSURE(!myRegistry->openRootKey(rootKey2), "test_registry_CppApi error 24"); - REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstKey")), key21), "test_registry_CppApi error 25"); - REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondKey")), key22), "test_registry_CppApi error 26"); - REG_ENSURE(!key21.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstSubKey")), key23), "test_registry_CppApi error 27"); - REG_ENSURE(!key21.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondSubKey")), key24), "test_registry_CppApi error 28"); - REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2ThirdKey")), key25), "test_registry_CppApi error 29"); + REG_ENSURE(!rootKey2.createKey(OUString("reg2FirstKey"), key21), "test_registry_CppApi error 25"); + REG_ENSURE(!rootKey2.createKey(OUString("reg2SecondKey"), key22), "test_registry_CppApi error 26"); + REG_ENSURE(!key21.createKey(OUString("reg2FirstSubKey"), key23), "test_registry_CppApi error 27"); + REG_ENSURE(!key21.createKey(OUString("reg2SecondSubKey"), key24), "test_registry_CppApi error 28"); + REG_ENSURE(!rootKey2.createKey(OUString("reg2ThirdKey"), key25), "test_registry_CppApi error 29"); sal_uInt32 nValue= 123456789; REG_ENSURE(!key23.setValue(OUString(), RG_VALUETYPE_LONG, &nValue, sizeof(sal_uInt32)), "test_registry_CppApi error 30"); @@ -631,38 +631,38 @@ void test_registry_CppApi() REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 32"); - REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 33"); + REG_ENSURE(!myRegistry->open(OUString("test.rdb"), REG_READWRITE), "test_registry_CppApi error 33"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 34"); - REG_ENSURE(!myRegistry->loadKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")), - OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 35"); - REG_ENSURE(!myRegistry->saveKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")), - OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 36"); + REG_ENSURE(!myRegistry->loadKey(rootKey, OUString("allFromTest2"), + OUString("test2.rdb")), "test_registry_CppApi error 35"); + REG_ENSURE(!myRegistry->saveKey(rootKey, OUString("allFromTest2"), + OUString("test3.rdb")), "test_registry_CppApi error 36"); - REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), key1), "test_registry_CppApi error 37"); - REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey2")), key2), "test_registry_CppApi error 38"); - REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey2")), key3), "test_registry_CppApi error 39"); + REG_ENSURE(!rootKey.createKey(OUString("allFromTest3"), key1), "test_registry_CppApi error 37"); + REG_ENSURE(!key1.createKey(OUString("myFirstKey2"), key2), "test_registry_CppApi error 38"); + REG_ENSURE(!key1.createKey(OUString("mySecondKey2"), key3), "test_registry_CppApi error 39"); - REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), - OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 40"); - REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), - OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb")), sal_True), "test_registry_CppApi error 40.a)"); + REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString("allFromTest3"), + OUString("test3.rdb")), "test_registry_CppApi error 40"); + REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString("allFromTest3"), + OUString("ucrtest.rdb"), sal_True), "test_registry_CppApi error 40.a)"); -// REG_ENSURE(myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb")), sal_True) +// REG_ENSURE(myRegistry->mergeKey(rootKey, OUString("allFromTest3"), OUString("ucrtest.rdb"), sal_True) // == REG_NO_ERROR/*REG_MERGE_CONFLICT*/, "test_registry_CppApi error 40.b)"); REG_ENSURE(!key1.closeKey() && !key2.closeKey(), "test_registry_CppApi error 41"); - const sal_Unicode* wValue= OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster Unicode Value")).getStr(); + const sal_Unicode* wValue= OUString("Mein erster Unicode Value").getStr(); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue, (rtl_ustr_getLength(wValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 42"); REG_ENSURE(!key3.closeKey(), "test_registry_CppApi error 43"); - REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey")), key1), + REG_ENSURE(!rootKey.openKey(OUString("/allFromTest3/reg2FirstKey/reg2FirstSubKey"), key1), "test_registry_CppApi error 43.a)"); - REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey"))), "test_registry_CppApi error 44"); + REG_ENSURE(!rootKey.deleteKey(OUString("/allFromTest3/reg2FirstKey/reg2FirstSubKey")), "test_registry_CppApi error 44"); REG_ENSURE(key1.getValueInfo(OUString(), &valueType, &valueSize) == REG_INVALID_KEY, "test_registry_CppApi error 44.a)"); REG_ENSURE(!key1.closeKey(), "test_registry_CppApi error 44.b)"); @@ -671,9 +671,9 @@ void test_registry_CppApi() REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 46"); - REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 47"); + REG_ENSURE(!myRegistry->open(OUString("test.rdb"), REG_READWRITE), "test_registry_CppApi error 47"); - REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 48"); + REG_ENSURE(!myRegistry->destroy(OUString("test2.rdb")), "test_registry_CppApi error 48"); // REG_ENSURE(!myRegistry->destroy("test3.rdb"), "test_registry_CppApi error 49"); Registry *myRegistry2 = new Registry(*myRegistry); @@ -682,22 +682,22 @@ void test_registry_CppApi() delete(myRegistry2); - REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb"))), "test_registry_CppApi error 51"); + REG_ENSURE(!myRegistry->create(OUString("destroytest.rdb")), "test_registry_CppApi error 51"); REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 52"); - REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb")), REG_READONLY), "test_registry_CppApi error 53"); + REG_ENSURE(!myRegistry->open(OUString("destroytest.rdb"), REG_READONLY), "test_registry_CppApi error 53"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 54"); - REG_ENSURE(myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), - OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 55"); - REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 56"); + REG_ENSURE(myRegistry->mergeKey(rootKey, OUString("allFromTest3"), + OUString("test3.rdb")), "test_registry_CppApi error 55"); + REG_ENSURE(!myRegistry->destroy(OUString("test3.rdb")), "test_registry_CppApi error 56"); REG_ENSURE(!rootKey.closeKey(), "test_registry_CppApi error 57"); REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 58"); - REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb")), REG_READWRITE), "test_registry_CppApi error 59"); + REG_ENSURE(!myRegistry->open(OUString("destroytest.rdb"), REG_READWRITE), "test_registry_CppApi error 59"); REG_ENSURE(!myRegistry->destroy(OUString()), "test_registry_CppApi error 60"); - REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 61"); - REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb"))), "test_registry_CppApi error 62"); + REG_ENSURE(!myRegistry->open(OUString("test.rdb"), REG_READWRITE), "test_registry_CppApi error 61"); + REG_ENSURE(!myRegistry->destroy(OUString("ucrtest.rdb")), "test_registry_CppApi error 62"); REG_ENSURE(!myRegistry->destroy(OUString()), "test_registry_CppApi error 63"); delete(myRegistry); diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx index 998bc625de0a..5fead7367884 100644 --- a/registry/tools/checksingleton.cxx +++ b/registry/tools/checksingleton.cxx @@ -306,7 +306,7 @@ int _cdecl main( int argc, char * argv[] ) } RegistryKey singletonKey; - if ( indexRoot.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("SINGLETONS")), singletonKey) ) + if ( indexRoot.createKey(OUString("SINGLETONS"), singletonKey) ) { fprintf(stderr, "%s: open/create SINGLETONS key of registry \"%s\" failed\n", options.getProgramName().c_str(), options.getIndexReg().c_str()); diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx index b6c3f42f29d4..51d39bbba72a 100644 --- a/registry/workben/regspeed.cxx +++ b/registry/workben/regspeed.cxx @@ -108,9 +108,9 @@ int _cdecl main( int argc, char * argv[] ) { RegHandle hReg; RegKeyHandle hRootKey, hKey, hSubKey, hSubSubKey; - OUString sName1(RTL_CONSTASCII_USTRINGPARAM("regkey")); - OUString sName2(RTL_CONSTASCII_USTRINGPARAM("regSubkey")); - OUString sName3(RTL_CONSTASCII_USTRINGPARAM("regSubSubkey")); + OUString sName1("regkey"); + OUString sName2("regSubkey"); + OUString sName3("regSubSubkey"); OUString keyName1; OUString keyName2; OUString keyName3; @@ -129,7 +129,7 @@ int _cdecl main( int argc, char * argv[] ) S2 = atoi(argv[2]); S3 = atoi(argv[3]); - OUString speedReg( RTL_CONSTASCII_USTRINGPARAM("speed.reg")); + OUString speedReg( "speed.reg"); if (reg_createRegistry(speedReg.pData, &hReg)) { cout << "creating registry \"test.reg\" failed\n"; @@ -189,7 +189,7 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 i=0; i < S1; i++) { - keyName1 = OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + keyName1 = OUString("/"); keyName1 += sName1; keyName1 += OUString().valueOf(i); if (reg_openKey(hRootKey, keyName1.pData, &hKey)) @@ -198,10 +198,10 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 j=0; j < S2; j++) { - keyName2 = OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + keyName2 = OUString("/"); keyName2 += sName1; keyName2 += OUString().valueOf(i); - keyName2 += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + keyName2 += OUString("/"); keyName2 += sName2; keyName2 += OUString().valueOf(j); if (reg_openKey(hRootKey, keyName2.pData, &hSubKey)) @@ -210,13 +210,13 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 n=0; n < S3; n++) { - keyName3 = OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + keyName3 = OUString("/"); keyName3 += sName1; keyName3 += OUString().valueOf(i); - keyName3 += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + keyName3 += OUString("/"); keyName3 += sName2; keyName3 += OUString().valueOf(j); - keyName3 += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + keyName3 += OUString("/"); keyName3 += sName3; keyName3 += OUString().valueOf(n); if (reg_openKey(hRootKey, keyName3.pData, &hSubSubKey)) diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx index 4307992c2e4d..7c8a393b3733 100644 --- a/registry/workben/regtest.cxx +++ b/registry/workben/regtest.cxx @@ -50,7 +50,7 @@ int _cdecl main() cout << "\n Simple Registry Test !!! \n\n"; - if (reg_createRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg)) + if (reg_createRegistry(OUString("test4.rdb").pData, &hReg)) cout << "\t0. creating registry \"test4.rdb\" failed\n"; else cout << "0. registry test4.rdb is created\n"; @@ -60,23 +60,23 @@ int _cdecl main() else cout << "1. root key of \"test4.rdb\" is opened\n"; - if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData, &hKey1)) + if (reg_createKey(hRootKey, OUString("myFirstKey").pData, &hKey1)) cout << "\t2. creating key \"myFirstKey\" failed\n"; else cout << "2. key \"myFirstKey\" is created\n"; - if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &hKey2)) + if (reg_createKey(hRootKey, OUString("mySecondKey").pData, &hKey2)) cout << "\t3. creating key \"mySecondKey\" failed\n"; else cout << "3. key \"mySecondKey\" is created\n"; - if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstSubKey")).pData, &hKey3)) + if (reg_createKey(hKey1, OUString("myFirstSubKey").pData, &hKey3)) cout << "\t4. creating subkey \"myFirstSubKey\" failed\n"; else cout << "4. subkey \"myFirstSubKey\" is created\n"; - if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondSubKey")).pData, &hKey4)) + if (reg_createKey(hKey1, OUString("mySecondSubKey").pData, &hKey4)) cout << "\t5. creating subkey \"mySecondSubKey\" failed\n"; else cout << "5. subkey \"mySecondSubKey\" is created\n"; - if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData, &hKey5)) + if (reg_createKey(hRootKey, OUString("myThirdKey").pData, &hKey5)) cout << "\t6. creating key \"myThirdKey\" is created\n\n"; else cout << "6. key \"myThirdKey\" is created\n\n"; @@ -84,7 +84,7 @@ int _cdecl main() RegKeyHandle* phSubKeys; sal_uInt32 nSubKeys; - if (reg_openSubKeys(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData, &phSubKeys, &nSubKeys)) + if (reg_openSubKeys(hRootKey, OUString("myFirstKey").pData, &phSubKeys, &nSubKeys)) cout << "\t7. open subkeys of \"myfirstKey\" failed\n"; else cout << "7. open " << nSubKeys << "subkeys of \"myfirstKey\"\n"; @@ -102,7 +102,7 @@ int _cdecl main() char* Value=(char*)"Mein erster Value"; - if (reg_setValue(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, RG_VALUETYPE_STRING, Value, 18)) + if (reg_setValue(hRootKey, OUString("mySecondKey").pData, RG_VALUETYPE_STRING, Value, 18)) cout << "\t9. setValue of key \"mySecondKey\" failed\n"; else cout << "9. setValue (string Value) of key \"mySecondKey\"\n"; @@ -110,7 +110,7 @@ int _cdecl main() RegValueType valueType; sal_uInt32 valueSize; sal_Char* readValue; - if (reg_getValueInfo(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &valueType, &valueSize)) + if (reg_getValueInfo(hRootKey, OUString("mySecondKey").pData, &valueType, &valueSize)) cout << "\t10. getValueInfo of key \"mySecondKey\" failed\n"; else cout << "10. getValueInfo of key \"mySecondKey\"\n"; @@ -135,7 +135,7 @@ int _cdecl main() else cout << "12. keys \"myFirstKey\" \"myfistSubKey\" \"mySecondSubKey\" are closed\n"; - if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData)) + if (reg_deleteKey(hRootKey, OUString("myFirstKey").pData)) cout << "13.\t delete key \"myFirstKey\" failed\n"; else cout << "13. key \"myFirstKey\" is deleted\n"; @@ -145,7 +145,7 @@ int _cdecl main() else cout << "14. key \"mySecondKey\" is closed\n"; - if (reg_openKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &hKey2)) + if (reg_openKey(hRootKey, OUString("mySecondKey").pData, &hKey2)) cout << "\n15. open key \"mySecondKey\" failed\n"; else cout << "15. key \"mySecondKey\" is opended\n"; @@ -154,12 +154,12 @@ int _cdecl main() cout << "\t15. closing key \"myThirdSubKey\" failed\n"; else cout << "15. key \"myThirdSubKey\" is closed\n"; - if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData)) + if (reg_deleteKey(hRootKey, OUString("myThirdKey").pData)) cout << "\t16. delete key \"myThirdKey\" failed\n"; else cout << "16. key \"myThirdKey\" is deleted\n"; - if (reg_openKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData, &hKey5)) + if (reg_openKey(hRootKey, OUString("myThirdKey").pData, &hKey5)) cout << "\t17. open key \"myThirdKey\" failed\n"; else cout << "17. key \"myThirdKey\" is opened\n"; @@ -187,7 +187,7 @@ int _cdecl main() RegHandle hReg2; RegKeyHandle hRootKey2, h2Key1, h2Key2, h2Key3, h2Key4, h2Key5; - if (reg_createRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test5.rdb")).pData, &hReg2)) + if (reg_createRegistry(OUString("test5.rdb").pData, &hReg2)) cout << "\t21. creating registry \"test5.rdb\" failed\n"; else cout << "21. registry \"test5.rdb\" is created\n"; @@ -197,23 +197,23 @@ int _cdecl main() else cout << "22. root key of \"test5.rdb\" is opened\n"; - if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstKey")).pData, &h2Key1)) + if (reg_createKey(hRootKey2, OUString("reg2FirstKey").pData, &h2Key1)) cout << "\t23. creating key \"reg2FirstKey\" failed\n"; else cout << "23. key \"reg2FirstKey\" is created\n"; - if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondKey")).pData, &h2Key2)) + if (reg_createKey(hRootKey2, OUString("reg2SecondKey").pData, &h2Key2)) cout << "\t24. creating key \"reg2SecondKey\" failed\n"; else cout << "24. key \"reg2SecondKey\" is created\n"; - if (reg_createKey(h2Key1, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstSubKey")).pData, &h2Key3)) + if (reg_createKey(h2Key1, OUString("reg2FirstSubKey").pData, &h2Key3)) cout << "\t25. creating key \"reg2FirstSubKey\" failed\n"; else cout << "25. key \"reg2FirstSubKey\" is created\n"; - if (reg_createKey(h2Key1, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondSubKey")).pData, &h2Key4)) + if (reg_createKey(h2Key1, OUString("reg2SecondSubKey").pData, &h2Key4)) cout << "\26. creating key \"reg2SecondSubKey\" failed\n"; else cout << "26. key \"reg2SecondSubKey\" is created\n"; - if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2ThirdKey")).pData, &h2Key5)) + if (reg_createKey(hRootKey2, OUString("reg2ThirdKey").pData, &h2Key5)) cout << "\n27. creating key \"reg2ThirdKey\" failed\n"; else cout << "27. key \"reg2ThirdKey\" is created\n"; @@ -243,7 +243,7 @@ int _cdecl main() else cout << "30. registry test5.rdb is closed\n"; - if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg, REG_READWRITE)) + if (reg_openRegistry(OUString("test4.rdb").pData, &hReg, REG_READWRITE)) cout << "\t31. registry test4.rdb is opened\n"; else cout << "31. registry test4.rdb is opened\n"; @@ -253,34 +253,34 @@ int _cdecl main() else cout << "32. root key of \"test4.rdb\" is opened\n"; - if (reg_loadKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")).pData, - OUString(RTL_CONSTASCII_USTRINGPARAM("test5.rdb")).pData)) + if (reg_loadKey(hRootKey, OUString("allFromTest2").pData, + OUString("test5.rdb").pData)) cout << "\n\t33. load all keys from \"test5.rdb\" under key \"allFromTest2\" failed\n"; else cout << "\n33. load all keys from test5.rdb under key \"allFromTest2\"\n"; - if (reg_saveKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")).pData, - OUString(RTL_CONSTASCII_USTRINGPARAM("test6.rdb")).pData)) + if (reg_saveKey(hRootKey, OUString("allFromTest2").pData, + OUString("test6.rdb").pData)) cout << "\n\t34. save all keys under \"allFromTest2\" in test6.rdb\n"; else cout << "\n34. save all keys under \"allFromTest2\" in test6.rdb\n"; - if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")).pData, &hKey1)) + if (reg_createKey(hRootKey, OUString("allFromTest3").pData, &hKey1)) cout << "\t35. creating key \"allFromTest3\" failed\n"; else cout << "36. key \"allFromTest3\" is created\n"; - if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey2")).pData, &hKey2)) + if (reg_createKey(hKey1, OUString("myFirstKey2").pData, &hKey2)) cout << "\t37. creating key \"myFirstKey2\" failed\n"; else cout << "37. key \"myFirstKey2\" is created\n"; - if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey2")).pData, &hKey3)) + if (reg_createKey(hKey1, OUString("mySecondKey2").pData, &hKey3)) cout << "\t38. creating key \"mySecondKey2\" failed\n"; else cout << "38. key \"mySecondKey2\" is created\n"; - if (reg_mergeKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")).pData, - OUString(RTL_CONSTASCII_USTRINGPARAM("test6.rdb")).pData, sal_False, sal_False)) + if (reg_mergeKey(hRootKey, OUString("allFromTest3").pData, + OUString("test6.rdb").pData, sal_False, sal_False)) cout << "\n\t39. merge all keys under \"allFromTest2\" with all in test6.rdb\n"; else cout << "\n39. merge all keys under \"allFromTest2\" with all in test6.rdb\n"; @@ -299,18 +299,18 @@ int _cdecl main() cout << "\n42. closing key \"mySecondKey2\" of \"test5.rdb\"\n"; - if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey")).pData)) + if (reg_deleteKey(hRootKey, OUString("/allFromTest3/reg2FirstKey/reg2FirstSubKey").pData)) cout << "\n\t43. delete key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" failed\n"; else cout << "\n43. key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" is deleted\n"; - if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg2, REG_READONLY)) + if (reg_openRegistry(OUString("test4.rdb").pData, &hReg2, REG_READONLY)) cout << "\n\t44. registry test4.rdb is opened for read only\n"; else cout << "\n44. registry test4.rdb is opened for read only\n"; RegHandle hReg3; - if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg3, REG_READONLY)) + if (reg_openRegistry(OUString("test4.rdb").pData, &hReg3, REG_READONLY)) cout << "\n\t44.a). registry test4.rdb is opened for read only\n"; else cout << "\n44.a). registry test4.rdb is opened for read only\n"; diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx index 0cc0d714411a..ddbb1a43512e 100644 --- a/sal/osl/w32/path_helper.cxx +++ b/sal/osl/w32/path_helper.cxx @@ -42,8 +42,8 @@ Constants ******************************************************************/ -const rtl::OUString BACKSLASH (RTL_CONSTASCII_USTRINGPARAM("\\")); -const rtl::OUString SLASH (RTL_CONSTASCII_USTRINGPARAM("/")); +const rtl::OUString BACKSLASH ("\\"); +const rtl::OUString SLASH ("/"); /******************************************************************* osl_systemPathEnsureSeparator diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index c460acbbdc14..022e2e01b8c6 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -66,9 +66,9 @@ inline void printUString( const ::rtl::OUString & str ) inline ::rtl::OUString getDllURL( void ) { #if ( defined WNT ) // lib in Unix and lib in Windows are not same in file name. - ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("test_Module_DLL.dll") ); + ::rtl::OUString libPath( "test_Module_DLL.dll" ); #else - ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("libtest_Module_DLL.so") ); + ::rtl::OUString libPath( "libtest_Module_DLL.so" ); #endif ::rtl::OUString dirPath, dllPath; @@ -81,7 +81,7 @@ inline ::rtl::OUString getDllURL( void ) inline sal_Bool isURL( const ::rtl::OUString pathname ) { - ::rtl::OUString aPreURL( RTL_CONSTASCII_USTRINGPARAM("file:///") ); + ::rtl::OUString aPreURL( "file:///" ); return ( ( pathname.indexOf( aPreURL ) == 0 ) ? sal_True : sal_False ); } @@ -243,7 +243,7 @@ namespace osl_Module #if !defined( MACOSX ) // TODO: Find out why this fails on Mac OS X ::osl::Module aMod( getDllURL( ) ); - FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) ); + FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString("firstfunc") ); OUString aFileURL; bRes = osl::Module::getUrlFromAddress( ( void* )pFunc, aFileURL ); @@ -366,7 +366,7 @@ namespace osl_Module #if !defined( MACOSX ) // TODO: Find out why this fails on Mac OS X ::osl::Module aMod( getDllURL( ) ); - FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) ); + FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString("firstfunc") ); bRes = sal_False; if ( pFunc ) bRes = pFunc( bRes ); @@ -413,7 +413,7 @@ namespace osl_Module #if !defined( MACOSX ) // TODO: Find out why this fails on Mac OS X ::osl::Module aMod( getDllURL( ) ); - ::rtl::OUString funcName( RTL_CONSTASCII_USTRINGPARAM("firstfunc") ); + ::rtl::OUString funcName( "firstfunc" ); FuncPtr pFunc = ( FuncPtr ) osl_getSymbol( (oslModule)aMod, funcName.pData ); bRes = sal_False; @@ -446,7 +446,7 @@ namespace osl_Module #if !defined( MACOSX ) // TODO: Find out why this fails on Mac OS X ::osl::Module aMod( getDllURL( ) ); - oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) ); + oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString("firstfunc") ); ::rtl::OUString aLibraryURL; bRes = ::osl::Module::getUrlFromAddress( oslFunc, aLibraryURL); aMod.unload(); diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index a393e4b9d881..85982858c330 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -133,9 +133,9 @@ inline void printPipeError( ::osl::Pipe aPipe ) //------------------------------------------------------------------------ // pipe name and transfer contents //------------------------------------------------------------------------ -const rtl::OUString aTestPipeName(RTL_CONSTASCII_USTRINGPARAM("testpipe2")); -const rtl::OUString aTestPipe1(RTL_CONSTASCII_USTRINGPARAM("testpipe1")); -const rtl::OUString aTestString(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems")); +const rtl::OUString aTestPipeName("testpipe2"); +const rtl::OUString aTestPipe1("testpipe1"); +const rtl::OUString aTestString("Sun Microsystems"); const OString m_pTestString1("Sun Microsystems"); const OString m_pTestString2("test pipe PASS/OK"); diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index fbfa5c0793e1..2666b14b512d 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -195,8 +195,8 @@ namespace osl_AcceptorSocket void listen_accept_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -217,9 +217,9 @@ namespace osl_AcceptorSocket void listen_accept_002() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index ce7fd59f6ae8..255013acc034 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -160,9 +160,9 @@ namespace osl_ConnectorSocket void connect_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -189,9 +189,9 @@ namespace osl_ConnectorSocket //non-blocking mode connect? void connect_002() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); asAcceptorSocket.enableNonBlockingMode( sal_True ); @@ -215,8 +215,8 @@ namespace osl_ConnectorSocket // how to design senarios that will return osl_Socket_Interrupted, osl_Socket_TimedOut void connect_003() { - ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT3 ); csConnectorSocket.enableNonBlockingMode( sal_False ); @@ -233,7 +233,7 @@ namespace osl_ConnectorSocket // really an error in non-blocking mode void connect_004() { - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT3 ); csConnectorSocket.enableNonBlockingMode( sal_True ); diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index 586c197eea88..b5979ebbd57e 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -152,7 +152,7 @@ protected: public: TalkerThread( ): - saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ) + saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ) { } @@ -173,7 +173,7 @@ protected: void SAL_CALL run( ) { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 ); dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); if ( dsSocket.bind( saLocalSocketAddr ) == sal_False ) { @@ -195,7 +195,7 @@ protected: public: sal_Char pRecvBuffer[30]; ListenerThread( ): - saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ) + saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 ) { pRecvBuffer[0] = '\0'; } @@ -221,7 +221,7 @@ public: void sr_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ); ::osl::DatagramSocket dsSocket; dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); dsSocket.bind( saLocalSocketAddr ); @@ -241,7 +241,7 @@ public: void sr_002() { - ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; //listener thread construct a DatagramSocket, recvFrom waiting for data, then main thread sendto data @@ -266,7 +266,7 @@ public: //sendTo error, return -1; recvFrom error, return -1 void sr_003() { - ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; // Transport endpoint is not connected sal_Int32 nSend = dsSocket.sendTo( saListenSocketAddr, pTestString2, strlen( pTestString2 ) + 1 ); @@ -276,8 +276,8 @@ public: void sr_004() { - ::osl::SocketAddr saListenSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 ); - ::osl::SocketAddr saListenSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr1( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr2( rtl::OUString("129.158.217.202"), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; dsSocket.enableNonBlockingMode( sal_True ); diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 92c4a37691c0..77a8515e9c4c 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -223,11 +223,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r if ( returnVal.equals( rightVal ) ) return aUString; aUString += ::rtl::OUString::createFromAscii(msg); - aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '")); + aUString += ::rtl::OUString(": the returned value is '"); aUString += returnVal; - aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '")); + aUString += ::rtl::OUString("', but the value should be '"); aUString += rightVal; - aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); + aUString += ::rtl::OUString("'."); return aUString; } @@ -781,11 +781,11 @@ namespace osl_SocketAddr sal_Bool bOk = compareUString(suHost, suHost2); - rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'")); + rtl::OUString suError ("Host names should be the same. From SocketAddr.getLocalHostname() it is'"); suError += suHost; - suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '")); + suError += rtl::OUString("', from getThisHostname() it is '"); suError += suHost2; - suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); + suError += rtl::OUString("'."); CPPUNIT_ASSERT_MESSAGE(STD_STRING(suError), sal_True == bOk); } @@ -973,7 +973,7 @@ namespace osl_SocketAddr // LLA: this function does not work in company (Linux, Windows) but at home void getHostname_002() { - rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com")); + rtl::OUString suHostname ("cn-1.germany.sun.com"); rtl::OUString aHostIP = getIPbyName( oustring2char( suHostname ) ); ::osl::SocketAddr saSocketAddr( aHostName1, IP_PORT_FTP ); @@ -1439,7 +1439,7 @@ namespace osl_SocketAddr /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, - const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) ); + const ::rtl::OUString & strProtocolName= ::rtl::OUString("tcp") ); */ class gettheServicePort : public CppUnit::TestFixture @@ -1467,7 +1467,7 @@ namespace osl_SocketAddr void gettheServicePort_004() { CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.", - OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), aProtocolUDP ) ); + OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString("notexist"), aProtocolUDP ) ); } CPPUNIT_TEST_SUITE( gettheServicePort ); @@ -1809,7 +1809,7 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sSocket.getLocalAddr( saLocalSocketAddr ); @@ -1857,7 +1857,7 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( ) ); @@ -1888,7 +1888,7 @@ namespace osl_Socket (void)bOK; #else //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT - ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case")); + ::rtl::OUString suError ("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"); #endif CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_False ); @@ -1902,10 +1902,10 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")), + ::rtl::OUString("34463"), "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned"); sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 && sSocket.getLocalPort( ) <= 65535); @@ -1954,7 +1954,7 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sal_Bool bOK; ::rtl::OUString suError; diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index 040c64493d15..ac3fcf5dc98b 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -379,7 +379,7 @@ namespace osl_Socket { //#if defined(LINUX) ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString("127.0.0.1") ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -398,7 +398,7 @@ namespace osl_Socket void close_003() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0.0.0")) ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString("0.0.0.0") ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -440,13 +440,13 @@ namespace osl_Socket void getLocalAddr_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT8 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT8 ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sSocket.getLocalAddr( saLocalSocketAddr ); @@ -488,13 +488,13 @@ namespace osl_Socket void getLocalPort_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT7 ); // aHostIp1 localhost + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT7 ); // aHostIp1 localhost ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( ) ); @@ -512,7 +512,7 @@ namespace osl_Socket */ void getLocalPort_002() { - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_TELNET); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_TELNET); #ifdef WNT ::osl::Socket sSocket(sHandle); sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True); @@ -525,7 +525,7 @@ namespace osl_Socket (void)bOK; #else //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT - ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case")); + ::rtl::OUString suError ("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"); #endif CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_False ); @@ -539,10 +539,10 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")), + ::rtl::OUString("34463"), "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned"); sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 && sSocket.getLocalPort( ) <= 65535); @@ -586,12 +586,12 @@ namespace osl_Socket { ::osl::Socket sSocket(sHandle); //port number from IP_PORT_HTTP1 to IP_PORT_MYPORT6, mindyliu - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT6 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT6 ); sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sal_Bool bOK; ::rtl::OUString suError; @@ -613,13 +613,13 @@ namespace osl_Socket void getLocalHost_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_POP3); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_POP3); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr ); //Invalid IP, so bind should fail - sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ) ; + sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString("") ) ; ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString(), "test for getLocalHost function: getLocalHost with invalid SocketAddr"); CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); @@ -667,9 +667,9 @@ namespace osl_Socket void getPeer_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); /// launch server socket @@ -743,7 +743,7 @@ namespace osl_Socket void bind_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_NETBIOS ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_NETBIOS ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1); // sal_True); @@ -795,9 +795,9 @@ namespace osl_Socket void isRecvReady_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT1 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT1 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True); @@ -858,9 +858,9 @@ namespace osl_Socket void isSendReady_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1211,7 +1211,7 @@ namespace osl_Socket void enableNonBlockingMode_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1249,7 +1249,7 @@ namespace osl_Socket void isNonBlockingMode_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1300,7 +1300,7 @@ namespace osl_Socket void clearError_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_HTTP2 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_HTTP2 ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail" @@ -1342,7 +1342,7 @@ namespace osl_Socket void getError_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP ); ::osl::SocketAddr saLocalSocketAddr; CPPUNIT_ASSERT_MESSAGE( "test for getError function: should get no error.", @@ -1352,7 +1352,7 @@ namespace osl_Socket void getError_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_FTP ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_FTP ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail" diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index 7b8c2c9f1eb0..daeae38b0dbf 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -122,11 +122,11 @@ namespace osl_SocketAddr sal_Bool bOk = compareUString(suHost, suHost2); - rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'")); + rtl::OUString suError ("Host names should be the same. From SocketAddr.getLocalHostname() it is'"); suError += suHost; - suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '")); + suError += rtl::OUString("', from getThisHostname() it is '"); suError += suHost2; - suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); + suError += rtl::OUString("'."); CPPUNIT_ASSERT_MESSAGE(STD_STRING(suError), sal_True == bOk); } @@ -134,7 +134,7 @@ namespace osl_SocketAddr void ctors_copy() { /// SocketAddr copy constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 ); ::osl::SocketAddr saCopySocketAddr( saSocketAddr ); sal_Int32 nPort = saCopySocketAddr.getPort( ); @@ -145,7 +145,7 @@ namespace osl_SocketAddr void ctors_copy_no_001() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); @@ -162,7 +162,7 @@ namespace osl_SocketAddr void ctors_copy_no_002() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY ); @@ -175,7 +175,7 @@ namespace osl_SocketAddr void ctors_copy_handle_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 ); ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) ); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr copy handle constructor function: copy another Socket's handle, get its port to check copy effect.", @@ -184,7 +184,7 @@ namespace osl_SocketAddr void ctors_copy_handle_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 ); ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) ); saSocketAddrCopy.setPort( IP_PORT_HTTP2 ); @@ -195,7 +195,7 @@ namespace osl_SocketAddr void ctors_hostname_port_001() { /// tcpip-specif constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP ); printUString( saSocketAddr.getHostname( ), "ctors_hostname_port_001:getHostname"); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: do a constructor using tcpip spec, check the result.", @@ -208,7 +208,7 @@ namespace osl_SocketAddr void ctors_hostname_port_002() { /// tcpip-specif constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT2 ); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: using an invalid IP address, the socketaddr ctors should fail", sal_False == saSocketAddr.is( )); } @@ -244,7 +244,7 @@ namespace osl_SocketAddr // refer to setPort_003() void is_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_INVAL ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_INVAL ); CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid port number", sal_True == saSocketAddr.is( ) ); @@ -252,7 +252,7 @@ namespace osl_SocketAddr void is_003() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid Ip number", sal_True != saSocketAddr.is( ) ); @@ -284,7 +284,7 @@ namespace osl_SocketAddr void getHostname_000() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.107"), IP_PORT_FTP ); rtl::OUString suResult = saSocketAddr.getHostname( 0 ); } @@ -296,16 +296,16 @@ namespace osl_SocketAddr */ void getHostname_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.107"), IP_PORT_FTP ); rtl::OUString suResult = saSocketAddr.getHostname( 0 ); - rtl::OUString suError = outputError(suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")), "test for getHostname(0)"); - sal_Bool bOK = compareUString( suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")) ); + rtl::OUString suError = outputError(suResult, rtl::OUString("sceri.PRC.Sun.COM"), "test for getHostname(0)"); + sal_Bool bOK = compareUString( suResult, rtl::OUString("sceri.PRC.Sun.COM") ); // search the returned hostname in /etc/hosts, if find, and the IP in the row is same as IP // in the Addr, it's right also. if ( bOK == sal_False) { rtl::OString aString = ::rtl::OUStringToOString( suResult, RTL_TEXTENCODING_ASCII_US ); - if ( compareUString( getIPbyName( aString ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")) ) == sal_True ) + if ( compareUString( getIPbyName( aString ), rtl::OUString("129.158.217.107") ) == sal_True ) bOK = sal_True; } CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK); @@ -315,11 +315,11 @@ namespace osl_SocketAddr // LLA: this function does not work in company (Linux, Windows) but at home void getHostname_002() { - rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com")); + rtl::OUString suHostname ("cn-1.germany.sun.com"); rtl::OString aString = ::rtl::OUStringToOString( suHostname, RTL_TEXTENCODING_ASCII_US ); rtl::OUString aHostIP = getIPbyName( aString ); - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setHostname( suHostname ); CPPUNIT_ASSERT_MESSAGE("#SocketAddr.setHostname failed", sal_True == bOK ); oslSocketResult aResult; @@ -359,7 +359,7 @@ namespace osl_SocketAddr public: void getPort_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP ); CPPUNIT_ASSERT_MESSAGE( "test for getPort() function: get a normal port number.", IP_PORT_FTP == saSocketAddr.getPort( ) ); @@ -367,7 +367,7 @@ namespace osl_SocketAddr void getPort_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_INVAL ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_INVAL ); //t_print("#getPort_002: Port number is %d \n", saSocketAddr.getPort( )); @@ -378,7 +378,7 @@ namespace osl_SocketAddr //2. SocketAddr family is not osl_Socket_FamilyInet, but case 2 could not be constructed void getPort_003() { - rtl::OUString suInvalidIP (RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")); + rtl::OUString suInvalidIP ("123.345.67.89"); ::osl::SocketAddr saSocketAddr( suInvalidIP, IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE( "test for getPort( ) function: give an invalid IP to a SocketAddr, get the port to see returned value. ", @@ -405,7 +405,7 @@ namespace osl_SocketAddr public: void setPort_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for setPort() function: modify a port number setting, and check it.", @@ -423,7 +423,7 @@ namespace osl_SocketAddr */ void setPort_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_ZERO ); oslSocket sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp ); @@ -442,7 +442,7 @@ namespace osl_SocketAddr void setPort_003() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_INVAL ); //on Linux, getPort return 34463 //t_print("#Port number is %d \n", saSocketAddr.getPort( )); @@ -455,7 +455,7 @@ namespace osl_SocketAddr /* this is not a inet-addr => can't set port */ void setPort_004() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_FTP); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE( "test for setPort( ) function: set an invalid address with valid port. it should return error.", @@ -492,8 +492,8 @@ namespace osl_SocketAddr public: void setAddr_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); - saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ) ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); + saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString("127.0.0.1") ) ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 ); sal_Bool bOK = sal_False; @@ -523,7 +523,7 @@ namespace osl_SocketAddr void getAddr_001() { oslSocketResult SocketResult; - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( &SocketResult ); sal_Bool bOK = sal_False; @@ -556,8 +556,8 @@ namespace osl_SocketAddr public: void operator_equal_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; sal_Bool bOK = sal_False; @@ -574,8 +574,8 @@ namespace osl_SocketAddr void operator_equal_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.199")), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.199"), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; CPPUNIT_ASSERT_MESSAGE( "after assign, the assigned SocketAddr is not same as the original Addr", @@ -589,8 +589,8 @@ namespace osl_SocketAddr void operator_equal_const_001() { - const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + const ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; sal_Bool bOK = sal_False; @@ -606,8 +606,8 @@ namespace osl_SocketAddr void operator_equal_const_002() { - const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + const ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; saSocketAddrEqual.setPort( IP_PORT_HTTP1 ); @@ -618,9 +618,9 @@ namespace osl_SocketAddr void operator_equal_assign_001() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); - ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP ); oslSocketAddr poslSocketAddr = pSocketAddr->getHandle( ); //if( m_handle ) osl_destroySocketAddr( m_handle ); so pSocketAddrAssign had been destroyed and then point to pSocketAddr pSocketAddrAssign->assign(poslSocketAddr, SAL_NO_COPY); @@ -633,8 +633,8 @@ namespace osl_SocketAddr void operator_is_equal_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrequal( rtl::OUString("127.0.0.1"), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two identical Address.", sal_True == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) ); @@ -642,8 +642,8 @@ namespace osl_SocketAddr void operator_is_equal_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP); - ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddrequal( rtl::OUString("127.0.0.1"), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two different Address.", sal_False == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) ); @@ -673,7 +673,7 @@ namespace osl_SocketAddr void getSocketAddrHandle_001() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY ); @@ -686,7 +686,7 @@ namespace osl_SocketAddr void getSocketAddrHandle_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("deuce.PRC.Sun.COM")), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("deuce.PRC.Sun.COM"), IP_PORT_MYPORT4 ); oslSocketAddr poslSocketAddr = saSocketAddr.getHandle( ); sal_Bool bOK = ( saSocketAddr == poslSocketAddr ); @@ -767,7 +767,7 @@ namespace osl_SocketAddr void resolveHostname_001() { ::osl::SocketAddr saSocketAddr; - ::osl::SocketAddr::resolveHostname( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), saSocketAddr ); + ::osl::SocketAddr::resolveHostname( rtl::OUString("127.0.0.1"), saSocketAddr ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 ); sal_Bool bOK = sal_False; @@ -788,7 +788,7 @@ namespace osl_SocketAddr /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, - const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) ); + const ::rtl::OUString & strProtocolName= ::rtl::OUString("tcp") ); */ class gettheServicePort : public CppUnit::TestFixture @@ -796,8 +796,8 @@ namespace osl_SocketAddr public: void gettheServicePort_001() { - rtl::OUString suServiceFTP (RTL_CONSTASCII_USTRINGPARAM("ftp")); - rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp")); + rtl::OUString suServiceFTP ("ftp"); + rtl::OUString suProtocolTCP ("tcp"); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get ftp service port on TCP protocol.", IP_PORT_FTP== ::osl::SocketAddr::getServicePort( suServiceFTP, suProtocolTCP ) ); @@ -805,8 +805,8 @@ namespace osl_SocketAddr void gettheServicePort_002() { - rtl::OUString suServiceTELNET (RTL_CONSTASCII_USTRINGPARAM("telnet")); - rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp")); + rtl::OUString suServiceTELNET ("telnet"); + rtl::OUString suProtocolTCP ("tcp"); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get telnet service port on TCP protocol.", IP_PORT_TELNET== ::osl::SocketAddr::getServicePort( suServiceTELNET, suProtocolTCP ) ); } @@ -814,17 +814,17 @@ namespace osl_SocketAddr void gettheServicePort_003() { //Solaris has no service called "https", please see /etc/services - rtl::OUString suServiceNETBIOS (RTL_CONSTASCII_USTRINGPARAM("netbios-dgm")); - rtl::OUString suProtocolUDP (RTL_CONSTASCII_USTRINGPARAM("udp")); + rtl::OUString suServiceNETBIOS ("netbios-dgm"); + rtl::OUString suProtocolUDP ("udp"); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get netbios-ssn service port on UDP protocol.", IP_PORT_NETBIOS_DGM == ::osl::SocketAddr::getServicePort( suServiceNETBIOS, suProtocolUDP ) ); } void gettheServicePort_004() { - rtl::OUString suProtocolUDP(RTL_CONSTASCII_USTRINGPARAM( "udp" )); + rtl::OUString suProtocolUDP("udp" ); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.", - OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), suProtocolUDP ) ); + OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString("notexist"), suProtocolUDP ) ); } CPPUNIT_TEST_SUITE( gettheServicePort ); @@ -845,7 +845,7 @@ namespace osl_SocketAddr public: void getFamilyOfSocketAddr_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 ); oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( ); CPPUNIT_ASSERT_EQUAL( osl_Socket_FamilyInet, diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index 1d36c3a2549f..876951bdf467 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -142,7 +142,7 @@ protected: void SAL_CALL run( ) { ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ); ::osl::StreamSocket ssStreamConnection; //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket @@ -252,7 +252,7 @@ protected: public: ClientSocketThread( osl::Condition &_aCond ): m_aCondition(_aCond), - m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ), + m_saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ), m_csConnectorSocket( ) { m_id = getIdentifier( ); @@ -335,7 +335,7 @@ protected: void SAL_CALL run( ) { - ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); + ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 ); ::osl::ConnectorSocket m_aConnectorSocket; if (! m_aTargetSocketAddr.is()) @@ -416,7 +416,7 @@ protected: { t_print("start WriteSocketThread\n"); ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 ); if (! saLocalSocketAddr.is()) { t_print("LocalSocketAddr was NOT created successfully!\n"); @@ -615,7 +615,7 @@ namespace osl_StreamSocket void send_recv2() { ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ); ::osl::StreamSocket ssStreamConnection; sal_Char pReadBuffer[30] = ""; @@ -740,7 +740,7 @@ namespace osl_StreamSocket } public: SendClientThread( ): - m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ), + m_saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ), m_csConnectorSocket( ) { //t_print("# successfully creat this SendClientThread %d!\n", m_id ); @@ -772,7 +772,7 @@ namespace osl_StreamSocket { #if defined(LINUX) ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString("127.0.0.1") ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -789,7 +789,7 @@ namespace osl_StreamSocket void shutdown_002() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9); asSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True); CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True ); @@ -842,7 +842,7 @@ namespace osl_StreamSocket void shutdown_003() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9); asSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True); CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True ); @@ -1194,7 +1194,7 @@ namespace osl_StreamSocket void send_recv() { rtl::OString sAddr; - // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True ) + // if ( ifAvailable(rtl::OUString("margritte.germany")) == sal_True ) // { // t_print("margritte is alive ! \n"); // sAddr = "margritte.germany"; @@ -1207,21 +1207,21 @@ namespace osl_StreamSocket } // else // { -// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("192.168.7.2"))) == sal_True ) +// if ( ifAvailable(rtl::OUString("192.168.7.2")) == sal_True ) // { // sAddr = "192.168.7.2"; // t_print("moon found ! \n"); // } // else // { -// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon.linux.bogus"))) == sal_True ) +// if ( ifAvailable(rtl::OUString("moon.linux.bogus")) == sal_True ) // { // sAddr = "moon.linux.bogus"; // t_print("moon found ! \n"); // } // else // { -// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon"))) == sal_True ) +// if ( ifAvailable(rtl::OUString("moon")) == sal_True ) // { // sAddr = "moon"; // t_print("moon found ! \n"); @@ -1230,7 +1230,7 @@ namespace osl_StreamSocket // } // } - // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.64.196"))) == sal_False ) + // if ( ifAvailable(rtl::OUString("10.16.64.196")) == sal_False ) // { // t_print("ip 10.16.64.196 is not alive! \n"); // return; diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 91c49868bde9..8f448e258d6e 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -185,11 +185,11 @@ void printUString( const ::rtl::OUString & str, const char* msg) if ( returnVal.equals( rightVal ) ) return aUString; aUString += ::rtl::OUString::createFromAscii(msg); - aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '")); + aUString += ::rtl::OUString(": the returned value is '"); aUString += returnVal; - aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '")); + aUString += ::rtl::OUString("', but the value should be '"); aUString += rightVal; - aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); + aUString += ::rtl::OUString("'."); return aUString; } diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx b/sal/qa/rtl/bootstrap/bootstrap_process.cxx index 6455073224b5..3b989a474b85 100644 --- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx +++ b/sal/qa/rtl/bootstrap/bootstrap_process.cxx @@ -43,14 +43,14 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) //custom .ini/rc file Bootstrap aBs_custom( OUString::createFromAscii(argv[3]) ); OUString suValue; - OUString suDefault( RTL_CONSTASCII_USTRINGPARAM("mydefault") ); + OUString suDefault( "mydefault" ); int flag = atoi( argv[1] ); switch( flag ) { case 1: // parameters may be passed by command line arguments aBootstrap.getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM("UNO_SERVICES")), + OUString("UNO_SERVICES"), suValue ); if ( suValue == "service.rdb" ) { @@ -61,7 +61,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) case 2: // parameters may be passed by ini file aBootstrap.getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")), + OUString("EXECUTABLE_RC"), suValue ); if ( suValue == "true" ) { @@ -72,7 +72,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) case 3: // parameters may be passed by command line arguments aBootstrap.getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM("QADEV_BOOTSTRAP")), + OUString("QADEV_BOOTSTRAP"), suValue ); if ( suValue == "sun&ms" ) { @@ -83,7 +83,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) case 4: // parameters may be passed by custom .ini/rc file aBs_custom.getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM("RTLVALUE")), + OUString("RTLVALUE"), suValue ); if ( suValue == "qadev17" ) { @@ -94,7 +94,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) case 5: // parameters may be passed by inheritance aBs_custom.getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTABLE_RC")), + OUString("EXECUTABLE_RC"), suValue ); if ( suValue == "true" ) { @@ -105,7 +105,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) default: // parameters may be passed by inheritance aBs_custom.getFrom( - OUString(RTL_CONSTASCII_USTRINGPARAM("ABCDE")), + OUString("ABCDE"), suValue, suDefault ); if ( suValue == "mydefault" ) { diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index 2cc938701e36..8d153b87ae1e 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -42,7 +42,7 @@ namespace rtl_locale // default locale for test purpose void setDefaultLocale() { - rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), /* rtl::OUString() */ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch")) ); + rtl::OLocale::setDefault(rtl::OUString("de"), rtl::OUString("DE"), /* rtl::OUString() */ rtl::OUString("hochdeutsch") ); } class getDefault : public CppUnit::TestFixture @@ -73,7 +73,7 @@ public: void getDefault_001() { - // rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), rtl::OUString()); + // rtl::OLocale::setDefault(rtl::OUString("de"), rtl::OUString("DE"), rtl::OUString()); rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); CPPUNIT_ASSERT_MESSAGE("locale must not null", aLocale.getData() != NULL); } @@ -107,7 +107,7 @@ public: // insert your test code here. void setDefault_001() { - rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString()); + rtl::OLocale::setDefault(rtl::OUString("en"), rtl::OUString("US"), rtl::OUString()); rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); CPPUNIT_ASSERT_MESSAGE("locale must not null", aLocale.getData() != NULL); @@ -297,8 +297,8 @@ public: // insert your test code here. void equals_001() { - rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString()); - rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"))); + rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString("en"), rtl::OUString("US"), rtl::OUString()); + rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString("en"), rtl::OUString("US")); sal_Bool bLocaleAreEqual = sal_False; bLocaleAreEqual = (aLocale1 == aLocale2); @@ -308,8 +308,8 @@ public: void equals_002() { - rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString()); - rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"))); + rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString("en"), rtl::OUString("US"), rtl::OUString()); + rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString("en"), rtl::OUString("US")); sal_Int32 nEqual = rtl_locale_equals(aLocale1.getData(), aLocale2.getData()); CPPUNIT_ASSERT(nEqual != 0); diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx index 78120212da13..0d539f3f0125 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -73,9 +73,9 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" inline ::rtl::OUString getTempPath( void ) { #ifdef UNX - rtl::OUString suDirURL( RTL_CONSTASCII_USTRINGPARAM("file:///tmp/") ); + rtl::OUString suDirURL( "file:///tmp/" ); #else /* Windows */ - rtl::OUString suDirURL( RTL_CONSTASCII_USTRINGPARAM("file:///c:/temp/") ); + rtl::OUString suDirURL( "file:///c:/temp/" ); #endif return suDirURL; } @@ -139,8 +139,8 @@ namespace rtl_logfile rtl_logfile_trace("trace %d %d %d\n" , 1 , 2 ,3 ); rtl::OUString suFilePath = getTempPath(); - suFilePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("logfile1_")) + getCurrentPID( ); - suFilePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".log")); + suFilePath += rtl::OUString("logfile1_") + getCurrentPID( ); + suFilePath += rtl::OUString(".log"); ::osl::FileBase::RC nError1; ::osl::File aTestFile( suFilePath ); @@ -228,8 +228,8 @@ public: { printf( "\n#Do some clean-ups ... only delete logfile1_*.log here!\n" ); rtl::OUString suFilePath = getTempPath(); - suFilePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("logfile1_")) + getCurrentPID( ); - suFilePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".log")); + suFilePath += rtl::OUString("logfile1_") + getCurrentPID( ); + suFilePath += rtl::OUString(".log"); //if ( ifFileExist( suFilePath ) == sal_True ) ::osl::FileBase::RC nError1; diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index aca03781bc3e..eebbcc6b2f4a 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -57,7 +57,7 @@ namespace rtl_OUString /// test of OUString(rtl_uString*) void ctors_001() { - rtl::OUString *pStr = new rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("a String") ); + rtl::OUString *pStr = new rtl::OUString( "a String" ); rtl::OUString aStrToTest(pStr->pData); delete pStr; @@ -344,21 +344,21 @@ sal_Int16 SAL_CALL checkPrecisionSize() void test() { CPPUNIT_ASSERT_EQUAL( static_cast< sal_Int32 >(-0x76543210), - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-76543210")). + (rtl::OUString("-76543210"). toInt32(16))); CPPUNIT_ASSERT_EQUAL( static_cast< sal_Int32 >(0xFEDCBA98), - (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("+FEDCBA98")). + (rtl::OUString("+FEDCBA98"). toInt32(16))); CPPUNIT_ASSERT_EQUAL( static_cast< sal_Int64 >(-SAL_CONST_INT64(0x76543210FEDCBA98)), (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("-76543210FEDCBA98")). + "-76543210FEDCBA98"). toInt64(16))); CPPUNIT_ASSERT_EQUAL( static_cast< sal_Int64 >(SAL_CONST_INT64(0xFEDCBA9876543210)), (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("+FEDCBA9876543210")). + "+FEDCBA9876543210"). toInt64(16))); } @@ -690,88 +690,88 @@ public: void lastIndexOf_test_oustring_offset_001() { // search for sun, start at the end, found (pos==0) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("sun java system"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring_offset(aStr, aSearchStr, 0, aStr.getLength()); } void lastIndexOf_test_oustring_offset_002() { // search for sun, start at pos = 3, found (pos==0) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("sun java system"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring_offset(aStr, aSearchStr, 0, 3); } void lastIndexOf_test_oustring_offset_003() { // search for sun, start at pos = 2, found (pos==-1) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("sun java system"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 2); } void lastIndexOf_test_oustring_offset_004() { // search for sun, start at the end, found (pos==0) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("sun java system"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring_offset(aStr, aSearchStr, -1, -1); } void lastIndexOf_test_oustring_001() { // search for sun, found (pos==0) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("sun java system"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring(aStr, aSearchStr, 0); } void lastIndexOf_test_oustring_002() { // search for sun, found (pos==4) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun java system")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("the sun java system"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring(aStr, aSearchStr, 4); } void lastIndexOf_test_oustring_003() { // search for sun, found (pos==8) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("the sun sun java system"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring(aStr, aSearchStr, 8); } void lastIndexOf_test_oustring_004() { // search for sun, found (pos==8) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("the sun sun"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring(aStr, aSearchStr, 8); } void lastIndexOf_test_oustring_005() { // search for sun, found (pos==4) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun su")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("the sun su"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring(aStr, aSearchStr, 4); } void lastIndexOf_test_oustring_006() { // search for sun, found (pos==-1) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the su su")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); + rtl::OUString aStr("the su su"); + rtl::OUString aSearchStr("sun"); lastIndexOf_oustring(aStr, aSearchStr, -1); } void lastIndexOf_test_oustring_007() { // search for earth, not found (-1) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the su su")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("earth")); + rtl::OUString aStr("the su su"); + rtl::OUString aSearchStr("earth"); lastIndexOf_oustring(aStr, aSearchStr, -1); } @@ -779,7 +779,7 @@ public: { // search for earth, not found (-1) rtl::OUString aStr = rtl::OUString(); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("earth")); + rtl::OUString aSearchStr("earth"); lastIndexOf_oustring(aStr, aSearchStr, -1); } @@ -795,7 +795,7 @@ public: void lastIndexOf_test_salunicode_001() { // search for 's', found (19) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); + rtl::OUString aStr("the sun sun java system"); sal_Unicode suChar = L's'; lastIndexOf_salunicode(aStr, suChar, 19); } @@ -803,7 +803,7 @@ public: void lastIndexOf_test_salunicode_002() { // search for 'x', not found (-1) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); + rtl::OUString aStr("the sun sun java system"); sal_Unicode suChar = L'x'; lastIndexOf_salunicode(aStr, suChar, -1); } @@ -811,21 +811,21 @@ public: void lastIndexOf_test_salunicode_offset_001() { // search for 's', start from pos last char, found (19) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); + rtl::OUString aStr("the sun sun java system"); sal_Unicode cuChar = L's'; lastIndexOf_salunicode_offset(aStr, cuChar, 19, aStr.getLength()); } void lastIndexOf_test_salunicode_offset_002() { // search for 's', start pos is last occur from search behind, found (17) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); + rtl::OUString aStr("the sun sun java system"); sal_Unicode cuChar = L's'; lastIndexOf_salunicode_offset(aStr, cuChar, 17, 19); } void lastIndexOf_test_salunicode_offset_003() { // search for 't', start pos is 1, found (0) - rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); + rtl::OUString aStr("the sun sun java system"); sal_Unicode cuChar = L't'; lastIndexOf_salunicode_offset(aStr, cuChar, 0, 1); } @@ -884,7 +884,7 @@ public: void getToken_001() { - rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;b")); + rtl::OUString suTokenStr("a;b"); sal_Int32 nIndex = 0; @@ -898,7 +898,7 @@ public: void getToken_002() { - rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;b.c")); + rtl::OUString suTokenStr("a;b.c"); sal_Int32 nIndex = 0; @@ -915,7 +915,7 @@ public: void getToken_003() { - rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;;b")); + rtl::OUString suTokenStr("a;;b"); sal_Int32 nIndex = 0; @@ -932,7 +932,7 @@ public: void getToken_004() { - rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("longer.then.ever.")); + rtl::OUString suTokenStr("longer.then.ever."); sal_Int32 nIndex = 0; @@ -952,7 +952,7 @@ public: } void getToken_005() { - rtl::OUString ab(RTL_CONSTASCII_USTRINGPARAM("ab")); + rtl::OUString ab("ab"); sal_Int32 n = 0; CPPUNIT_ASSERT_MESSAGE( "token should be 'ab'", ab.getToken(0, '-', n) == ab); @@ -1001,13 +1001,13 @@ public: void construct() { #ifdef RTL_INLINE_STRINGS - ::rtl::OUString aFoo( RTL_CONSTASCII_USTRINGPARAM("foo") ); + ::rtl::OUString aFoo( "foo" ); CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[0] == 'f'); CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[1] == 'o'); CPPUNIT_ASSERT_MESSAGE("string contents", aFoo[2] == 'o'); CPPUNIT_ASSERT_MESSAGE("string length", aFoo.getLength() == 3); - ::rtl::OUString aBaa( RTL_CONSTASCII_USTRINGPARAM("this is a very long string with a lot of long things inside it and it goes on and on and on forever etc.") ); + ::rtl::OUString aBaa( "this is a very long string with a lot of long things inside it and it goes on and on and on forever etc." ); CPPUNIT_ASSERT_MESSAGE("string length", aBaa.getLength() == 104); // Dig at the internals ... FIXME: should we have the bit-flag defines public ? CPPUNIT_ASSERT_MESSAGE("string static flags", (aBaa.pData->refCount & 1<<30) != 0); @@ -1018,9 +1018,9 @@ public: { // The empty string is 'static' a special case ... rtl::OUString aEmpty = rtl::OUString().intern(); - rtl::OUString aEmpty2 = rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "" ) ); + rtl::OUString aEmpty2 = rtl::OUString::intern( "" ); - ::rtl::OUString aFoo( RTL_CONSTASCII_USTRINGPARAM("foo") ); + ::rtl::OUString aFoo( "foo" ); ::rtl::OUString aFooIntern = aFoo.intern(); CPPUNIT_ASSERT_MESSAGE( "string contents", aFooIntern == "foo" ); CPPUNIT_ASSERT_MESSAGE("string length", aFooIntern.getLength() == 3); @@ -1094,23 +1094,23 @@ void indexOfAscii::test() { rtl::OUString().lastIndexOfAsciiL(RTL_CONSTASCII_STRINGPARAM(""))); CPPUNIT_ASSERT_EQUAL( sal_Int32(0), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foo")).indexOfAsciiL( + rtl::OUString("foo").indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM("foo"))); CPPUNIT_ASSERT_EQUAL( sal_Int32(0), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foo")).lastIndexOfAsciiL( + rtl::OUString("foo").lastIndexOfAsciiL( RTL_CONSTASCII_STRINGPARAM("foo"))); CPPUNIT_ASSERT_EQUAL( sal_Int32(2), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fofoobar")).indexOfAsciiL( + rtl::OUString("fofoobar").indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM("foo"))); CPPUNIT_ASSERT_EQUAL( sal_Int32(3), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foofoofob")). + rtl::OUString("foofoofob"). lastIndexOfAsciiL(RTL_CONSTASCII_STRINGPARAM("foo"))); CPPUNIT_ASSERT_EQUAL( sal_Int32(3), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foofoobar")).indexOfAsciiL( + rtl::OUString("foofoobar").indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM("foo"), 1)); } @@ -1132,15 +1132,15 @@ void endsWith::test() { rtl::OUString().endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM("foo"))); CPPUNIT_ASSERT_EQUAL( true, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bar")).endsWithAsciiL( + rtl::OUString("bar").endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM("bar"))); CPPUNIT_ASSERT_EQUAL( true, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("foobar")).endsWithAsciiL( + rtl::OUString("foobar").endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM("bar"))); CPPUNIT_ASSERT_EQUAL( false, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FOOBAR")).endsWithAsciiL( + rtl::OUString("FOOBAR").endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM("bar"))); } diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index b787488912fe..d547cf280490 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -57,7 +57,7 @@ namespace rtl_ustr void compare_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl_ustr_compare( aStr1.getStr(), NULL); // should not GPF } @@ -72,8 +72,8 @@ namespace rtl_ustr void compare_002() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); + rtl::OUString aStr2("Line must be equal."); sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -81,8 +81,8 @@ namespace rtl_ustr void compare_003() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ.")); + rtl::OUString aStr1("Line must differ."); + rtl::OUString aStr2("Line foo bar, ok, differ."); sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -113,7 +113,7 @@ namespace rtl_ustr void compare_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), NULL); } void compare_001() @@ -127,8 +127,8 @@ namespace rtl_ustr void compare_002() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); + rtl::OUString aStr2("Line must be equal."); sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -136,8 +136,8 @@ namespace rtl_ustr void compare_002_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("LINE MUST BE EQUAL.")); + rtl::OUString aStr1("Line must be equal."); + rtl::OUString aStr2("LINE MUST BE EQUAL."); sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0); @@ -145,8 +145,8 @@ namespace rtl_ustr void compare_003() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ.")); + rtl::OUString aStr1("Line must differ."); + rtl::OUString aStr2("Line foo bar, ok, differ."); sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -179,7 +179,7 @@ namespace rtl_ustr void compare_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1); } void compare_001() @@ -193,8 +193,8 @@ namespace rtl_ustr void compare_002() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); + rtl::OUString aStr2("Line must be equal."); sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -204,8 +204,8 @@ namespace rtl_ustr void compare_002_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("LINE MUST BE EQUAL.")); + rtl::OUString aStr1("Line must be equal."); + rtl::OUString aStr2("LINE MUST BE EQUAL."); sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -215,8 +215,8 @@ namespace rtl_ustr void compare_003() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ.")); + rtl::OUString aStr1("Line must differ."); + rtl::OUString aStr2("Line foo bar, ok, differ."); sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -226,8 +226,8 @@ namespace rtl_ustr void compare_004() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); - rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ.")); + rtl::OUString aStr1("Line must differ."); + rtl::OUString aStr2("Line foo bar, ok, differ."); sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -319,7 +319,7 @@ namespace rtl_ustr void indexOfChar_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfChar.")); + rtl::OUString aStr1("Line for a indexOfChar."); sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'L' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); @@ -336,7 +336,7 @@ namespace rtl_ustr void indexOfChar_002() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfChar.")); + rtl::OUString aStr1("Line for a indexOfChar."); sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'y' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -365,7 +365,7 @@ namespace rtl_ustr void lastIndexOfChar_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfChar.")); + rtl::OUString aStr1("Line for a lastIndexOfChar."); sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'C' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22); @@ -382,7 +382,7 @@ namespace rtl_ustr void lastIndexOfChar_002() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfChar.")); + rtl::OUString aStr1("Line for a lastIndexOfChar."); sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'y' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -413,35 +413,35 @@ namespace rtl_ustr void indexOfStr_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr.")); + rtl::OUString aStr1("Line for a indexOfStr."); rtl_ustr_indexOfStr( aStr1.getStr(), 0 ); } void indexOfStr_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr.")); + rtl::OUString aStr1("Line for a indexOfStr."); - rtl::OUString suSearch(RTL_CONSTASCII_USTRINGPARAM("Line")); + rtl::OUString suSearch("Line"); sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); - /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("for")); + /* rtl::OUString */ suSearch("for"); /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 5); - /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("a")); + /* rtl::OUString */ suSearch("a"); /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 9); - /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("a index")); + /* rtl::OUString */ suSearch("a index"); /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex ==9); } void indexOfStr_002() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr.")); - rtl::OUString suSearch(RTL_CONSTASCII_USTRINGPARAM("not exist")); + rtl::OUString aStr1("Line for a indexOfStr."); + rtl::OUString suSearch("not exist"); sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -471,31 +471,31 @@ namespace rtl_ustr void lastIndexOfStr_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr.")); + rtl::OUString aStr1("Line for a lastIndexOfStr."); rtl_ustr_lastIndexOfStr( aStr1.getStr(), NULL ); } void lastIndexOfStr_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr.")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("Index")); + rtl::OUString aStr1("Line for a lastIndexOfStr."); + rtl::OUString aSearchStr("Index"); sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15); - /* rtl::OString */ aSearchStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line")); + /* rtl::OString */ aSearchStr = rtl::OUString("Line"); /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); - /* rtl::OString */ aSearchStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); + /* rtl::OString */ aSearchStr = rtl::OUString(""); /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1); } void lastIndexOfStr_002() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr.")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("foo")); + rtl::OUString aStr1("Line for a lastIndexOfStr."); + rtl::OUString aSearchStr("foo"); sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -503,8 +503,8 @@ namespace rtl_ustr void lastIndexOfStr_003() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr.")); - rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("O")); + rtl::OUString aStr1("Line for a lastIndexOfStr."); + rtl::OUString aSearchStr("O"); sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 ); @@ -535,8 +535,8 @@ namespace rtl_ustr void replaceChar_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("replace char.")); - rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("ruplacu char.")); + rtl::OUString aStr1("replace char."); + rtl::OUString aShouldStr1("ruplacu char."); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc( nLength + sizeof(sal_Unicode)); // length + 1 (null terminator) @@ -578,8 +578,8 @@ namespace rtl_ustr } void replaceChar_WithLength_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("replace char.")); - rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("ruplace char.")); + rtl::OUString aStr1("replace char."); + rtl::OUString aShouldStr1("ruplace char."); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); @@ -595,8 +595,8 @@ namespace rtl_ustr void replaceChar_WithLength_002() { - rtl::OUString aStr1 (RTL_CONSTASCII_USTRINGPARAM("eeeeeeeeeeeee")); - rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("uuuuuueeeeeee")); + rtl::OUString aStr1 ("eeeeeeeeeeeee"); + rtl::OUString aShouldStr1("uuuuuueeeeeee"); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); // no null terminator is need @@ -636,8 +636,8 @@ namespace rtl_ustr void toAsciiLowerCase_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII LOWER CASE.")); - rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii lower case.")); + rtl::OUString aStr1("CHANGE THIS TO ASCII LOWER CASE."); + rtl::OUString aShouldStr1("change this to ascii lower case."); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode) ); // we need to add '\0' so one more @@ -674,8 +674,8 @@ namespace rtl_ustr void toAsciiLowerCase_WithLength_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII LOWER CASE.")); - rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("change thiS TO ASCII LOWER CASE.")); + rtl::OUString aStr1("CHANGE THIS TO ASCII LOWER CASE."); + rtl::OUString aShouldStr1("change thiS TO ASCII LOWER CASE."); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); @@ -718,8 +718,8 @@ namespace rtl_ustr void toAsciiUpperCase_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case.")); - rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE.")); + rtl::OUString aStr1("change this to ascii upper case."); + rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE."); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator @@ -756,8 +756,8 @@ namespace rtl_ustr void toAsciiUpperCase_WithLength_001() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii lower case.")); - rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIs to ascii lower case.")); + rtl::OUString aStr1("change this to ascii lower case."); + rtl::OUString aShouldStr1("CHANGE THIs to ascii lower case."); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); @@ -796,7 +796,7 @@ namespace rtl_ustr void trim_WithLength_000_1() { - rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM(" trim this")); + rtl::OUString suStr(" trim this"); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -808,7 +808,7 @@ namespace rtl_ustr void trim_WithLength_001() { - rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM(" trim this")); + rtl::OUString suStr(" trim this"); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); memcpy(pStr, suStr.getStr(), nLength); @@ -822,7 +822,7 @@ namespace rtl_ustr void trim_WithLength_002() { - rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("trim this")); + rtl::OUString suStr("trim this"); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -837,7 +837,7 @@ namespace rtl_ustr void trim_WithLength_003() { - rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM(" trim this")); + rtl::OUString suStr(" trim this"); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -851,7 +851,7 @@ namespace rtl_ustr void trim_WithLength_004() { - rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("\r\n\t \n\r trim \n this")); + rtl::OUString suStr("\r\n\t \n\r trim \n this"); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -865,7 +865,7 @@ namespace rtl_ustr void trim_WithLength_005() { - rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("\r\n\t \n\r trim \t this \n\r\t\t ")); + rtl::OUString suStr("\r\n\t \n\r trim \t this \n\r\t\t "); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -941,7 +941,7 @@ namespace rtl_ustr void equal_ascii_shorter() { - rtl::OUString refStr(RTL_CONSTASCII_USTRINGPARAM("referenceString")); + rtl::OUString refStr("referenceString"); char const * pAscii = "reference"; sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii); @@ -950,7 +950,7 @@ namespace rtl_ustr void equal_ascii_shorter_asciiLength() { - rtl::OUString refStr(RTL_CONSTASCII_USTRINGPARAM("referenceString")); + rtl::OUString refStr("referenceString"); char const * pAscii = "reference"; sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, rtl_str_getLength(pAscii), pAscii); @@ -959,7 +959,7 @@ namespace rtl_ustr void equal_ref_shorter() { - rtl::OUString refStr(RTL_CONSTASCII_USTRINGPARAM("reference")); + rtl::OUString refStr("reference"); char const * pAscii = "referenceString"; sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii); @@ -968,7 +968,7 @@ namespace rtl_ustr void equal() { - rtl::OUString refStr(RTL_CONSTASCII_USTRINGPARAM("reference")); + rtl::OUString refStr("reference"); char const * pAscii = "reference"; sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii); @@ -977,7 +977,7 @@ namespace rtl_ustr void unequal_reference_bigger() { - rtl::OUString refStr(RTL_CONSTASCII_USTRINGPARAM("defghi")); + rtl::OUString refStr("defghi"); char const * pAscii = "abc"; sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii); @@ -986,7 +986,7 @@ namespace rtl_ustr void unequal_ascii_bigger() { - rtl::OUString refStr(RTL_CONSTASCII_USTRINGPARAM("abc")); + rtl::OUString refStr("abc"); char const * pAscii = "defghi"; sal_Int32 value = rtl_ustr_ascii_compare_WithLength(refStr.pData->buffer, refStr.pData->length, pAscii); @@ -1020,13 +1020,13 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0); // should not GPF } void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_2() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl::OString sStr2 = "Line is shorter."; rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr(), 0); // should not GPF @@ -1042,7 +1042,7 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_002() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString suStr1("Line must be equal."); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength()); @@ -1051,7 +1051,7 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_003() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString suStr1("Line must differ."); rtl::OString sStr2 = "Line must be differ and longer."; sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength()); @@ -1086,13 +1086,13 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), 0, NULL); // should not GPF } void ascii_compareIgnoreAsciiCase_WithLength_000_2() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl::OString sStr2 = "Line is shorter."; rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr()); // should not GPF @@ -1108,7 +1108,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_002() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString suStr1("Line must be equal."); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr()); @@ -1117,7 +1117,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_003() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString suStr1("Line must differ."); rtl::OString sStr2 = "Line must be differ and longer."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr()); @@ -1152,7 +1152,7 @@ namespace rtl_ustr void ascii_compare_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl_ustr_ascii_compare( aStr1.getStr(), NULL); // should not GPF } @@ -1167,7 +1167,7 @@ namespace rtl_ustr void ascii_compare_002() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString suStr1("Line must be equal."); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr()); @@ -1176,7 +1176,7 @@ namespace rtl_ustr void ascii_compare_003() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString suStr1("Line must differ."); rtl::OString sStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr()); @@ -1210,7 +1210,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL); // should not GPF } @@ -1225,7 +1225,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString suStr1("Line must be equal."); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1234,7 +1234,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002_1() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal, when ignore case.")); + rtl::OUString suStr1("Line must be equal, when ignore case."); rtl::OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1243,7 +1243,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_003() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString suStr1("Line must differ."); rtl::OString sStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1254,8 +1254,8 @@ namespace rtl_ustr // void ascii_compareIgnoreAsciiCase_001() // { - // rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case.")); - // rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE.")); + // rtl::OUString suStr1("change this to ascii upper case."); + // rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE."); // // sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode); // sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator @@ -1308,7 +1308,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_000_1() { - rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr1("Line must be equal."); rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL); // should not GPF } @@ -1323,7 +1323,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString suStr1("Line must be equal."); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1332,7 +1332,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002_1() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal, when ignore case.")); + rtl::OUString suStr1("Line must be equal, when ignore case."); rtl::OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1341,7 +1341,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_003() { - rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString suStr1("Line must differ."); rtl::OString sStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1352,8 +1352,8 @@ namespace rtl_ustr // void ascii_compareIgnoreAsciiCase_001() // { - // rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case.")); - // rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE.")); + // rtl::OUString suStr1("change this to ascii upper case."); + // rtl::OUString aShouldStr1("CHANGE THIS TO ASCII UPPER CASE."); // // sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode); // sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index 144dd8d0205a..4f91fa03731a 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -70,7 +70,7 @@ inline ::rtl::OUString getModulePath( void ) printUString(suDirPath, "modulePath:"); suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') ); suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1); - suDirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin")); + suDirPath += rtl::OUString("bin"); return suDirPath; } @@ -93,9 +93,9 @@ public: void getAppCommandArg_001() { #if defined(WNT) - const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process.exe")); + const rtl::OUString EXECUTABLE_NAME("child_process.exe"); #else - const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process")); + const rtl::OUString EXECUTABLE_NAME("child_process"); #endif rtl::OUString suCWD = getModulePath(); // rtl::OUString suCWD2 = getExecutableDirectory(); @@ -114,7 +114,7 @@ public: pParameters[3] = suParam3.pData; rtl::OUString suFileURL = suCWD; - suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + suFileURL += rtl::OUString("/"); suFileURL += EXECUTABLE_NAME; oslProcessError osl_error = osl_executeProcess( @@ -230,9 +230,9 @@ public: void getGlobalProcessId_002() { #if defined(WNT) - const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id.exe")); + const rtl::OUString EXEC_NAME("child_process_id.exe"); #else - const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id")); + const rtl::OUString EXEC_NAME("child_process_id"); #endif sal_uInt8 pTargetUUID1[16]; rtl_getGlobalProcessId( pTargetUUID1 ); @@ -244,7 +244,7 @@ public: rtl::OUString suCWD = getModulePath(); oslProcess hProcess = NULL; rtl::OUString suFileURL = suCWD; - suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + suFileURL += rtl::OUString("/"); suFileURL += EXEC_NAME; oslFileHandle* pChildOutputRead = new oslFileHandle(); oslProcessError osl_error = osl_executeProcess_WithRedirectedIO( diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx index 7a17d85bffef..1799e6f3c79c 100644 --- a/sal/qa/rtl/uri/rtl_Uri.cxx +++ b/sal/qa/rtl/uri/rtl_Uri.cxx @@ -222,9 +222,9 @@ namespace Stringtest void test_UTF8_files() { #ifdef UNX - rtl::OUString suDirURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///tmp/atestdir"))); + rtl::OUString suDirURL(rtl::OUString("file:///tmp/atestdir")); #else /* Windows */ - rtl::OUString suDirURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c:/temp/atestdir"))); + rtl::OUString suDirURL(rtl::OUString("file:///c:/temp/atestdir")); #endif osl::Directory aDir(suDirURL); aDir.open(); diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx index 4d4eb686dda4..fa2f2ec827ed 100644 --- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx +++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx @@ -72,14 +72,14 @@ void oldtests::test_OUString() // "Mein erster RTL OUString\n" // | | | | | // Index 0 5 10 15 20 - OUString s1(OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n"))); - TEST_ENSURE( s1 == OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n")), "test_OWString error 1"); + OUString s1(OUString("Mein erster RTL OUString\n")); + TEST_ENSURE( s1 == OUString("Mein erster RTL OUString\n"), "test_OWString error 1"); TEST_ENSURE( s1.getLength() == 25, "test_OWString error 2"); OUString s2 = s1; TEST_ENSURE( s2[16] == (sal_Unicode)'O', "test_OWString error 3"); TEST_ENSURE( s2.equals(s1), "test_OWString error 4"); - TEST_ENSURE( OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("hallo"))) == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 4"); + TEST_ENSURE( OUString( OUString("hallo")) == OUString("hallo"), "test_OWString error 4"); TEST_ENSURE( s2.indexOf((sal_Unicode)'O') == 16, "test_OWString error 5"); TEST_ENSURE( s2.indexOf((sal_Unicode)'O', 5) == 16, "test_OWString error 5a"); TEST_ENSURE( s2.lastIndexOf((sal_Unicode)'r') == 20, "test_OWString error 6"); @@ -94,24 +94,24 @@ void oldtests::test_OUString() // | | | | | | | | | | | | // Index 0 5 10 15 20 25 30 35 40 45 50 55 OUString s3 = s2.copy(0, s2.getLength() - 1); - OUString s4 = s3.concat( OUString(RTL_CONSTASCII_USTRINGPARAM(" ist ein String aus der RTL Library\n")) ); + OUString s4 = s3.concat( OUString(" ist ein String aus der RTL Library\n") ); TEST_ENSURE( s4.getLength() == 60, "test_OWString error 11"); s1 = s4.copy(0, 39); OUString s5; - s5 = s1 + OUString(RTL_CONSTASCII_USTRINGPARAM(" aus der RTL Library\n")); + s5 = s1 + OUString(" aus der RTL Library\n"); TEST_ENSURE( s5.compareTo(s4) == 0 , "test_OWString error 12"); - TEST_ENSURE( s5.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("RTL"))) == 12, "test_OWString error 13"); - TEST_ENSURE( s5.lastIndexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("RTL"))) == 48, "test_OWString error 13"); + TEST_ENSURE( s5.indexOf(OUString("RTL")) == 12, "test_OWString error 13"); + TEST_ENSURE( s5.lastIndexOf(OUString("RTL")) == 48, "test_OWString error 13"); sal_Bool b = sal_False; OUString s6 = s5.valueOf(b); -// TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("False"))) == 0, "test_OWString error 14"); +// TEST_ENSURE( s6.compareTo(OUString("False")) == 0, "test_OWString error 14"); s6 = s5.valueOf((sal_Unicode)'H'); - TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("H"))) == 0, "test_OWString error 15"); + TEST_ENSURE( s6.compareTo(OUString("H")) == 0, "test_OWString error 15"); sal_Int32 n = 123456789L; s6 = s5.valueOf(n); - TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("123456789"))) == 0, "test_OWString error 16"); + TEST_ENSURE( s6.compareTo(OUString("123456789")) == 0, "test_OWString error 16"); #ifdef SAL_UNX sal_Int64 m = -3223372036854775807LL; @@ -119,64 +119,64 @@ void oldtests::test_OUString() sal_Int64 m = -3223372036854775807; #endif s6 = s5.valueOf(m); - TEST_ENSURE( s6.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-3223372036854775807")) ) == 0, "test_OWString error 17"); + TEST_ENSURE( s6.compareTo( OUString("-3223372036854775807") ) == 0, "test_OWString error 17"); OUString s7; - OUString s8(OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS"))); - s7 = OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); - s8 = s7 + s8 + OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); - TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM(" HALLO ICH BIN EIN SS ")), + OUString s8(OUString("HALLO ICH BIN EIN SS")); + s7 = OUString(" "); + s8 = s7 + s8 + OUString(" "); + TEST_ENSURE( s8 == OUString(" HALLO ICH BIN EIN SS "), "test_OWString error 22"); s7 = s8.trim(); - TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")), "test_OWString error 23"); + TEST_ENSURE( s7 == OUString("HALLO ICH BIN EIN SS"), "test_OWString error 23"); - s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")); - s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("aber Hallo")); + s7 = OUString("Hallo"); + s8 = OUString("aber Hallo"); TEST_ENSURE( s7 < s8, "test_OWString error 25"); TEST_ENSURE( s8 > s7, "test_OWString error 26"); TEST_ENSURE( s7 != s8, "test_OWString error 27"); - TEST_ENSURE( s7 != OUString(RTL_CONSTASCII_USTRINGPARAM("blabla")), "test_OWString error 28"); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("blabla")) != s7, "test_OWString error 29"); + TEST_ENSURE( s7 != OUString("blabla"), "test_OWString error 28"); + TEST_ENSURE( OUString("blabla") != s7, "test_OWString error 29"); - s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")); + s8 = OUString("Hallo"); TEST_ENSURE( s7 <= s8, "test_OWString error 30"); TEST_ENSURE( s7 >= s8, "test_OwString error 31"); s8 = s8.replace((sal_Unicode)'l', (sal_Unicode)'r'); - TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("Harro")), "test_OWString error 32"); + TEST_ENSURE( s8 == OUString("Harro"), "test_OWString error 32"); // "Ich bin ein String mit einem A und C und vielen m, m, m, m" // | | | | | | | | | | | | //index 0 5 10 15 20 25 30 35 40 45 50 55 - s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("Ich bin ein String mit einem A und C und vielen m, m, m, m")); - - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) < 0, "test_OWString error 46" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) == 0, "test_OWString error 46" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) > 0, "test_OWString error 47" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) < 0, "test_OWString error 48" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbbb")) ) < 0, "test_OWString error 49" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")) ) < 0, "test_OWString error 50" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) > 0, "test_OWString error 51" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbbb")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) > 0, "test_OWString error 52" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) == OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")), "test_OWString error 53" ); - TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) == OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")), "test_OWString error 54" ); + s8 = OUString("Ich bin ein String mit einem A und C und vielen m, m, m, m"); + + TEST_ENSURE( OUString("aaa").compareTo( OUString("bbb") ) < 0, "test_OWString error 46" ); + TEST_ENSURE( OUString("aaa").compareTo( OUString("aaa") ) == 0, "test_OWString error 46" ); + TEST_ENSURE( OUString("bbb").compareTo( OUString("aaa") ) > 0, "test_OWString error 47" ); + TEST_ENSURE( OUString("aaaa").compareTo( OUString("bbb") ) < 0, "test_OWString error 48" ); + TEST_ENSURE( OUString("aaa").compareTo( OUString("bbbb") ) < 0, "test_OWString error 49" ); + TEST_ENSURE( OUString("aaa").compareTo( OUString("aaaa") ) < 0, "test_OWString error 50" ); + TEST_ENSURE( OUString("aaaa").compareTo( OUString("aaa") ) > 0, "test_OWString error 51" ); + TEST_ENSURE( OUString("bbbb").compareTo( OUString("bbb") ) > 0, "test_OWString error 52" ); + TEST_ENSURE( OUString("bbb") == OUString("bbb"), "test_OWString error 53" ); + TEST_ENSURE( OUString("bbb") == OUString("bbb"), "test_OWString error 54" ); { - OUString uStr = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")); - TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")), 5 ) == 0, "test_OWString error 54.2.1" ); - TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Halloa")), 6 ) < 0 , "test_OWString error 54.2.2" ); - TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("1Hallo")), 6 ) > 0, "test_OWString error 54.2.3" ); - TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Aallo")), 5 ) > 0, "test_OWString error 54.2.4" ); - TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Halla")), 5 ) > 0, "test_OWString error 54.2.5" ); - TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Mallo")), 5 ) < 0, "test_OWString error 54.2.6" ); - TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallp")), 5 ) < 0, "test_OWString error 54.2.7" ); + OUString uStr = OUString("Hallo"); + TEST_ENSURE( uStr.compareTo( OUString("Hallo"), 5 ) == 0, "test_OWString error 54.2.1" ); + TEST_ENSURE( uStr.compareTo( OUString("Halloa"), 6 ) < 0 , "test_OWString error 54.2.2" ); + TEST_ENSURE( uStr.compareTo( OUString("1Hallo"), 6 ) > 0, "test_OWString error 54.2.3" ); + TEST_ENSURE( uStr.compareTo( OUString("Aallo"), 5 ) > 0, "test_OWString error 54.2.4" ); + TEST_ENSURE( uStr.compareTo( OUString("Halla"), 5 ) > 0, "test_OWString error 54.2.5" ); + TEST_ENSURE( uStr.compareTo( OUString("Mallo"), 5 ) < 0, "test_OWString error 54.2.6" ); + TEST_ENSURE( uStr.compareTo( OUString("Hallp"), 5 ) < 0, "test_OWString error 54.2.7" ); } #if OSL_DEBUG_LEVEL == 0 //YD will fail copy assert on indexes, because ':' returns -1 - s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich")); + s7 = OUString("Hallo jetzt komm ich"); s8 = s7.copy(0, s7.indexOf((sal_Unicode)':')); TEST_ENSURE( s8.getLength() == 0, "test_OWString error 55"); TEST_ENSURE( s8.compareTo(OUString()) == 0, "test_OWString error 56"); @@ -221,7 +221,7 @@ void oldtests::test_OUString() TEST_ENSURE( nCompareResult21_Len13 > 0, "test_OWString error 66" ); { - OUString uStr = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")); + OUString uStr = OUString("Hallo"); TEST_ENSURE( uStr.equalsAsciiL( "Hallo", 5 ), "test_OWString error 66.1.1" ); TEST_ENSURE( !uStr.equalsAsciiL( "Hallo1", 6 ), "test_OWString error 66.1.2" ); TEST_ENSURE( !uStr.equalsAsciiL( "1Hallo", 6 ), "test_OWString error 66.1.3" ); @@ -238,14 +238,14 @@ void oldtests::test_OUString() } // toInt64 - OUString s9( OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807")) ); + OUString s9( OUString(" -3223372036854775807") ); sal_Int64 ln1 = s9.toInt64(); #if (defined UNX) TEST_ENSURE( ln1 == -3223372036854775807LL, "test_OWString error 67" ); #else TEST_ENSURE( ln1 == -3223372036854775807, "test_OWString error 67" ); #endif - OUString s10( OUString(RTL_CONSTASCII_USTRINGPARAM("13243A65f1H45")) ); + OUString s10( OUString("13243A65f1H45") ); sal_Int64 ln2 = s10.toInt64(); TEST_ENSURE( ln2 == 13243, "test_OWString error 68" ); @@ -256,16 +256,16 @@ void oldtests::test_OUString() TEST_ENSURE( ln3 == 0x13243A65F1, "test_OWString error 69" ); #endif // Exotic base - OUString s11( OUString(RTL_CONSTASCII_USTRINGPARAM("H4A")) ); + OUString s11( OUString("H4A") ); sal_Int64 ln4 = s11.toInt64( 23 ); TEST_ENSURE( ln4 == 23*23*17 + 4 * 23 + 10, "test_OWString error 70" ); // toInt32 - OUString s12( OUString(RTL_CONSTASCII_USTRINGPARAM(" -220368507")) ); + OUString s12( OUString(" -220368507") ); sal_Int32 n1 = s12.toInt32(); TEST_ENSURE( n1 == -220368507, "test_OWString error 71" ); - OUString s13( OUString(RTL_CONSTASCII_USTRINGPARAM("4423A61H45")) ); + OUString s13( OUString("4423A61H45") ); sal_Int64 n2 = s13.toInt32(); TEST_ENSURE( n2 == 4423, "test_OWString error 72" ); diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx index 1e0c812a0144..2fc54cb2367d 100644 --- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx +++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx @@ -152,29 +152,29 @@ void oldtests::test_OUStringBuffer() // "Mein erster RTL OUString\n" // | | | | | // Index 0 5 10 15 20 - OUString s1(OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n"))); + OUString s1(OUString("Mein erster RTL OUString\n")); OUStringBuffer b1(s1); TEST_ENSURE( b1.getCapacity() == 16 + s1.getLength(), "test_OWStringBuffer error 1"); - b1.insert(b1.getLength() - 1, OUString(RTL_CONSTASCII_USTRINGPARAM("Buffer"))); - s1 = OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUStringBuffer\n")); + b1.insert(b1.getLength() - 1, OUString("Buffer")); + s1 = OUString("Mein erster RTL OUStringBuffer\n"); TEST_ENSURE( s1 == b1.getStr(), "test_OWStringBuffer error 2"); - b1.insert(b1.getLength() - 1, OUString(RTL_CONSTASCII_USTRINGPARAM(" ist viel zu gross fuer den alten Buffer"))); + b1.insert(b1.getLength() - 1, OUString(" ist viel zu gross fuer den alten Buffer")); //TEST_ENSURE( b1.getCapacity() == b1.getLength(), "test_OWStringBuffer error 3"); OUStringBuffer b2(30); - s1 = OUString(RTL_CONSTASCII_USTRINGPARAM("false")); + s1 = OUString("false"); sal_Bool b = sal_False; b2.append(b); TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 4"); sal_Int32 n = 123456789L; - s1 += OUString(RTL_CONSTASCII_USTRINGPARAM(" 123456789")); - b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); + s1 += OUString(" 123456789"); + b2.append(OUString(" ")); b2.append(n); TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 5"); @@ -183,8 +183,8 @@ void oldtests::test_OUStringBuffer() #else sal_Int64 m = -3223372036854775807; #endif - s1 += OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807")); - b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); + s1 += OUString(" -3223372036854775807"); + b2.append(OUString(" ")); b2.append(m); TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 6"); @@ -194,32 +194,32 @@ void oldtests::test_OUStringBuffer() b2.ensureCapacity(50); TEST_ENSURE( b2.getCapacity() == 50, "test_OWStringBuffer error 8"); - b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > <\n"))); - b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" Hallo"))); - s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > Hallo <\n")); + b2.append(OUString("Hier fuege ich jetzt ein > <\n")); + b2.insert(26, OUString(" Hallo")); + s2 = OUString("Hier fuege ich jetzt ein > Hallo <\n"); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 9"); b2.insert(26, b); - b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); - s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > false Hallo <\n")); + b2.insert(26, OUString(" ")); + s2 = OUString("Hier fuege ich jetzt ein > false Hallo <\n"); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 10"); b2.insert(26, n); - b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); - s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > 123456789 false Hallo <\n")); + b2.insert(26, OUString(" ")); + s2 = OUString("Hier fuege ich jetzt ein > 123456789 false Hallo <\n"); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 11"); b2.insert(26, m); - b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); - s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n")); + b2.insert(26, OUString(" ")); + s2 = OUString("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n"); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 12"); // ASCII-Schnittstelle, AB 15.10.1999 - OUString s3(OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString"))); + OUString s3(OUString("Noch'n RTL OUString")); OUStringBuffer b3(s3); sal_Char aAsciiStr[] = " mit appendetem ASCII\n"; b3.appendAscii( aAsciiStr ); - s3 = OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString mit appendetem ASCII\n")); + s3 = OUString("Noch'n RTL OUString mit appendetem ASCII\n"); TEST_ENSURE( b3.getStr() == s3 , "test_OWStringBuffer error 13"); diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testHelperFunctions.cxx index 7cc6edef9dd4..b7781c33c49b 100644 --- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx +++ b/sal/qa/testHelperFunctions/testHelperFunctions.cxx @@ -214,7 +214,7 @@ namespace testOfHelperFunctions rtl::OString sValue("foo bar"); t_print("a String '%s' (should be 'foo bar')\n", sValue.getStr()); - rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("a unicode string")); + rtl::OUString suValue("a unicode string"); sValue <<= suValue; t_print("a String '%s'\n", sValue.getStr()); } diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx index c4db0883b1ac..b6610f632c09 100644 --- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx +++ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx @@ -45,7 +45,7 @@ namespace testOfHelperFunctions void test_valueequal::valueequal_001( ) { rtl::OString sValue; - rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("This is only a test of some helper functions")); + rtl::OUString suValue("This is only a test of some helper functions"); sValue <<= suValue; t_print("'%s'\n", sValue.getStr()); } diff --git a/sal/workben/getlocaleinfotest.cxx b/sal/workben/getlocaleinfotest.cxx index 1cb0f446ef4d..d6affcb7aac4 100644 --- a/sal/workben/getlocaleinfotest.cxx +++ b/sal/workben/getlocaleinfotest.cxx @@ -33,8 +33,8 @@ int _cdecl main( int argc, char * argv[] ) { - rtl::OUString lang(RTL_CONSTASCII_USTRINGPARAM("de")); - rtl::OUString country(RTL_CONSTASCII_USTRINGPARAM("DE")); + rtl::OUString lang("de"); + rtl::OUString country("DE"); rtl_TextEncoding rtlTextEnc; rtl_Locale* rtlLocale = diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index 9554c0fa6c9e..0ec2fe9600c3 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -161,7 +161,7 @@ sal_Bool Initialize( void ) iniFileURL=rtl::OUString( rtl_uString_getStr(strExeFileURL) ,(int) (pExeFileCount-rtl_uString_getStr(strExeFileURL)) ); // add "/testfile.ini" to iniFileURL - iniFileURL+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testfile.ini")); + iniFileURL+=rtl::OUString("/testfile.ini"); // Open the ini-File pFile=new File( iniFileURL ); @@ -904,7 +904,7 @@ void FileCopyAndMoveTest( void ) // FileCopyTest //-------------------------------------------------- - destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + destPath+=rtl::OUString("/"); destPath+=file3; printf( "Copy the file "); @@ -938,7 +938,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir_not_exist ); - destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + destPath+=rtl::OUString("/"); destPath+=file3; printf( "Copy a file to a not existing directory \n"); @@ -971,7 +971,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir2 ); - destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + destPath+=rtl::OUString("/"); destPath+=file3; printf( "Move the file "); @@ -1020,7 +1020,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir_not_exist ); - destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + destPath+=rtl::OUString("/"); destPath+=file3; printf( "Move a file to a not existing directory: \n"); @@ -2300,15 +2300,15 @@ void AbsolutePathTest(void) printf( "AbsolutePath-Test\n" ); printf( "--------------------------------------------\n\n" ); - DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); - DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".."))); - DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../.."))); - DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU"))); + DoAbsolutePathTest(dir1, rtl::OUString(".")); + DoAbsolutePathTest(dir1, rtl::OUString("..")); + DoAbsolutePathTest(dir1, rtl::OUString("../..")); + DoAbsolutePathTest(dir1, rtl::OUString("../HUHU")); - DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); - DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".."))); - DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../.."))); - DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU"))); + DoAbsolutePathTest(dir_on_server, rtl::OUString(".")); + DoAbsolutePathTest(dir_on_server, rtl::OUString("..")); + DoAbsolutePathTest(dir_on_server, rtl::OUString("../..")); + DoAbsolutePathTest(dir_on_server, rtl::OUString("../HUHU")); PressKey(); return; @@ -2418,7 +2418,7 @@ void SearchPathTest(void) printFileName( file3 ); printf( "\n" ); - rc=FileBase::searchFileURL( file3 , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) , strResultPath ); + rc=FileBase::searchFileURL( file3 , rtl::OUString("") , strResultPath ); if ( rc == FileBase::E_None ) { @@ -2455,7 +2455,7 @@ void SearchPathTest(void) //------------------------------------------------------------ rtl::OUString strSearchPath( dir_not_exist ); - strSearchPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")); + strSearchPath+=rtl::OUString(";"); strSearchPath+=dir_on_server; printf( "\nsearchFileURL: File : "); diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index a385426f73ff..d7ff89d6b9d3 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -65,13 +65,13 @@ namespace stoc_bootstrap Sequence< OUString > defreg_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } OUString defreg_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } } @@ -980,7 +980,7 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU if ( lastIndex == 0 ) resolvedName = m_name + aLinkName; else - resolvedName = m_name + OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + aLinkName; + resolvedName = m_name + OUString( "/" ) + aLinkName; } if ( m_localKey.is() && m_localKey->isValid() ) @@ -1034,7 +1034,7 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) if ( lastIndex == 0 ) resolvedName = m_name + rLinkName; else - resolvedName = m_name + OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rLinkName; + resolvedName = m_name + OUString( "/" ) + rLinkName; } if ( m_localKey.is() && m_localKey->isValid() && @@ -1078,7 +1078,7 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) if ( lastIndex == 0 ) resolvedName = m_name + rLinkName; else - resolvedName = m_name + OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rLinkName; + resolvedName = m_name + OUString( "/" ) + rLinkName; } OUString linkTarget; @@ -1176,8 +1176,8 @@ Any RegistryEnumueration::nextElement( ) } else { - throw NoSuchElementException( OUString( RTL_CONSTASCII_USTRINGPARAM( - "NestedRegistry: no nextElement() !" ) ),Reference< XInterface > () ); + throw NoSuchElementException( OUString( + "NestedRegistry: no nextElement() !" ),Reference< XInterface > () ); } return a; } @@ -1266,7 +1266,7 @@ void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) throw(InvalidRegistryException, RuntimeException) { throw InvalidRegistryException( - OUString(RTL_CONSTASCII_USTRINGPARAM("the 'open' method is not specified for a nested registry")), + OUString("the 'open' method is not specified for a nested registry"), Reference< XInterface >() ); } @@ -1302,7 +1302,7 @@ void SAL_CALL NestedRegistryImpl::close( ) } /* throw InvalidRegistryException( - OUString(RTL_CONSTASCII_USTRINGPARAM("the 'close' method is not specified for a nested registry")), + OUString("the 'close' method is not specified for a nested registry"), Reference< XInterface >() ); */ } @@ -1312,7 +1312,7 @@ void SAL_CALL NestedRegistryImpl::destroy( ) throw(InvalidRegistryException, RuntimeException) { throw InvalidRegistryException( - OUString(RTL_CONSTASCII_USTRINGPARAM("the 'destroy' method is not specified for a nested registry")), + OUString("the 'destroy' method is not specified for a nested registry"), Reference< XInterface >() ); } diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx index fb831c14ce74..0a2ab4e16ad7 100644 --- a/stoc/test/excomp/excomp.cxx +++ b/stoc/test/excomp/excomp.cxx @@ -70,35 +70,35 @@ OUString getExePath() SAL_IMPLEMENT_MAIN() { #ifdef UNX - OUString compName1(RTL_CONSTASCII_USTRINGPARAM("libexcomp1.so")); - OUString compName2(RTL_CONSTASCII_USTRINGPARAM("libexcomp2.so")); + OUString compName1("libexcomp1.so"); + OUString compName2("libexcomp2.so"); #else - OUString compName1(RTL_CONSTASCII_USTRINGPARAM("excomp1")); - OUString compName2(RTL_CONSTASCII_USTRINGPARAM("excomp2")); + OUString compName1("excomp1"); + OUString compName2("excomp2"); #endif OUString exePath( getExePath() ); OUString excompRdb(exePath); - excompRdb += OUString(RTL_CONSTASCII_USTRINGPARAM("excomp.rdb")); + excompRdb += OUString("excomp.rdb"); Reference< XMultiServiceFactory > xSMgr = ::cppu::createRegistryServiceFactory( excompRdb ); OSL_ENSURE( xSMgr.is(), "excomp error 0" ); typelib_TypeDescription* pTypeDesc = NULL; - OUString sType(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.XTextDocument")); + OUString sType("com.sun.star.text.XTextDocument"); typelib_typedescription_getByName( &pTypeDesc, sType.pData); // typelib_InterfaceTypeDescription* pInterDesc = (typelib_InterfaceTypeDescription*)pTypeDesc; - Reference< XInterface > xIFace = xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))); + Reference< XInterface > xIFace = xSMgr->createInstance(OUString("com.sun.star.registry.ImplementationRegistration")); Reference< XImplementationRegistration > xImpReg( xIFace, UNO_QUERY); OSL_ENSURE( xImpReg.is(), "excomp error 1" ); try { - xImpReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), + xImpReg->registerImplementation(OUString("com.sun.star.loader.SharedLibrary"), compName1, Reference< XSimpleRegistry >() ); - xImpReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), + xImpReg->registerImplementation(OUString("com.sun.star.loader.SharedLibrary"), compName2, Reference< XSimpleRegistry >() ); } @@ -107,10 +107,10 @@ SAL_IMPLEMENT_MAIN() OSL_ENSURE( e.Message.getLength(), OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr() ); } - Reference< XTest > xTest1( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("example.ExampleComponent1"))), + Reference< XTest > xTest1( xSMgr->createInstance(OUString("example.ExampleComponent1")), UNO_QUERY); OSL_ENSURE( xTest1.is(), "excomp error 2" ); - Reference< XTest > xTest2( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("example.ExampleComponent2"))), + Reference< XTest > xTest2( xSMgr->createInstance(OUString("example.ExampleComponent2")), UNO_QUERY); OSL_ENSURE( xTest2.is(), "excomp error 3" ); diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx index c22fb7afce25..c08a4559151d 100644 --- a/stoc/test/excomp/excomp1.cxx +++ b/stoc/test/excomp/excomp1.cxx @@ -93,7 +93,7 @@ OUString SAL_CALL ExampleComponent1Impl::getImplementationName( ) throw(RuntimeException) { Guard< Mutex > aGuard( m_mutex ); - return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME1) ); + return OUString( IMPLNAME1 ); } //************************************************************************* @@ -120,7 +120,7 @@ Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames( ) //************************************************************************* Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames_Static( ) { - OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME1) ); + OUString aName( SERVICENAME1 ); return Sequence< OUString >( &aName, 1 ); } @@ -128,7 +128,7 @@ Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames_Stat OUString SAL_CALL ExampleComponent1Impl::getMessage() throw(RuntimeException) { Guard< Mutex > aGuard( m_mutex ); - return OUString(RTL_CONSTASCII_USTRINGPARAM("Lalelu nur der Mann im Mond schaut zu ...")); + return OUString("Lalelu nur der Mann im Mond schaut zu ..."); } @@ -163,7 +163,7 @@ sal_Bool SAL_CALL component_writeInfo( // ExampleComponent1 Reference< XRegistryKey > xNewKey( reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME1 "/UNO/SERVICES") ) ) ); + OUString( "/" IMPLNAME1 "/UNO/SERVICES" ) ) ); const Sequence< OUString > & rSNL = ::excomp_impl::ExampleComponent1Impl::getSupportedServiceNames_Static(); @@ -190,7 +190,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( { Reference< XSingleServiceFactory > xFactory( createSingleFactory( reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME1) ), + OUString( IMPLNAME1 ), ::excomp_impl::ExampleComponent1_CreateInstance, ::excomp_impl::ExampleComponent1Impl::getSupportedServiceNames_Static() ) ); diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx index 6da256e9745f..2d5bc23705a2 100644 --- a/stoc/test/excomp/excomp2.cxx +++ b/stoc/test/excomp/excomp2.cxx @@ -163,7 +163,7 @@ OUString SAL_CALL ExampleComponent2Impl::getImplementationName( ) throw(RuntimeException) { Guard< Mutex > aGuard( m_mutex ); - return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME2) ); + return OUString( IMPLNAME2 ); } //************************************************************************* @@ -190,7 +190,7 @@ Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames( ) //************************************************************************* Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames_Static( ) { - OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME2) ); + OUString aName( SERVICENAME2 ); return Sequence< OUString >( &aName, 1 ); } @@ -198,7 +198,7 @@ Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames_Stat OUString SAL_CALL ExampleComponent2Impl::getMessage() throw(RuntimeException) { Guard< Mutex > aGuard( m_mutex ); - return OUString(RTL_CONSTASCII_USTRINGPARAM("Alle meine Entchen schwimmen auf dem See, schwimmen auf dem See ...")); + return OUString("Alle meine Entchen schwimmen auf dem See, schwimmen auf dem See ..."); } @@ -234,7 +234,7 @@ sal_Bool SAL_CALL component_writeInfo( // ExampleComponent2 Reference< XRegistryKey > xNewKey( reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME2 "/UNO/SERVICES") ) ) ); + OUString( "/" IMPLNAME2 "/UNO/SERVICES" ) ) ); const Sequence< OUString > & rSNL = ::excomp2_impl::ExampleComponent2Impl::getSupportedServiceNames_Static(); @@ -261,7 +261,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( { Reference< XSingleServiceFactory > xFactory( createSingleFactory( reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), - OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME2) ), + OUString( IMPLNAME2 ), ::excomp2_impl::ExampleComponent2_CreateInstance, ::excomp2_impl::ExampleComponent2Impl::getSupportedServiceNames_Static() ) ); diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx index 20ea509be5aa..1a3c1cd96069 100644 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx +++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx @@ -136,12 +136,10 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) css::uno::Sequence< css::uno::Any > args(1); args[0] = css::uno::Reference< css::beans::XPropertySet >( factory, css::uno::UNO_QUERY_THROW)->getPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Registry"))); + rtl::OUString("Registry")); css::uno::Reference< css::container::XHierarchicalNameAccess > provider( factory->createInstanceWithArgumentsAndContext( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider")), + rtl::OUString( "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"), args, m_context), css::uno::UNO_QUERY_THROW); @@ -154,87 +152,65 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< bool >( false, provider->hasByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("[][]boolean")))); + rtl::OUString( "[][]boolean"))); assertEqual< bool >( false, provider->hasByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct3<boolean,boolean>")))); + rtl::OUString( "test.registrytdprovider.Struct3<boolean,boolean>"))); assertEqual< bool >( false, provider->hasByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uno.XComponentContext::getValueByName")))); + rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName"))); css::uno::Reference< css::reflection::XCompoundTypeDescription > exception; exception = css::uno::Reference< css::reflection::XCompoundTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception"))), + rtl::OUString( "com.sun.star.uno.Exception")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_EXCEPTION, exception->getTypeClass()); - assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")), + assertEqual( rtl::OUString( "com.sun.star.uno.Exception"), exception->getName()); assertFalse(exception->getBaseType().is()); exception = css::uno::Reference< css::reflection::XCompoundTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uno.RuntimeException"))), + rtl::OUString( "com.sun.star.uno.RuntimeException")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_EXCEPTION, exception->getTypeClass()); - assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")), + assertEqual( rtl::OUString( "com.sun.star.uno.RuntimeException"), exception->getName()); - assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")), + assertEqual( rtl::OUString( "com.sun.star.uno.Exception"), exception->getBaseType()->getName()); css::uno::Reference< css::reflection::XStructTypeDescription > structure; structure = css::uno::Reference< css::reflection::XStructTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct2"))), + rtl::OUString( "test.registrytdprovider.Struct2")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass()); - assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Struct2")), + assertEqual( rtl::OUString( "test.registrytdprovider.Struct2"), structure->getName()); assertFalse(structure->getBaseType().is()); assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Struct1")), + rtl::OUString( "test.registrytdprovider.Struct1"), structure->getMemberTypes()[0]->getName()); assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("s1")), + rtl::OUString("s1"), structure->getMemberNames()[0]); assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength()); assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength()); structure = css::uno::Reference< css::reflection::XStructTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct3"))), + rtl::OUString( "test.registrytdprovider.Struct3")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Struct3")), + rtl::OUString( "test.registrytdprovider.Struct3"), structure->getName()); assertFalse(structure->getBaseType().is()); assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength()); @@ -242,47 +218,41 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) css::uno::TypeClass_UNKNOWN, structure->getMemberTypes()[0]->getTypeClass()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("U")), + rtl::OUString("U"), structure->getMemberTypes()[0]->getName()); assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("s2")), + rtl::OUString("s2"), structure->getMemberNames()[0]); assertEqual< sal_Int32 >(2, structure->getTypeParameters().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("T")), + rtl::OUString("T"), structure->getTypeParameters()[0]); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("U")), + rtl::OUString("U"), structure->getTypeParameters()[1]); assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength()); structure = css::uno::Reference< css::reflection::XStructTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct4"))), + rtl::OUString( "test.registrytdprovider.Struct4")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Struct4")), + rtl::OUString( "test.registrytdprovider.Struct4"), structure->getName()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Struct2")), + rtl::OUString( "test.registrytdprovider.Struct2"), structure->getBaseType()->getName()); assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct3<" + rtl::OUString( "test.registrytdprovider.Struct3<" "test.registrytdprovider.Struct2," - "test.registrytdprovider.Struct3<boolean,any>>")), + "test.registrytdprovider.Struct3<boolean,any>>"), structure->getMemberTypes()[0]->getName()); assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("s2")), + rtl::OUString("s2"), structure->getMemberNames()[0]); assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength()); assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength()); @@ -293,22 +263,18 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) interface = css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.XTest1"))), + rtl::OUString( "test.registrytdprovider.XTest1")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE, interface->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1")), + rtl::OUString( "test.registrytdprovider.XTest1"), interface->getName()); css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > bases( interface->getBaseTypes()); assertEqual< sal_Int32 >(1, bases.getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")), + rtl::OUString( "com.sun.star.uno.XInterface"), bases[0]->getName()); css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > > @@ -316,7 +282,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< sal_Int32 >(1, optionalBases.getLength()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XBase")), + "test.registrytdprovider.XBase"), optionalBases[0]->getName()); css::uno::Sequence< css::uno::Reference< @@ -341,16 +307,15 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual( css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1::a1")), + rtl::OUString( "test.registrytdprovider.XTest1::a1"), attribute->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a1")), + rtl::OUString("a1"), attribute->getMemberName()); assertEqual< sal_Int32 >(3, attribute->getPosition()); assertEqual< bool >(false, attribute->isReadOnly()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("short")), + rtl::OUString("short"), attribute->getType()->getName()); assertEqual< bool >(true, attribute->isBound()); getExceptions = attribute->getGetExceptions(); @@ -364,39 +329,32 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual( css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1::a2")), + rtl::OUString( "test.registrytdprovider.XTest1::a2"), attribute->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a2")), + rtl::OUString("a2"), attribute->getMemberName()); assertEqual< sal_Int32 >(4, attribute->getPosition()); assertEqual< bool >(false, attribute->isReadOnly()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("long")), + rtl::OUString("long"), attribute->getType()->getName()); assertEqual< bool >(false, attribute->isBound()); getExceptions = attribute->getGetExceptions(); assertEqual< sal_Int32 >(2, getExceptions.getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.lang.WrappedTargetException")), + rtl::OUString( "com.sun.star.lang.WrappedTargetException"), getExceptions[0]->getName()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")), + rtl::OUString( "com.sun.star.uno.RuntimeException"), getExceptions[1]->getName()); setExceptions = attribute->getSetExceptions(); assertEqual< sal_Int32 >(2, setExceptions.getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")), + rtl::OUString( "com.sun.star.uno.Exception"), setExceptions[0]->getName()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.lang.WrappedTargetException")), + rtl::OUString( "com.sun.star.lang.WrappedTargetException"), setExceptions[1]->getName()); attribute = css::uno::Reference< @@ -406,23 +364,21 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1::a3")), + "test.registrytdprovider.XTest1::a3"), attribute->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a3")), + rtl::OUString("a3"), attribute->getMemberName()); assertEqual< sal_Int32 >(5, attribute->getPosition()); assertEqual< bool >(true, attribute->isReadOnly()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")), + rtl::OUString("hyper"), attribute->getType()->getName()); assertEqual< bool >(true, attribute->isBound()); getExceptions = attribute->getGetExceptions(); assertEqual< sal_Int32 >(1, getExceptions.getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.lang.WrappedTargetException")), + rtl::OUString( "com.sun.star.lang.WrappedTargetException"), getExceptions[0]->getName()); setExceptions = attribute->getSetExceptions(); assertEqual< sal_Int32 >(0, setExceptions.getLength()); @@ -432,28 +388,26 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) members[3], css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1::f1")), + rtl::OUString( "test.registrytdprovider.XTest1::f1"), method->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f1")), + rtl::OUString("f1"), method->getMemberName()); assertEqual< sal_Int32 >(6, method->getPosition()); assertEqual< bool >(false, method->isOneway()); assertEqual< sal_Int32 >(1, method->getParameters().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("p")), + rtl::OUString("p"), method->getParameters()[0]->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), + rtl::OUString("any"), method->getParameters()[0]->getType()->getName()); assertEqual< bool >(false, method->getParameters()[0]->isIn()); assertEqual< bool >(true, method->getParameters()[0]->isOut()); assertEqual< sal_Int32 >(0, method->getParameters()[0]->getPosition()); assertEqual< sal_Int32 >(1, method->getExceptions().getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")), + rtl::OUString( "com.sun.star.uno.RuntimeException"), method->getExceptions()[0]->getName()); method = css::uno::Reference< @@ -461,11 +415,10 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) members[4], css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1::f2")), + rtl::OUString( "test.registrytdprovider.XTest1::f2"), method->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f2")), + rtl::OUString("f2"), method->getMemberName()); assertEqual< sal_Int32 >(7, method->getPosition()); assertEqual< bool >(true, method->isOneway()); @@ -475,19 +428,15 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) interface = css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.XTest2"))), + rtl::OUString( "test.registrytdprovider.XTest2")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE, interface->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest2")), + rtl::OUString( "test.registrytdprovider.XTest2"), interface->getName()); assertEqual< sal_Int32 >(1, interface->getBaseTypes().getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Typedef2")), + rtl::OUString( "test.registrytdprovider.Typedef2"), interface->getBaseTypes()[0]->getName()); assertEqual< sal_Int32 >(0, interface->getOptionalBaseTypes().getLength()); assertEqual< sal_Int32 >(0, interface->getMembers().getLength()); @@ -496,14 +445,11 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Service1"))), + rtl::OUString( "test.registrytdprovider.Service1")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Service1")), + rtl::OUString( "test.registrytdprovider.Service1"), service->getName()); assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength()); assertEqual< sal_Int32 >(0, service->getOptionalServices().getLength()); @@ -512,26 +458,26 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< bool >(true, service->isSingleInterfaceBased()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1")), + "test.registrytdprovider.XTest1"), service->getInterface()->getName()); assertEqual< sal_Int32 >(2, service->getConstructors().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("c1")), + rtl::OUString("c1"), service->getConstructors()[0]->getName()); assertEqual< sal_Int32 >( 0, service->getConstructors()[0]->getParameters().getLength()); assertEqual< sal_Int32 >( 0, service->getConstructors()[0]->getExceptions().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("c2")), + rtl::OUString("c2"), service->getConstructors()[1]->getName()); assertEqual< sal_Int32 >( 1, service->getConstructors()[1]->getParameters().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("p")), + rtl::OUString("p"), service->getConstructors()[1]->getParameters()[0]->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), + rtl::OUString("any"), (service->getConstructors()[1]->getParameters()[0]->getType()-> getName())); assertEqual< bool >( @@ -546,32 +492,26 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< sal_Int32 >( 1, service->getConstructors()[1]->getExceptions().getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")), + rtl::OUString( "com.sun.star.uno.RuntimeException"), service->getConstructors()[1]->getExceptions()[0]->getName()); service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Service2"))), + rtl::OUString( "test.registrytdprovider.Service2")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Service2")), + rtl::OUString( "test.registrytdprovider.Service2"), service->getName()); assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength()); assertEqual< sal_Int32 >(0, service->getOptionalServices().getLength()); assertEqual< sal_Int32 >(1, service->getMandatoryInterfaces().getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1")), + rtl::OUString( "test.registrytdprovider.XTest1"), service->getMandatoryInterfaces()[0]->getName()); assertEqual< sal_Int32 >(1, service->getOptionalInterfaces().getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XBase")), + rtl::OUString( "test.registrytdprovider.XBase"), service->getOptionalInterfaces()[0]->getName()); assertEqual< bool >(false, service->isSingleInterfaceBased()); assertFalse(service->getInterface().is()); @@ -579,14 +519,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Service3"))), + rtl::OUString( "test.registrytdprovider.Service3")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Service3")), + "test.registrytdprovider.Service3"), service->getName()); assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength()); assertEqual< sal_Int32 >(0, service->getOptionalServices().getLength()); @@ -595,7 +533,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) assertEqual< bool >(true, service->isSingleInterfaceBased()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Typedef2")), + "test.registrytdprovider.Typedef2"), service->getInterface()->getName()); assertEqual< sal_Int32 >(0, service->getConstructors().getLength()); @@ -605,37 +543,33 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) singleton = css::uno::Reference< css::reflection::XSingletonTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Singleton1"))), + rtl::OUString( "test.registrytdprovider.Singleton1")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Singleton1")), + "test.registrytdprovider.Singleton1"), singleton->getName()); assertFalse(singleton->getService().is()); assertEqual< bool >(true, singleton->isInterfaceBased()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.XTest1")), + "test.registrytdprovider.XTest1"), singleton->getInterface()->getName()); singleton = css::uno::Reference< css::reflection::XSingletonTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Singleton2"))), + rtl::OUString( "test.registrytdprovider.Singleton2")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Singleton2")), + "test.registrytdprovider.Singleton2"), singleton->getName()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Service1")), + "test.registrytdprovider.Service1"), singleton->getService()->getName()); assertEqual< bool >(false, singleton->isInterfaceBased()); assertFalse(singleton->getInterface().is()); @@ -643,29 +577,25 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) singleton = css::uno::Reference< css::reflection::XSingletonTypeDescription2 >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Singleton3"))), + rtl::OUString( "test.registrytdprovider.Singleton3")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Singleton3")), + "test.registrytdprovider.Singleton3"), singleton->getName()); assertFalse(singleton->getService().is()); assertEqual< bool >(true, singleton->isInterfaceBased()); assertEqual( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.Typedef2")), + "test.registrytdprovider.Typedef2"), singleton->getInterface()->getName()); css::uno::Reference< css::reflection::XPublished > published; published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Enum1"))), + rtl::OUString( "test.registrytdprovider.Enum1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -673,9 +603,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Enum2"))), + rtl::OUString( "test.registrytdprovider.Enum2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -683,9 +611,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct1"))), + rtl::OUString( "test.registrytdprovider.Struct1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -693,9 +619,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct2"))), + rtl::OUString( "test.registrytdprovider.Struct2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -703,9 +627,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct3"))), + rtl::OUString( "test.registrytdprovider.Struct3")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -713,18 +635,14 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XStructTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct3"))), + rtl::OUString( "test.registrytdprovider.Struct3")), css::uno::UNO_QUERY_THROW)->getMemberTypes()[0], css::uno::UNO_QUERY); assertFalse(published.is()); published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Struct3a"))), + rtl::OUString( "test.registrytdprovider.Struct3a")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -732,9 +650,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Exception1"))), + rtl::OUString( "test.registrytdprovider.Exception1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -742,9 +658,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Exception2"))), + rtl::OUString( "test.registrytdprovider.Exception2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -752,9 +666,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.XTest1"))), + rtl::OUString( "test.registrytdprovider.XTest1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -762,9 +674,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.XTest2"))), + rtl::OUString( "test.registrytdprovider.XTest2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -772,9 +682,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Typedef1"))), + rtl::OUString( "test.registrytdprovider.Typedef1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -782,9 +690,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Typedef2"))), + rtl::OUString( "test.registrytdprovider.Typedef2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -796,9 +702,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Consts1"))), + rtl::OUString( "test.registrytdprovider.Consts1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -806,9 +710,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Consts2"))), + rtl::OUString( "test.registrytdprovider.Consts2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -816,17 +718,14 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider"))), + rtl::OUString( "test.registrytdprovider")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertFalse(published.is()); published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Service1"))), + rtl::OUString( "test.registrytdprovider.Service1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -834,9 +733,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Service2"))), + rtl::OUString( "test.registrytdprovider.Service2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -844,9 +741,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Singleton2"))), + rtl::OUString( "test.registrytdprovider.Singleton2")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -854,9 +749,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) published = css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( provider->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.registrytdprovider.Singleton1"))), + rtl::OUString( "test.registrytdprovider.Singleton1")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY); assertTrue(published.is()); @@ -866,7 +759,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) } rtl::OUString Service::getImplementationName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.impl")); + return rtl::OUString("test.registrytdprovider.impl"); } css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() { @@ -902,9 +795,9 @@ namespace { bool writeInfo(void * registryKey, rtl::OUString const & implementationName, css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName(RTL_CONSTASCII_USTRINGPARAM("/")); + rtl::OUString keyName("/"); keyName += implementationName; - keyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); + keyName += rtl::OUString("/UNO/SERVICES"); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index 9789f20520bd..69bc43e0708d 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -134,9 +134,8 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) css::uno::Reference< css::container::XHierarchicalNameAccess > manager( m_context->getValueByName( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "/singletons/" - "com.sun.star.reflection.theTypeDescriptionManager"))), + "com.sun.star.reflection.theTypeDescriptionManager")), css::uno::UNO_QUERY_THROW); //////////////////////////////////////// @@ -155,17 +154,15 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) css::uno::Reference<css::registry::XSimpleRegistry> xReg( m_context->getServiceManager()->createInstanceWithContext( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.registry.SimpleRegistry") ), + rtl::OUString( "com.sun.star.registry.SimpleRegistry" ), m_context ), css::uno::UNO_QUERY_THROW ); xReg->open( url, true /* read-only */, false /* ! create */ ); css::uno::Any arg( css::uno::makeAny(xReg) ); css::uno::Reference<css::container::XHierarchicalNameAccess> xTDprov( m_context->getServiceManager()-> createInstanceWithArgumentsAndContext( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.stoc." - "RegistryTypeDescriptionProvider") ), + rtl::OUString( "com.sun.star.comp.stoc." + "RegistryTypeDescriptionProvider" ), css::uno::Sequence<css::uno::Any>( &arg, 1 ), m_context ), css::uno::UNO_QUERY_THROW ); try { @@ -186,79 +183,67 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) css::uno::Reference< css::reflection::XIndirectTypeDescription > sequence( manager->getByHierarchicalName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]boolean"))), + rtl::OUString("[][]boolean")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_SEQUENCE, sequence->getTypeClass()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]boolean")), + rtl::OUString("[][]boolean"), sequence->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]boolean")), + rtl::OUString("[]boolean"), sequence->getReferencedType()->getName()); css::uno::Reference< css::reflection::XStructTypeDescription > structure( manager->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.tdmanager.Struct<boolean,test.tdmanager.Struct<" - "any,com.sun.star.uno.XInterface>>"))), + rtl::OUString( "test.tdmanager.Struct<boolean,test.tdmanager.Struct<" + "any,com.sun.star.uno.XInterface>>")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.tdmanager.Struct<boolean,test.tdmanager.Struct<" - "any,com.sun.star.uno.XInterface>>")), + rtl::OUString( "test.tdmanager.Struct<boolean,test.tdmanager.Struct<" + "any,com.sun.star.uno.XInterface>>"), structure->getName()); assertEqual< bool >(false, structure->getBaseType().is()); assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.tdmanager.Struct<any,com.sun.star.uno.XInterface>")), + rtl::OUString( "test.tdmanager.Struct<any,com.sun.star.uno.XInterface>"), structure->getMemberTypes()[0]->getName()); assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("s")), + rtl::OUString("s"), structure->getMemberNames()[0]); assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength()); assertEqual< sal_Int32 >(2, structure->getTypeArguments().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), + rtl::OUString("boolean"), structure->getTypeArguments()[0]->getName()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "test.tdmanager.Struct<any,com.sun.star.uno.XInterface>")), + rtl::OUString( "test.tdmanager.Struct<any,com.sun.star.uno.XInterface>"), structure->getTypeArguments()[1]->getName()); css::uno::Reference< css::reflection::XInterfaceMethodTypeDescription > method( manager->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uno.XComponentContext::getValueByName"))), + rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName")), css::uno::UNO_QUERY_THROW); assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass()); assertEqual( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uno.XComponentContext::getValueByName")), + rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName"), method->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getValueByName")), + rtl::OUString("getValueByName"), method->getMemberName()); assertEqual< sal_Int32 >(3, method->getPosition()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), + rtl::OUString("any"), method->getReturnType()->getName()); assertEqual< bool >(false, method->isOneway()); assertEqual< sal_Int32 >(1, method->getParameters().getLength()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), + rtl::OUString("Name"), method->getParameters()[0]->getName()); assertEqual( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string")), + rtl::OUString("string"), method->getParameters()[0]->getType()->getName()); assertEqual< bool >(true, method->getParameters()[0]->isIn()); assertEqual< bool >(false, method->getParameters()[0]->isOut()); @@ -269,25 +254,21 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( manager->getByHierarchicalName( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]boolean"))), + rtl::OUString("[]boolean")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY).is()); assertFalse( css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( manager->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.beans.XIntroTest::ObjectName"))), + rtl::OUString( "com.sun.star.beans.XIntroTest::ObjectName")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY).is()); assertFalse( css::uno::Reference< css::reflection::XPublished >( css::uno::Reference< css::reflection::XTypeDescription >( manager->getByHierarchicalName( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.beans.XIntroTest::writeln"))), + rtl::OUString( "com.sun.star.beans.XIntroTest::writeln")), css::uno::UNO_QUERY_THROW), css::uno::UNO_QUERY).is()); //TODO: check that the reflection of a property of an accumulation-based @@ -297,7 +278,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) } rtl::OUString Service::getImplementationName() { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test.tdmanager.impl")); + return rtl::OUString("test.tdmanager.impl"); } css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() { @@ -333,9 +314,9 @@ namespace { bool writeInfo(void * registryKey, rtl::OUString const & implementationName, css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName(RTL_CONSTASCII_USTRINGPARAM("/")); + rtl::OUString keyName("/"); keyName += implementationName; - keyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); + keyName += rtl::OUString("/UNO/SERVICES"); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index 4a40bd2a54a6..e00cc9210bf2 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -101,23 +101,23 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Reference< XHierarchicalNameAccess > xHNameAccess( xRefl, UNO_QUERY ); OSL_ENSURE(xHNameAccess.is(), "### cannot get XHierarchicalNameAccess!" ); - OSL_ENSURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")))->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 2b"); - OSL_ENSURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionB")))->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 2c"); - OSL_ENSURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA"))).is(), "test_RegCoreReflection(): error 2e"); + OSL_ENSURE(xRefl->forName(OUString("ModuleA.StructA"))->getName() == OUString("ModuleA.StructA"), "test_RegCoreReflection(): error 2b"); + OSL_ENSURE(xRefl->forName(OUString("ModuleA.ExceptionB"))->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 2c"); + OSL_ENSURE(xRefl->forName(OUString("ModuleA.ModuleB.EnumA")).is(), "test_RegCoreReflection(): error 2e"); // const - OSL_ENSURE(*(const sal_Bool *)xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstBoolean"))).getValue() == aConstBoolean, "test_RegCoreReflection(): error 4c"); - OSL_ENSURE(*(const sal_Int8 *)xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstByte"))).getValue() == aConstByte, "test_RegCoreReflection(): error 4e"); - OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstShort"))) == aConstShort, "test_RegCoreReflection(): error 4g"); - OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstUShort"))) == aConstUShort, "test_RegCoreReflection(): error 4i"); - OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstLong"))) == aConstLong, "test_RegCoreReflection(): error 4k"); - OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstULong"))) == aConstULong, "test_RegCoreReflection(): error 4m"); -// OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstFloat"))) == aConstFloat, "test_RegCoreReflection(): error 4o"); -// OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstDouble"))) == aConstDouble, "test_RegCoreReflection(): error 4q"); + OSL_ENSURE(*(const sal_Bool *)xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstBoolean")).getValue() == aConstBoolean, "test_RegCoreReflection(): error 4c"); + OSL_ENSURE(*(const sal_Int8 *)xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstByte")).getValue() == aConstByte, "test_RegCoreReflection(): error 4e"); + OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstShort")) == aConstShort, "test_RegCoreReflection(): error 4g"); + OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstUShort")) == aConstUShort, "test_RegCoreReflection(): error 4i"); + OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstLong")) == aConstLong, "test_RegCoreReflection(): error 4k"); + OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstULong")) == aConstULong, "test_RegCoreReflection(): error 4m"); +// OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstFloat")) == aConstFloat, "test_RegCoreReflection(): error 4o"); +// OSL_ENSURE(xHNameAccess->getByHierarchicalName(OUString("ModuleC.aConstDouble")) == aConstDouble, "test_RegCoreReflection(): error 4q"); // Enums - xClass = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA"))); + xClass = xRefl->forName(OUString("ModuleA.ModuleB.EnumA")); OSL_ENSURE(xClass.is(), "test_RegCoreReflection(): error 5"); @@ -125,26 +125,26 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) OSL_ENSURE( (fields.getLength() == 3) && - (fields.getArray()[0]->getName() == OUString( RTL_CONSTASCII_USTRINGPARAM("VAL_1") )) && + (fields.getArray()[0]->getName() == OUString( "VAL_1" )) && (*(EnumA*)fields.getArray()[0]->get(Any()).getValue() == EnumA_VAL_1) && - (fields.getArray()[1]->getName() == OUString( RTL_CONSTASCII_USTRINGPARAM("VAL_2") )) && + (fields.getArray()[1]->getName() == OUString( "VAL_2" )) && (*(EnumA*)fields.getArray()[1]->get(Any()).getValue() == EnumA_VAL_2) && - (fields.getArray()[2]->getName() == OUString( RTL_CONSTASCII_USTRINGPARAM("VAL_3") )) && + (fields.getArray()[2]->getName() == OUString( "VAL_3" )) && (*(EnumA*)fields.getArray()[2]->get(Any()).getValue() == EnumA_VAL_3), "test_RegCoreReflection(): error 6"); // Interface - Reference< XIdlClass > xA = xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceB")) ); + Reference< XIdlClass > xA = xRefl->forName( OUString("ModuleC.XInterfaceB") ); - xClass = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceB"))); + xClass = xRefl->forName(OUString("ModuleC.XInterfaceB")); OSL_ENSURE(xClass == xA, "test_RegCoreReflection(): error 7"); OSL_ENSURE(xClass.is(), "test_RegCoreReflection(): error 7a"); typelib_TypeDescription * pTD = 0; - OUString aModuleName( RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceB") ); + OUString aModuleName( "ModuleC.XInterfaceB" ); typelib_typedescription_getByName( &pTD, aModuleName.pData ); OSL_ENSURE( pTD, "### cannot get typedescription for ModuleC.XInterfaceB!" ); @@ -154,60 +154,60 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) typelib_typedescription_release( pTD ); OSL_ENSURE(xClass->getSuperclasses().getLength() == 1, "test_RegCoreReflection(): error 9"); - OSL_ENSURE(xClass->getSuperclasses().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")), "test_RegCoreReflection(): error 10"); + OSL_ENSURE(xClass->getSuperclasses().getArray()[0]->getName() == OUString("ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 10"); OSL_ENSURE(xClass->getMethods().getLength() == 7, "test_RegCoreReflection(): error 11"); OSL_ENSURE(xA->getMethods().getLength() == 7, "test_RegCoreReflection(): error 11a"); - OSL_ENSURE(xClass->getMethods().getArray()[3]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodA")), "test_RegCoreReflection(): 12"); + OSL_ENSURE(xClass->getMethods().getArray()[3]->getName() == OUString("methodA"), "test_RegCoreReflection(): 12"); OSL_ENSURE(xClass->getMethods().getArray()[3]->getReturnType()->getTypeClass() == TypeClass_VOID, "test_RegCoreReflection(): error 13"); OSL_ENSURE(xClass->getMethods().getArray()[3]->getParameterTypes().getLength() == 0, "test_RegCoreReflection(): error 14"); OSL_ENSURE(xClass->getMethods().getArray()[3]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 15"); - OSL_ENSURE(xClass->getMethods().getArray()[4]->getName() == OUString( RTL_CONSTASCII_USTRINGPARAM("methodB") ), "test_RegCoreReflection(): error 16"); + OSL_ENSURE(xClass->getMethods().getArray()[4]->getName() == OUString( "methodB" ), "test_RegCoreReflection(): error 16"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getMode() == MethodMode_ONEWAY, "test_RegCoreReflection(): error 16a"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getReturnType()->getTypeClass() == TypeClass_VOID, "test_RegCoreReflection(): error 16"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterTypes().getLength() == 1, "test_RegCoreReflection(): error 17"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_SHORT, "test_RegCoreReflection(): error 18"); - OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aName == OUString( RTL_CONSTASCII_USTRINGPARAM("aShort") ), "test_RegCoreReflection(): error 18a"); - OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aType == xRefl->forName( OUString( RTL_CONSTASCII_USTRINGPARAM("short") ) ), "test_RegCoreReflection(): error 18b"); + OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aName == OUString( "aShort" ), "test_RegCoreReflection(): error 18a"); + OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aType == xRefl->forName( OUString( "short" ) ), "test_RegCoreReflection(): error 18b"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aMode == ParamMode_IN, "test_RegCoreReflection(): error 18c"); OSL_ENSURE(xClass->getMethods().getArray()[4]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 19"); - OSL_ENSURE(xClass->getMethods().getArray()[5]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")), "test_RegCoreReflection(): error 20"); + OSL_ENSURE(xClass->getMethods().getArray()[5]->getName() == OUString("methodC"), "test_RegCoreReflection(): error 20"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getMode() == MethodMode_TWOWAY, "test_RegCoreReflection(): error 20a"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 21"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 22"); - OSL_ENSURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructB")), "test_RegCoreReflection(): error 23"); + OSL_ENSURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getName() == OUString("ModuleA.StructB"), "test_RegCoreReflection(): error 23"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getLength() == 2, "test_RegCoreReflection(): error 24"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 25"); - OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")), "test_RegCoreReflection(): error 26"); + OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getName() == OUString("ModuleA.StructC"), "test_RegCoreReflection(): error 26"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 27"); - OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 28"); + OSL_ENSURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getName() == OUString("ModuleA.StructA"), "test_RegCoreReflection(): error 28"); OSL_ENSURE(xClass->getMethods().getArray()[5]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 29"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodD")), "test_RegCoreReflection(): error 30"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getName() == OUString("methodD"), "test_RegCoreReflection(): error 30"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getReturnType()->getTypeClass() == TypeClass_INTERFACE, "test_RegCoreReflection(): error 31"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getReturnType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")), "test_RegCoreReflection(): error 32"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getReturnType()->getName() == OUString("ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 32"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getParameterTypes().getLength() == 1, "test_RegCoreReflection(): error 33"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_ENUM, "test_RegCoreReflection(): error 34"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA")), "test_RegCoreReflection(): error 35"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getName() == OUString("ModuleA.ModuleB.EnumA"), "test_RegCoreReflection(): error 35"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getLength() == 3, "test_RegCoreReflection(): error 36"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 37"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionA")), "test_RegCoreReflection(): error 38"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getName() == OUString("ModuleA.ExceptionA"), "test_RegCoreReflection(): error 38"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 38"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionB")), "test_RegCoreReflection(): error 39"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getName() == OUString("ModuleA.ExceptionB"), "test_RegCoreReflection(): error 39"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 40"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionC")), "test_RegCoreReflection(): error 41"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getName() == OUString("ModuleA.ExceptionC"), "test_RegCoreReflection(): error 41"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getLength() == 3, "test_RegCoreReflection(): error 42"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getTypeClass() == TypeClass_BOOLEAN, "test_RegCoreReflection(): error 43"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), "test_RegCoreReflection(): error 43a"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getName() == OUString("boolean"), "test_RegCoreReflection(): error 43a"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 44"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")), "test_RegCoreReflection(): error 45"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getName() == OUString("ModuleA.StructC"), "test_RegCoreReflection(): error 45"); OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getTypeClass() == TypeClass_INTERFACE, "test_RegCoreReflection(): error 46"); - OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.XInterface1")), "test_RegCoreReflection(): error 47"); + OSL_ENSURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getName() == OUString("ModuleA.XInterface1"), "test_RegCoreReflection(): error 47"); // SequenceReflections - OSL_ENSURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 48"); - OSL_ENSURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->getComponentType().is(), "test_RegCoreReflection(): error 49"); - OSL_ENSURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[][]ModuleA.StructA")) )->getComponentType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 50"); - OSL_ENSURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]com.sun.star.uno.XInterface")) ) == xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aInterfaceSeq")))->getType(), "test_RegCoreReflection(): error 51"); + OSL_ENSURE(xRefl->forName( OUString("[]ModuleA.StructA") )->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 48"); + OSL_ENSURE(xRefl->forName( OUString("[]ModuleA.StructA") )->getComponentType().is(), "test_RegCoreReflection(): error 49"); + OSL_ENSURE(xRefl->forName( OUString("[][]ModuleA.StructA") )->getComponentType()->getComponentType()->getName() == OUString("ModuleA.StructA"), "test_RegCoreReflection(): error 50"); + OSL_ENSURE(xRefl->forName( OUString("[]com.sun.star.uno.XInterface") ) == xRefl->forName(OUString( "ModuleA.StructC" ))->getField(OUString("aInterfaceSeq"))->getType(), "test_RegCoreReflection(): error 51"); StructC aStructC; aStructC.aLong = aConstLong; @@ -218,7 +218,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any aAny; - xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aInterfaceSeq")))->getType()->createObject(aAny); + xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aInterfaceSeq"))->getType()->createObject(aAny); OSL_ENSURE(aAny.getValueType() == ::getCppuType( (const Sequence<Reference< XInterface > > *)0 ), "test_RegCoreReflection(): error 51a"); @@ -227,35 +227,35 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) sal_Int32 nLong = aConstLong * 2; aAny.setValue( &nLong, ::getCppuType( (const sal_Int32 *)0 ) ); - OSL_ENSURE(*(sal_Int32*)xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get( + OSL_ENSURE(*(sal_Int32*)xRefl->forName(OUString( "ModuleA.StructA" ))->getField(OUString( "aLong" ))->get( Any(&aStructC, ::getCppuType( (const StructC *)0 ))).getValue() == aConstLong, "test_RegCoreReflection(): error 52"); - OSL_ENSURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->getAccessMode() == FieldAccessMode_READWRITE, "test_RegCoreReflection(): error 52a"); - Reference< XIdlField2 > rField ( xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") )) , UNO_QUERY ); + OSL_ENSURE(xRefl->forName(OUString("ModuleA.StructA"))->getField(OUString( "aLong" ))->getAccessMode() == FieldAccessMode_READWRITE, "test_RegCoreReflection(): error 52a"); + Reference< XIdlField2 > rField ( xRefl->forName(OUString( "ModuleA.StructC" ))->getField(OUString( "aLong" )) , UNO_QUERY ); rField->set(aStructAny, aAny); - OSL_ENSURE(*(sal_Int32*)xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructB")))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get(aStructAny).getValue() == *(sal_Int32*)aAny.getValue(), "test_RegCoreReflection(): error 53"); + OSL_ENSURE(*(sal_Int32*)xRefl->forName(OUString("ModuleA.StructB"))->getField(OUString( "aLong" ))->get(aStructAny).getValue() == *(sal_Int32*)aAny.getValue(), "test_RegCoreReflection(): error 53"); - xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->createObject(aAny); + xRefl->forName( OUString("[]ModuleA.StructA") )->createObject(aAny); OSL_ENSURE( aAny.getValueTypeName() == "[]ModuleA.StructA", "test_RegCoreReflection(): error 54" ); - xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][]ModuleA.StructA")))->createObject(aAny); + xRefl->forName(OUString("[][]ModuleA.StructA"))->createObject(aAny); OSL_ENSURE( aAny.getValueTypeName() == "[][]ModuleA.StructA", "test_RegCoreReflection(): error 56" ); -// xClass = xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.XIntroTest") )); +// xClass = xRefl->forName(OUString( "com.sun.star.beans.XIntroTest" )); // OSL_ENSURE(xClass.is(), "test_RegCoreReflection(): error 58"); -// OSL_ENSURE(xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59"); -// OSL_ENSURE(xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("string")), "test_RegCoreReflection(): error 60"); +// OSL_ENSURE(xClass->getMethod(OUString("getStrings"))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59"); +// OSL_ENSURE(xClass->getMethod(OUString("getStrings"))->getReturnType()->getComponentType()->getName() == OUString("string"), "test_RegCoreReflection(): error 60"); -// xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->createObject(aAny); +// xClass->getMethod(OUString("getStrings"))->getReturnType()->createObject(aAny); // OSL_ENSURE( aAny.getValueTypeName() == "[]string", "test_RegCoreReflection(): error 61" ); - OSL_ENSURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][][]unsigned long")))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62"); + OSL_ENSURE(xRefl->forName(OUString("[][][]unsigned long"))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62"); try { fprintf( stderr, "%1\n" ); - Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->get(Any()); + Any bla = xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aString"))->get(Any()); OSL_ENSURE(sal_False, "test_RegCoreReflection(): error 63"); return sal_False; } @@ -269,9 +269,9 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any blup; blup <<= aStructC; Any gulp; - rField = Reference< XIdlField2 > ( xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString"))) , UNO_QUERY); + rField = Reference< XIdlField2 > ( xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aString")) , UNO_QUERY); rField->set( blup, gulp); -// xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp); +// xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aString"))->set(blup, gulp); OSL_ENSURE(sal_False, "test_RegCoreReflection(): error 64"); return sal_False; } @@ -287,8 +287,8 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any blup; blup <<= aStructC; rField = Reference< XIdlField2 > ( - xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString"))) , UNO_QUERY); - xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp); + xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aString")) , UNO_QUERY); + xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aString"))->set(blup, gulp); OSL_ENSURE(sal_False, "test_RegCoreReflection(): error 65"); return sal_False; } @@ -297,10 +297,10 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) } Any gulp; - gulp <<= OUString(OUString(RTL_CONSTASCII_USTRINGPARAM("Test"))); + gulp <<= OUString(OUString("Test")); Any blup; blup <<= aStructC; - xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp); + xRefl->forName(OUString("ModuleA.StructC"))->getField(OUString("aString"))->set(blup, gulp); Reference< XInterfaceA > xAI = new OInterfaceA(); @@ -311,7 +311,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any a; a <<= xAI; - Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params); + Any bla = xRefl->forName(OUString("ModuleC.XInterfaceA"))->getMethod(OUString("methodC"))->invoke(a, params); OSL_ENSURE(sal_False, "test_RegCoreReflection(): error 66"); return sal_False; } @@ -329,7 +329,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any a; a <<= xAI; - Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params); + Any bla = xRefl->forName(OUString("ModuleC.XInterfaceA"))->getMethod(OUString("methodC"))->invoke(a, params); } try { @@ -340,7 +340,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any a; a <<= xAI; - Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params); + Any bla = xRefl->forName(OUString("ModuleC.XInterfaceA"))->getMethod(OUString("methodC"))->invoke(a, params); OSL_ENSURE(sal_False, "test_RegCoreReflection(): error 67"); return sal_False; } @@ -355,7 +355,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any a; a <<= xAI; - bool result = (xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params).getValueType() + bool result = (xRefl->forName(OUString("ModuleC.XInterfaceA"))->getMethod(OUString("methodC"))->invoke(a, params).getValueType() == ::getCppuType( (const Sequence<StructB> *)0 )); (void)result; OSL_ENSURE(result, "test_RegCoreReflection(): error 68"); @@ -367,25 +367,22 @@ SAL_IMPLEMENT_MAIN() sal_Bool bSucc = sal_False; try { - OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( - "reflection.uno" SAL_DLLEXTENSION) ); + OUString aLibName( "reflection.uno" SAL_DLLEXTENSION ); Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( - OUString( RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb") ) ) ); + OUString( "stoctest.rdb" ) ) ); Reference< XComponentContext > xContext; Reference< beans::XPropertySet > xProps( xMgr, UNO_QUERY ); OSL_ASSERT( xProps.is() ); xProps->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= + OUString( "DefaultContext" ) ) >>= xContext; OSL_ASSERT( xContext.is() ); Reference< XIdlReflection > xRefl; xContext->getValueByName( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/singletons/com.sun.star.reflection.theCoreReflection")) ) + OUString( "/singletons/com.sun.star.reflection.theCoreReflection") ) >>= xRefl; OSL_ENSURE( xRefl.is(), "### CoreReflection singleton not accessable!?" ); diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx index 424b16d4c3c3..276c2b5bdfd5 100644 --- a/stoc/test/testsmgr.cxx +++ b/stoc/test/testsmgr.cxx @@ -72,7 +72,7 @@ void setStarUserRegistry() RegistryKey rootKey, rKey, rKey2; OUString userReg = getExePath(); - userReg += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb")); + userReg += OUString("user.rdb"); if(myRegistry->open(userReg, REG_READWRITE)) { OSL_VERIFY(!myRegistry->create(userReg)); |