diff options
| author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-10 18:31:39 +0100 |
|---|---|---|
| committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-10 18:31:39 +0100 |
| commit | 3a18c3d97abfb60a09cc6a8bd5dd163fe2cfafa3 (patch) | |
| tree | 02ef980b5d6440ebbacf6f8801bea9d27f62b7a5 | |
| parent | 377a56fb1b9825ec5dc71ba9ae81b6e27cfabffb (diff) | |
RTL_CONSTASCII_USTRINGPARAM in ure 1
66 files changed, 1216 insertions, 1216 deletions
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 6b1f5c59e556..d865288d6de3 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -122,7 +122,7 @@ void ODataStreamTest::testInvariant( throw ( IllegalArgumentException, RuntimeException) { - if( OUString::createFromAscii("com.sun.star.io.DataInputStream") == TestName ) { + if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ) { Reference < XConnectable > connect( TestObject , UNO_QUERY ); Reference < XActiveDataSink > active( TestObject , UNO_QUERY ); Reference < XInputStream > input( TestObject , UNO_QUERY ); @@ -135,7 +135,7 @@ void ODataStreamTest::testInvariant( } - else if( OUString::createFromAscii("com.sun.star.io.DataInputStream") == TestName ) { + else if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ) { Reference < XConnectable > connect( TestObject , UNO_QUERY ); Reference < XActiveDataSource > active( TestObject , UNO_QUERY ); Reference < XOutputStream > output( TestObject , UNO_QUERY ); @@ -153,7 +153,7 @@ void ODataStreamTest::testInvariant( if( info.is() ) { ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" ); - ERROR_ASSERT( ! info->supportsService( OUString::createFromAscii("bla bluzb") ) , "XServiceInfo test failed" ); + ERROR_ASSERT( ! info->supportsService( OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" ); } } @@ -166,8 +166,8 @@ sal_Int32 ODataStreamTest::test( throw ( IllegalArgumentException, RuntimeException) { - if( OUString::createFromAscii("com.sun.star.io.DataInputStream") == TestName || - OUString::createFromAscii("com.sun.star.io.DataOutputStream") == TestName ) { + if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName || + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) == TestName ) { try { @@ -292,8 +292,8 @@ void ODataStreamTest::testSimple( const Reference < XDataInputStream > &rInput rOutput->writeHyper( 0x123456789abcdefLL ); ERROR_ASSERT( rInput->readHyper() == 0x123456789abcdefLL , "int64 read/write mismatch" ); - rOutput->writeUTF( OUString::createFromAscii("Live long and prosper !") ); - ERROR_ASSERT( rInput->readUTF() == OUString::createFromAscii("Live long and prosper !") , + rOutput->writeUTF( OUString(RTL_CONSTASCII_USTRINGPARAM("Live long and prosper !")) ); + ERROR_ASSERT( rInput->readUTF() == OUString(RTL_CONSTASCII_USTRINGPARAM("Live long and prosper !")) , "UTF read/write mismatch" ); Sequence<sal_Unicode> wc(0x10001); @@ -706,7 +706,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName, if( info.is() ) { ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" ); - ERROR_ASSERT( ! info->supportsService( OUString::createFromAscii("bla bluzb") ) , "XServiceInfo test failed" ); + ERROR_ASSERT( ! info->supportsService( OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" ); } } @@ -824,8 +824,8 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp { sal_Bool b = sal_True; - if( r1->getPropertyValue( OUString::createFromAscii("long") ).getValueType() == getCppuVoidType() || - r2->getPropertyValue( OUString::createFromAscii("long") ).getValueType() == getCppuVoidType() ) { + if( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ).getValueType() == getCppuVoidType() || + r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ).getValueType() == getCppuVoidType() ) { // one of the objects is not the correct propertyset ! fprintf( stderr, "compareMyPropertySet: 1\n" ); @@ -993,8 +993,8 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > ERROR_ASSERT( compareMyPropertySet( rProp , rPropRead ) , "objects has not been read properly !" ); // destroy selfreferences - rProp->setPropertyValue( OUString::createFromAscii("object"), Any() ); - rPropRead->setPropertyValue( OUString::createFromAscii("object"), Any() ); + rProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")), Any() ); + rPropRead->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")), Any() ); } { @@ -1005,7 +1005,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > // buffering and marks work correctly for( int i = 0 ; i < 2000 ; i ++ ) { - Reference < XInterface > x = m_rFactory->createInstance(OUString::createFromAscii("test.com.sun.star.io.PersistTest")); + Reference < XInterface > x = m_rFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest"))); Reference< XPersistObject > persistRef( x , UNO_QUERY ); Reference < XPropertySet > rProp( persistRef , UNO_QUERY ); @@ -1040,13 +1040,13 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > any <<= str; rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("string")) , any ); - x = m_rFactory->createInstance(OUString::createFromAscii("test.com.sun.star.io.PersistTest")); + x = m_rFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest"))); Reference <XPersistObject > persist2ndRef( x , UNO_QUERY ); // Note : persist2ndRef contains coincident values, but also coincident values must be // saved properly ! any <<= persist2ndRef; - rProp->setPropertyValue( OUString::createFromAscii("object") , any ); + rProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) , any ); // simply test, if markable operations and object operations do not interfere sal_Int32 nMark = markableOut->createMark(); diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index ecd3ad30366b..dca626a797ba 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -142,7 +142,7 @@ sal_Int32 OMarkableOutputStreamTest::test( } else { - Reference < XInterface > x = m_rFactory->createInstance( OUString::createFromAscii("com.sun.star.io.Pipe")); + Reference < XInterface > x = m_rFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))); Reference< XOutputStream > rPipeOutput( x , UNO_QUERY ); Reference < XInputStream > rPipeInput( x , UNO_QUERY ); @@ -509,7 +509,7 @@ sal_Int32 OMarkableInputStreamTest::test( testInvariant( TestName , TestObject ); } else { - Reference < XInterface > x = m_rFactory->createInstance( OUString::createFromAscii("com.sun.star.io.Pipe")); + Reference < XInterface > x = m_rFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))); Reference< XOutputStream > rPipeOutput( x , UNO_QUERY ); Reference < XInputStream > rPipeInput( x , UNO_QUERY ); diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index e8723375cc26..012df7bec5b2 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -323,7 +323,7 @@ private: Reference< XOutputStream > createPipe() { Reference< XOutputStream > rOut( m_rSmgr->createInstance( - OUString::createFromAscii( "com.sun.star.io.Pipe" )),UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))),UNO_QUERY); return rOut; } }; @@ -415,9 +415,9 @@ void OPumpTest::testWrongUsage( const Reference< XInterface > &r ) Reference< XActiveDataControl > rControl( r, UNO_QUERY ); Reference< XInputStream > rIn( m_rSmgr->createInstance( - OUString::createFromAscii( "com.sun.star.io.DataInputStream" )),UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream"))),UNO_QUERY); Reference< XOutputStream > rOut( m_rSmgr->createInstance( - OUString::createFromAscii( "com.sun.star.io.DataOutputStream" )),UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream"))),UNO_QUERY); rSink->setInputStream( rIn ); rSource->setOutputStream( rOut ); diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index 419fdf7021ab..b111e4df66b6 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -73,7 +73,7 @@ int main (int argc, char **argv) { // Create registration service Reference < XInterface > x = xSMgr->createInstance( - OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ); xReg = Reference< XImplementationRegistration > ( x , UNO_QUERY ); } catch( Exception & ) { @@ -90,7 +90,7 @@ int main (int argc, char **argv) for( int n = 2 ; n <argc ; n ++ ) { OUString aDllName = OStringToOUString( argv[n] , RTL_TEXTENCODING_ASCII_US ); xReg->registerImplementation( - OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aDllName, xSimpleReg ); } @@ -111,13 +111,13 @@ int main (int argc, char **argv) #if defined(SAL_W32) || defined(SAL_OS2) OUString aDllName = OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US ); #else - OUString aDllName = OUString::createFromAscii("lib"); + OUString aDllName(RTL_CONSTASCII_USTRINGPARAM("lib")); aDllName += OStringToOUString( sTestName , RTL_TEXTENCODING_ASCII_US ); - aDllName += OUString::createFromAscii(".so"); + aDllName += OUString(RTL_CONSTASCII_USTRINGPARAM(".so")); #endif xReg->registerImplementation( - OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ) , + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")) , aDllName, xSimpleReg ); } diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index 2afdd2915525..6b03859a4389 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -189,43 +189,43 @@ int __cdecl main( int argc, char * argv[] ) createRegistryServiceFactory( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")) ) ); Reference< XImplementationRegistration > xImplReg( - xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY ); + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); OUString aLibName = OUString::createFromAscii( "connector.uno" SAL_DLLEXTENSION ); xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aLibName, Reference< XSimpleRegistry >() ); aLibName = OUString::createFromAscii( "acceptor.uno" SAL_DLLEXTENSION ); xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aLibName, Reference< XSimpleRegistry >() ); Reference < XAcceptor > rAcceptor( xMgr->createInstance( - OUString::createFromAscii("com.sun.star.connection.Acceptor" ) ) , UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")) ) , UNO_QUERY ); Reference < XAcceptor > rAcceptorPipe( xMgr->createInstance( - OUString::createFromAscii("com.sun.star.connection.Acceptor" ) ) , UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")) ) , UNO_QUERY ); Reference < XConnector > rConnector( - xMgr->createInstance( OUString::createFromAscii("com.sun.star.connection.Connector") ) , UNO_QUERY ); + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Connector")) ) , UNO_QUERY ); printf( "Testing sockets" ); fflush( stdout ); - testConnection( OUString::createFromAscii("socket,host=localhost,port=2001"), rAcceptor , rConnector ); + testConnection( OUString(RTL_CONSTASCII_USTRINGPARAM("socket,host=localhost,port=2001")), rAcceptor , rConnector ); printf( " Done\n" ); printf( "Testing pipe" ); fflush( stdout ); - testConnection( OUString::createFromAscii("pipe,name=bla") , rAcceptorPipe , rConnector ); + testConnection( OUString(RTL_CONSTASCII_USTRINGPARAM("pipe,name=bla")) , rAcceptorPipe , rConnector ); printf( " Done\n" ); // check, if errornous strings make any problem rAcceptor = Reference< XAcceptor > ( - xMgr->createInstance( OUString::createFromAscii( "com.sun.star.connection.Acceptor" ) ), + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor")) ), UNO_QUERY ); try @@ -257,14 +257,14 @@ int __cdecl main( int argc, char * argv[] ) } - MyThread thread( rAcceptor , OUString::createFromAscii("socket,host=localhost,port=2001") ); + MyThread thread( rAcceptor , OUString(RTL_CONSTASCII_USTRINGPARAM("socket,host=localhost,port=2001")) ); thread.create(); TimeValue value = {0,1}; osl_waitThread( &value ); try { - rAcceptor->accept( OUString::createFromAscii("socket,host=localhost,port=2001") ); + rAcceptor->accept( OUString(RTL_CONSTASCII_USTRINGPARAM("socket,host=localhost,port=2001")) ); OSL_ENSURE( 0 , "already existing exception expected" ); } catch( AlreadyAcceptingException & e) diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx index 6e4f31419eba..8997b247189c 100644 --- a/registry/test/testmerge.cxx +++ b/registry/test/testmerge.cxx @@ -49,7 +49,7 @@ sal_Int32 lValue2 = 54321; sal_Int32 lValue3 = 111333111; sal_Int32 lValue4 = 333111333; sal_Char* sValue = (sal_Char*)"string Value"; -OUString wValue = rtl::OUString::createFromAscii( "unicode Value" ); +OUString wValue(RTL_CONSTASCII_USTRINGPARAM("unicode Value")); void test_generateMerge1() @@ -58,21 +58,21 @@ void test_generateMerge1() RegistryKey rootKey, key1, key2, key3, key4, key5, key6, key7, key8, key9; - REG_ENSURE(!myRegistry->create(OUString::createFromAscii("merge1.rdb")), "testGenerateMerge1 error 1"); + REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb"))), "testGenerateMerge1 error 1"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "testGenerateMerge1 error 2"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("MergeKey1"), key1), "testGenerateMerge1 error 3"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey1"), key2), "testGenerateMerge1 error 4"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey1/KeyWithLongValue"), key3), "testGenerateMerge1 error 5"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1")), key1), "testGenerateMerge1 error 3"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1")), key2), "testGenerateMerge1 error 4"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), key3), "testGenerateMerge1 error 5"); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_LONG, &lValue1, sizeof(sal_Int32)), "testGenerateMerge1 error 5a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey2"), key4), "testGenerateMerge1 error 6"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey2/KeyWithStringValue"), key5), "testGenerateMerge1 error 7"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2")), key4), "testGenerateMerge1 error 6"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), key5), "testGenerateMerge1 error 7"); REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 7a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey3"), key6), "testGenerateMerge1 error 8"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), key7), "testGenerateMerge1 error 9"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3")), key6), "testGenerateMerge1 error 8"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), key7), "testGenerateMerge1 error 9"); REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 9a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey4"), key8), "testGenerateMerge1 error 10"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), key9), "testGenerateMerge1 error 11"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4")), key8), "testGenerateMerge1 error 10"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), key9), "testGenerateMerge1 error 11"); REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"abcdefghijklmnopqrstuvwxyz", 27), "testGenerateMerge1 error 11a"); @@ -86,18 +86,18 @@ void test_generateMerge1() !key8.closeKey() && !key9.closeKey(), "testGenerateMerge1 error 12"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("MergeKey1u2"), key1), "testGenerateMerge1 error 13"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11"), key2), "testGenerateMerge1 error 14"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), key3), "testGenerateMerge1 error 15"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), key1), "testGenerateMerge1 error 13"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11")), key2), "testGenerateMerge1 error 14"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), key3), "testGenerateMerge1 error 15"); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_LONG, &lValue2, sizeof(sal_Int32)), "testGenerateMerge1 error 15a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12"), key4), "testGenerateMerge1 error 16"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), key5), "testGenerateMerge1 error 17"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12")), key4), "testGenerateMerge1 error 16"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), key5), "testGenerateMerge1 error 17"); REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 17a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13"), key6), "testGenerateMerge1 error 18"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), key7), "testGenerateMerge1 error 19"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13")), key6), "testGenerateMerge1 error 18"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), key7), "testGenerateMerge1 error 19"); REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 19a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2"), key8), "testGenerateMerge1 error 20"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), key9), "testGenerateMerge1 error 21"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), key8), "testGenerateMerge1 error 20"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), key9), "testGenerateMerge1 error 21"); REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue3, sizeof(sal_Int32)), "testGenerateMerge1 error 21a"); REG_ENSURE(!rootKey.closeKey() && @@ -124,21 +124,21 @@ void test_generateMerge2() RegistryKey rootKey, key1, key2, key3, key4, key5, key6, key7, key8, key9; - REG_ENSURE(!myRegistry->create(OUString::createFromAscii("merge2.rdb")), "testGenerateMerge2 error 1"); + REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb"))), "testGenerateMerge2 error 1"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "testGenerateMerge2 error 2"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("MergeKey2"), key1), "testGenerateMerge2 error 3"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey1"), key2), "testGenerateMerge2 error 4"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), key3), "testGenerateMerge2 error 5"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey2")), key1), "testGenerateMerge2 error 3"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1")), key2), "testGenerateMerge2 error 4"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), key3), "testGenerateMerge2 error 5"); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"1234567890", 11), "testGenerateMerge1 error 5a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey2"), key4), "testGenerateMerge2 error 6"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), key5), "testGenerateMerge2 error 7"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2")), key4), "testGenerateMerge2 error 6"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), key5), "testGenerateMerge2 error 7"); REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue.getStr(), ((wValue.getLength()+1)*sizeof(sal_Unicode))), "testGenerateMerge1 error 7a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey3"), key6), "testGenerateMerge2 error 8"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey3/KeyWithStringValue"), key7), "testGenerateMerge2 error 9"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3")), key6), "testGenerateMerge2 error 8"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), key7), "testGenerateMerge2 error 9"); REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 9a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey4"), key8), "testGenerateMerge2 error 10"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey2/MK2SubKey4/KeyWithLongValue"), key9), "testGenerateMerge2 error 11"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4")), key8), "testGenerateMerge2 error 10"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), key9), "testGenerateMerge2 error 11"); REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue1, sizeof(sal_Int32)), "testGenerateMerge1 error 11a"); REG_ENSURE(!key1.closeKey() && @@ -151,18 +151,18 @@ void test_generateMerge2() !key8.closeKey() && !key9.closeKey(), "testGenerateMerge2 error 12"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("MergeKey1u2"), key1), "testGenerateMerge2 error 13"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21"), key2), "testGenerateMerge2 error 14"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), key3), "testGenerateMerge2 error 15"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), key1), "testGenerateMerge2 error 13"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21")), key2), "testGenerateMerge2 error 14"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), key3), "testGenerateMerge2 error 15"); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)"a1b2c3d4e5f6g7h8i9", 19), "testGenerateMerge1 error 15a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22"), key4), "testGenerateMerge2 error 16"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), key5), "testGenerateMerge2 error 17"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22")), key4), "testGenerateMerge2 error 16"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), key5), "testGenerateMerge2 error 17"); REG_ENSURE(!key5.setValue(OUString(), RG_VALUETYPE_LONG, &lValue2, sizeof(sal_Int32)), "testGenerateMerge1 error 17a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23"), key6), "testGenerateMerge2 error 18"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), key7), "testGenerateMerge2 error 19"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23")), key6), "testGenerateMerge2 error 18"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), key7), "testGenerateMerge2 error 19"); REG_ENSURE(!key7.setValue(OUString(), RG_VALUETYPE_STRING, sValue, strlen(sValue)+1), "testGenerateMerge1 error 19a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2"), key8), "testGenerateMerge2 error 20"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), key9), "testGenerateMerge2 error 21"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), key8), "testGenerateMerge2 error 20"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), key9), "testGenerateMerge2 error 21"); REG_ENSURE(!key9.setValue(OUString(), RG_VALUETYPE_LONG, &lValue4, sizeof(sal_Int32)), "testGenerateMerge1 error 21a"); REG_ENSURE(!rootKey.closeKey() && @@ -189,112 +189,112 @@ void test_merge() RegistryKey rootKey, key1, mkey1, key2, mkey2, key1u2, mkey1u2; - REG_ENSURE(!myRegistry->create(OUString::createFromAscii("mergetest.rdb")), "testMerge error 1"); - REG_ENSURE(myRegistry->getName().equals(OUString::createFromAscii("mergetest.rdb")), "testMerge error 1.a)"); + REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("mergetest.rdb"))), "testMerge error 1"); + REG_ENSURE(myRegistry->getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("mergetest.rdb"))), "testMerge error 1.a)"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "testMerge error 2"); - REG_ENSURE(!myRegistry->loadKey(rootKey, OUString::createFromAscii("/stardiv/IchbineinMergeKey"), - OUString::createFromAscii("merge1.rdb")), "testMerge error 3"); - REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("/stardiv/IchbineinMergeKey"), - OUString::createFromAscii("merge2.rdb")), "testMerge error 4"); + REG_ENSURE(!myRegistry->loadKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), + OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb"))), "testMerge error 3"); + REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), + OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb"))), "testMerge error 4"); /////////////////////////////////////////////////////////////////////////// - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/stardiv/IchbineinMergeKey"), key1), "testMerge error 5"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1), "testMerge error 5"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("MergeKey1"), mkey1), "testMerge error 6"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1")), mkey1), "testMerge error 6"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 7"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey1"), mkey1), "testMerge error 8"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1")), mkey1), "testMerge error 8"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 9"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey1/KeyWithLongValue"), mkey1), "testMerge error 10"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), mkey1), "testMerge error 10"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 11"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey2"), mkey1), "testMerge error 12"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2")), mkey1), "testMerge error 12"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 13"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey2/KeyWithStringValue"), mkey1), "testMerge error 14"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), mkey1), "testMerge error 14"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 15"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey3"), mkey1), "testMerge error 16"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3")), mkey1), "testMerge error 16"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 17"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), mkey1), "testMerge error 18"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), mkey1), "testMerge error 18"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 19"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey4"), mkey1), "testMerge error 20"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4")), mkey1), "testMerge error 20"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 21"); - REG_ENSURE(!key1.openKey(OUString::createFromAscii("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), mkey1), "testMerge error 22"); + REG_ENSURE(!key1.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), mkey1), "testMerge error 22"); REG_ENSURE(!mkey1.closeKey(), "testMerge error 23"); REG_ENSURE(!key1.closeKey(), "testMerge error 24"); /////////////////////////////////////////////////////////////////////////// - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/stardiv/IchbineinMergeKey"), key2), "testMerge error 25"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key2), "testMerge error 25"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("MergeKey2"), mkey2), "testMerge error 26"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey2")), mkey2), "testMerge error 26"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 27"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey1"), mkey2), "testMerge error 28"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1")), mkey2), "testMerge error 28"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 29"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), mkey2), "testMerge error 30"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), mkey2), "testMerge error 30"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 31"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey2"), mkey2), "testMerge error 31"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2")), mkey2), "testMerge error 31"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 33"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), mkey2), "testMerge error 34"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), mkey2), "testMerge error 34"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 35"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey3"), mkey2), "testMerge error 36"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3")), mkey2), "testMerge error 36"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 37"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey3/KeyWithStringValue"), mkey2), "testMerge error 38"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), mkey2), "testMerge error 38"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 39"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey4"), mkey2), "testMerge error 40"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4")), mkey2), "testMerge error 40"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 41"); - REG_ENSURE(!key2.openKey(OUString::createFromAscii("/MergeKey2/MK2SubKey4/KeyWithLongValue"), mkey2), "testMerge error 42"); + REG_ENSURE(!key2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), mkey2), "testMerge error 42"); REG_ENSURE(!mkey2.closeKey(), "testMerge error 43"); REG_ENSURE(!key2.closeKey(), "testMerge error 44"); /////////////////////////////////////////////////////////////////////////// - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/stardiv/IchbineinMergeKey"), key1u2), "testMerge error 40"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1u2), "testMerge error 40"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("MergeKey1u2"), mkey1u2), "testMerge error 41"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("MergeKey1u2")), mkey1u2), "testMerge error 41"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 42"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11"), mkey1u2), "testMerge error 43"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11")), mkey1u2), "testMerge error 43"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 44"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), mkey1u2), "testMerge error 45"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), mkey1u2), "testMerge error 45"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 46"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12"), mkey1u2), "testMerge error 47"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12")), mkey1u2), "testMerge error 47"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 48"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), mkey1u2), "testMerge error 49"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), mkey1u2), "testMerge error 49"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 50"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13"), mkey1u2), "testMerge error 51"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13")), mkey1u2), "testMerge error 51"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 52"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), mkey1u2), "testMerge error 53"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), mkey1u2), "testMerge error 53"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 54"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21"), mkey1u2), "testMerge error 55"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21")), mkey1u2), "testMerge error 55"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 56"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), mkey1u2), "testMerge error 57"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), mkey1u2), "testMerge error 57"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 58"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22"), mkey1u2), "testMerge error 59"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22")), mkey1u2), "testMerge error 59"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 60"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), mkey1u2), "testMerge error 61"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), mkey1u2), "testMerge error 61"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 62"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23"), mkey1u2), "testMerge error 63"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23")), mkey1u2), "testMerge error 63"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 64"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), mkey1u2), "testMerge error 65"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), mkey1u2), "testMerge error 65"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 66"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2"), mkey1u2), "testMerge error 67"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2")), mkey1u2), "testMerge error 67"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 68"); - REG_ENSURE(!key1u2.openKey(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), mkey1u2), "testMerge error 69"); + REG_ENSURE(!key1u2.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), mkey1u2), "testMerge error 69"); REG_ENSURE(!mkey1u2.closeKey(), "testMerge error 70"); REG_ENSURE(!key1u2.closeKey(), "testMerge error 71"); @@ -306,101 +306,101 @@ void test_merge() sal_Int32 int32Value; sal_uInt8 *Value; - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/stardiv/IchbineinMergeKey"), key1), "testMerge error 72"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv/IchbineinMergeKey")), key1), "testMerge error 72"); - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1/MK1SubKey1/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 73"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 73"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 74"); - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1/MK1SubKey1/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 74.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey1/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 74.a)"); REG_ENSURE(int32Value == lValue1, "testMerge error 74.b)"); - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1/MK1SubKey2/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 75"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 75"); REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 76"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1/MK1SubKey2/KeyWithStringValue"), (RegValue)Value), "testMerge error 76.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey2/KeyWithStringValue")), (RegValue)Value), "testMerge error 76.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 76.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 77"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 77"); REG_ENSURE(valueType == RG_VALUETYPE_UNICODE && valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 78"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 78.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey3/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 78.a)"); REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 78.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 79"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 79"); REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 27, "testMerge error 80"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1/MK1SubKey4/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 80.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1/MK1SubKey4/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 80.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, "abcdefghijklmnopqrstuvwxyz") == 0, "testMerge error 80.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 81"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 81"); REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 11, "testMerge error 82"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey2/MK2SubKey1/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 82.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey1/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 82.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, "1234567890") == 0, "testMerge error 82.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 83"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 83"); REG_ENSURE(valueType == RG_VALUETYPE_UNICODE&& valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 84"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 84.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey2/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 84.a)"); REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 84.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey2/MK2SubKey3/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 85"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 85"); REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 86"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey2/MK2SubKey3/KeyWithStringValue"), (RegValue)Value), "testMerge error 86.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey3/KeyWithStringValue")), (RegValue)Value), "testMerge error 86.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 86.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey2/MK2SubKey4/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 87"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 87"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 88"); - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey2/MK2SubKey4/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 88.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey2/MK2SubKey4/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 88.a)"); REG_ENSURE(int32Value == lValue1, "testMerge error 88.b)"); - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 89"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 89"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 90"); - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK1SubKey11/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 90.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey11/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 90.a)"); REG_ENSURE(int32Value == lValue2, "testMerge error 90.b)"); - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 91"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 91"); REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 92"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK1SubKey12/KeyWithStringValue"), (RegValue)Value), "testMerge error 92.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey12/KeyWithStringValue")), (RegValue)Value), "testMerge error 92.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 92.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), &valueType, &valueSize), "testMerge error 93"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), &valueType, &valueSize), "testMerge error 93"); REG_ENSURE(valueType == RG_VALUETYPE_UNICODE && valueSize == (wValue.getLength()+1)*sizeof(sal_Unicode), "testMerge error 94"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue"), (RegValue)Value), "testMerge error 94.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK1SubKey13/KeyWithUnicodeValue")), (RegValue)Value), "testMerge error 94.a)"); REG_ENSURE(wValue.equals( (const sal_Unicode*)Value ), "testMerge error 94.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), &valueType, &valueSize), "testMerge error 95"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), &valueType, &valueSize), "testMerge error 95"); REG_ENSURE(valueType == RG_VALUETYPE_BINARY && valueSize == 19, "testMerge error 96"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue"), (RegValue)Value), "testMerge error 96.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey21/KeyWithBinaryValue")), (RegValue)Value), "testMerge error 96.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, "a1b2c3d4e5f6g7h8i9") == 0, "testMerge error 96.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 97"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 97"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 98"); - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK2SubKey22/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 98.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey22/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 98.a)"); REG_ENSURE(int32Value == lValue2, "testMerge error 98.b)"); - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), &valueType, &valueSize), "testMerge error 99"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), &valueType, &valueSize), "testMerge error 99"); REG_ENSURE(valueType == RG_VALUETYPE_STRING && valueSize == strlen(sValue)+1, "testMerge error 100"); Value = new sal_uInt8[valueSize]; - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK2SubKey23/KeyWithStringValue"), (RegValue)Value), "testMerge error 100.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK2SubKey23/KeyWithStringValue")), (RegValue)Value), "testMerge error 100.a)"); REG_ENSURE(strcmp((const sal_Char*)Value, sValue) == 0, "testMerge error 100.b)"); delete [] Value; - REG_ENSURE(!key1.getValueInfo(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), &valueType, &valueSize), "testMerge error 101"); + REG_ENSURE(!key1.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), &valueType, &valueSize), "testMerge error 101"); REG_ENSURE(valueType == RG_VALUETYPE_LONG && valueSize == sizeof(sal_Int32), "testMerge error 102"); - REG_ENSURE(!key1.getValue(OUString::createFromAscii("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue"), (RegValue)&int32Value), "testMerge error 102.a)"); + REG_ENSURE(!key1.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("/MergeKey1u2/MK12SubKey1u2/KeyWithLongValue")), (RegValue)&int32Value), "testMerge error 102.a)"); REG_ENSURE(int32Value == lValue4, "testMerge error 102.b)"); @@ -410,8 +410,8 @@ void test_merge() REG_ENSURE(!rootKey.closeKey(), "testMerge error 10"); - REG_ENSURE(!myRegistry->destroy( OUString::createFromAscii("merge1.rdb") ), "test_registry_CppApi error 11"); - REG_ENSURE(!myRegistry->destroy( OUString::createFromAscii("merge2.rdb") ), "test_registry_CppApi error 12"); + REG_ENSURE(!myRegistry->destroy( OUString(RTL_CONSTASCII_USTRINGPARAM("merge1.rdb")) ), "test_registry_CppApi error 11"); + REG_ENSURE(!myRegistry->destroy( OUString(RTL_CONSTASCII_USTRINGPARAM("merge2.rdb")) ), "test_registry_CppApi error 12"); REG_ENSURE(!myRegistry->destroy( OUString() ), "test_registry_CppApi error 13"); delete myRegistry; diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx index ef3f2e37ee03..283eb4b253e5 100644 --- a/registry/test/testregcpp.cxx +++ b/registry/test/testregcpp.cxx @@ -49,95 +49,95 @@ void test_coreReflection() RegistryKey rootKey, key1, key2, key3, key4 ,key5, key6, key7, key8; - REG_ENSURE(!myRegistry->create(OUString::createFromAscii("ucrtest.rdb")), "testCoreReflection error 1"); + REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb"))), "testCoreReflection error 1"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "testCoreReflection error 2"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("UCR"), key1), "testCoreReflection error 3"); - REG_ENSURE(!key1.createKey(OUString::createFromAscii("ModuleA"), key2), "testCoreReflection error 4"); - REG_ENSURE(!key2.createKey(OUString::createFromAscii("StructA"), key3), "testCoreReflection error 5"); - REG_ENSURE(!key2.createKey(OUString::createFromAscii("EnumA"), key4), "testCoreReflection error 6"); - REG_ENSURE(!key2.createKey(OUString::createFromAscii("XInterfaceA"), key5), "testCoreReflection error 7"); - REG_ENSURE(!key2.createKey(OUString::createFromAscii("ExceptionA"), key6), "testCoreReflection error 8"); - REG_ENSURE(!key2.createKey(OUString::createFromAscii("ServiceA"), key7), "testCoreReflection error 8a"); - REG_ENSURE(!key2.createKey(OUString::createFromAscii("ConstantsA"), key8), "testCoreReflection error 8b"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("UCR")), key1), "testCoreReflection error 3"); + REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA")), key2), "testCoreReflection error 4"); + REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("StructA")), key3), "testCoreReflection error 5"); + REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("EnumA")), key4), "testCoreReflection error 6"); + REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("XInterfaceA")), key5), "testCoreReflection error 7"); + REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ExceptionA")), key6), "testCoreReflection error 8"); + REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceA")), key7), "testCoreReflection error 8a"); + REG_ENSURE(!key2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA")), key8), "testCoreReflection error 8b"); { RegistryTypeWriter writer(RT_TYPE_MODULE, - OUString::createFromAscii("ModuleA"), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA")), OUString(), 11, 0, 0); RTConstValue aConst; - writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Modul")); - writer.setFileName(OUString::createFromAscii("DummyFile")); + writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Modul"))); + writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); aConst.m_type = RT_TYPE_BOOL; aConst.m_value.aBool = sal_True; - writer.setFieldData(0, OUString::createFromAscii("aConstBool"), - OUString::createFromAscii("boolean"), - OUString::createFromAscii("ich bin ein boolean"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstBool")), + OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein boolean")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_BYTE; aConst.m_value.aByte = 127; - writer.setFieldData(1, OUString::createFromAscii("aConstByte"), - OUString::createFromAscii("byte"), - OUString::createFromAscii("ich bin ein byte"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstByte")), + OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein byte")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_INT16; aConst.m_value.aShort = -10; - writer.setFieldData(2, OUString::createFromAscii("aConstShort"), - OUString::createFromAscii("short"), - OUString::createFromAscii("ich bin ein short"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstShort")), + OUString(RTL_CONSTASCII_USTRINGPARAM("short")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein short")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_UINT16; aConst.m_value.aUShort = 10; - writer.setFieldData(3, OUString::createFromAscii("aConstUShort"), - OUString::createFromAscii("unsigned short"), - OUString::createFromAscii("ich bin ein unsigned short"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstUShort")), + OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned short")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_INT32; aConst.m_value.aLong = -100000; - writer.setFieldData(4, OUString::createFromAscii("aConstLong"), - OUString::createFromAscii("long"), - OUString::createFromAscii("ich bin ein long"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(4, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstLong")), + OUString(RTL_CONSTASCII_USTRINGPARAM("long")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein long")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_UINT32; aConst.m_value.aULong = 100000; - writer.setFieldData(5, OUString::createFromAscii("aConstULong"), - OUString::createFromAscii("unsigned long"), - OUString::createFromAscii("ich bin ein unsigned long"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(5, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstULong")), + OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned long")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_INT64; aConst.m_value.aHyper = -100000000; - writer.setFieldData(6, OUString::createFromAscii("aConstHyper"), - OUString::createFromAscii("hyper"), - OUString::createFromAscii("ich bin ein hyper"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(6, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstHyper")), + OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein hyper")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_UINT64; aConst.m_value.aUHyper = 100000000; - writer.setFieldData(7, OUString::createFromAscii("aConstULong"), - OUString::createFromAscii("unsigned long"), - OUString::createFromAscii("ich bin ein unsigned long"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(7, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstULong")), + OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein unsigned long")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_FLOAT; aConst.m_value.aFloat = -2e-10f; - writer.setFieldData(8, OUString::createFromAscii("aConstFloat"), - OUString::createFromAscii("float"), - OUString::createFromAscii("ich bin ein float"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(8, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstFloat")), + OUString(RTL_CONSTASCII_USTRINGPARAM("float")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein float")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_DOUBLE; - aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString::createFromAscii("aConstDouble"), - OUString::createFromAscii("double"), - OUString::createFromAscii("ich bin ein double"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstDouble")), + OUString(RTL_CONSTASCII_USTRINGPARAM("double")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein double")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_STRING; - OUString tmpStr(OUString::createFromAscii( "dies ist ein unicode string" )); + OUString tmpStr(RTL_CONSTASCII_USTRINGPARAM("dies ist ein unicode string")); aConst.m_value.aString = tmpStr.getStr(); - writer.setFieldData(10, OUString::createFromAscii("aConstString"), - OUString::createFromAscii("string"), - OUString::createFromAscii("ich bin ein string"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(10, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstString")), + OUString(RTL_CONSTASCII_USTRINGPARAM("string")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein string")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -151,7 +151,7 @@ void test_coreReflection() if (reader.isValid()) { - REG_ENSURE(reader.getTypeName().equals(OUString::createFromAscii("ModuleA")), "testCoreReflection error 9a2"); + REG_ENSURE(reader.getTypeName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA"))), "testCoreReflection error 9a2"); RTConstValue aReadConst = reader.getFieldConstValue(4); REG_ENSURE( aReadConst.m_type == RT_TYPE_INT32, "testCoreReflection error 9a3"); @@ -170,20 +170,20 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_STRUCT, - OUString::createFromAscii("ModuleA/StructA"), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")), OUString(), 3, 0, 0); - writer.setDoku(OUString::createFromAscii("Hallo ich bin eine Struktur")); - writer.setFileName(OUString::createFromAscii("DummyFile")); + writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Struktur"))); + writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); - writer.setFieldData(0, OUString::createFromAscii("asal_uInt32"), - OUString::createFromAscii("unsigned long"), + writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("asal_uInt32")), + OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")), OUString(), OUString(), RT_ACCESS_READWRITE); - writer.setFieldData(1, OUString::createFromAscii("aXInterface"), - OUString::createFromAscii("stardiv/uno/XInterface"), + writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aXInterface")), + OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")), OUString(), OUString(), RT_ACCESS_READWRITE); - writer.setFieldData(2, OUString::createFromAscii("aSequence"), - OUString::createFromAscii("[]ModuleA/EnumA"), + writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aSequence")), + OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA/EnumA")), OUString(), OUString(), RT_ACCESS_READWRITE); const sal_uInt8* pBlop = writer.getBlop(); @@ -194,7 +194,7 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_ENUM, - OUString::createFromAscii("ModuleA/EnumA"), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/EnumA")), OUString(), 2, 0, 0); RTConstValue aConst; @@ -202,15 +202,15 @@ void test_coreReflection() aConst.m_type = RT_TYPE_UINT32; aConst.m_value.aULong = 10; - writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Enum")); - writer.setFileName(OUString::createFromAscii("DummyFile")); + writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Enum"))); + writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); - writer.setFieldData(0, OUString::createFromAscii("ENUM_VAL_1"), - OUString(), OUString::createFromAscii("ich bin ein enum value"), + writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ENUM_VAL_1")), + OUString(), OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein enum value")), OUString(), RT_ACCESS_CONST, aConst); aConst.m_value.aULong = 10; - writer.setFieldData(1, OUString::createFromAscii("ENUM_VAL_2"), + writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ENUM_VAL_2")), OUString(), OUString(), OUString(), RT_ACCESS_CONST, aConst); const sal_uInt8* pBlop = writer.getBlop(); @@ -221,38 +221,38 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_INTERFACE, - OUString::createFromAscii("ModuleA/XInterfaceA"), - OUString::createFromAscii("stardiv/uno/XInterface"), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")), + OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")), 4, 1, 0); RTConstValue aConst; RTUik aUik = {1,2,3,4,5}; writer.setUik(aUik); - writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Interface")); - writer.setFileName(OUString::createFromAscii("DummyFile")); + writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Interface"))); + writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); - writer.setFieldData(0, OUString::createFromAscii("aString"), - OUString::createFromAscii("string"), OUString(), OUString(), RT_ACCESS_READWRITE); - writer.setFieldData(1, OUString::createFromAscii("aStruct"), - OUString::createFromAscii("ModuleA/StructA"), + writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aString")), + OUString(RTL_CONSTASCII_USTRINGPARAM("string")), OUString(), OUString(), RT_ACCESS_READWRITE); + writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("aStruct")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")), OUString(), OUString(), RT_ACCESS_READONLY); - writer.setFieldData(2, OUString::createFromAscii("aEnum"), - OUString::createFromAscii("ModuleA/EnumA"), OUString(), OUString(), RT_ACCESS_BOUND); + writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("aEnum")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/EnumA")), OUString(), OUString(), RT_ACCESS_BOUND); aConst.m_type = RT_TYPE_UINT16; aConst.m_value.aUShort = 12; - writer.setFieldData(3, OUString::createFromAscii("aConstUShort"), - OUString::createFromAscii("unsigned short"), OUString(), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); - - writer.setMethodData(0, OUString::createFromAscii("methodA"), - OUString::createFromAscii("double"), RT_MODE_TWOWAY, 2, 1, - OUString::createFromAscii("Hallo ich bin die methodA")); - writer.setParamData(0, 0, OUString::createFromAscii("ModuleA/StructA"), - OUString::createFromAscii("aStruct"), RT_PARAM_IN); - writer.setParamData(0, 1, OUString::createFromAscii("unsigned short"), - OUString::createFromAscii("aShort"), RT_PARAM_INOUT); - writer.setExcData(0, 0, OUString::createFromAscii("ModuleA/ExceptionA")); + writer.setFieldData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("aConstUShort")), + OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")), OUString(), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); + + writer.setMethodData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("methodA")), + OUString(RTL_CONSTASCII_USTRINGPARAM("double")), RT_MODE_TWOWAY, 2, 1, + OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin die methodA"))); + writer.setParamData(0, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/StructA")), + OUString(RTL_CONSTASCII_USTRINGPARAM("aStruct")), RT_PARAM_IN); + writer.setParamData(0, 1, OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")), + OUString(RTL_CONSTASCII_USTRINGPARAM("aShort")), RT_PARAM_INOUT); + writer.setExcData(0, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ExceptionA"))); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -266,7 +266,7 @@ void test_coreReflection() if (reader.isValid()) { - REG_ENSURE(reader.getTypeName().equals(OUString::createFromAscii("ModuleA/XInterfaceA")), "testCoreReflection error 9c2"); + REG_ENSURE(reader.getTypeName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA"))), "testCoreReflection error 9c2"); RTUik retUik; reader.getUik(retUik); @@ -281,14 +281,14 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_EXCEPTION, - OUString::createFromAscii("ModuleA/ExceptionA"), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ExceptionA")), OUString(), 1, 0, 0); - writer.setDoku(OUString::createFromAscii("Hallo ich bin eine Exception")); + writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Exception"))); - writer.setFieldData(0, OUString::createFromAscii("aSource"), - OUString::createFromAscii("stardiv/uno/XInterface"), - OUString::createFromAscii("ich bin ein interface member"), + writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aSource")), + OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein interface member")), OUString(), RT_ACCESS_READWRITE); const sal_uInt8* pBlop = writer.getBlop(); @@ -299,26 +299,26 @@ void test_coreReflection() { RegistryTypeWriter writer(RT_TYPE_SERVICE, - OUString::createFromAscii("ModuleA/ServiceA"), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceA")), OUString(), 1, 0, 4); - writer.setDoku(OUString::createFromAscii("Hallo ich bin ein Service")); - writer.setFileName(OUString::createFromAscii("DummyFile")); + writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin ein Service"))); + writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); - writer.setFieldData(0, OUString::createFromAscii("aProperty"), - OUString::createFromAscii("stardiv/uno/XInterface"), - OUString::createFromAscii("ich bin eine property"), + writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("aProperty")), + OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv/uno/XInterface")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin eine property")), OUString(), RT_ACCESS_READWRITE); - writer.setReferenceData(0, OUString::createFromAscii("ModuleA/XInterfaceA"), RT_REF_SUPPORTS, - OUString::createFromAscii("Hallo ich eine Reference auf ein supported interface"), + writer.setReferenceData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")), RT_REF_SUPPORTS, + OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf ein supported interface")), RT_ACCESS_OPTIONAL); - writer.setReferenceData(1, OUString::createFromAscii("ModuleA/XInterfaceA"), RT_REF_OBSERVES, - OUString::createFromAscii("Hallo ich eine Reference auf ein observed interface")); - writer.setReferenceData(2, OUString::createFromAscii("ModuleA/ServiceB"), RT_REF_EXPORTS, - OUString::createFromAscii("Hallo ich eine Reference auf einen exported service")); - writer.setReferenceData(3, OUString::createFromAscii("ModuleA/ServiceB"), RT_REF_NEEDS, - OUString::createFromAscii("Hallo ich eine Reference auf einen needed service")); + writer.setReferenceData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA")), RT_REF_OBSERVES, + OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf ein observed interface"))); + writer.setReferenceData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceB")), RT_REF_EXPORTS, + OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf einen exported service"))); + writer.setReferenceData(3, OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceB")), RT_REF_NEEDS, + OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich eine Reference auf einen needed service"))); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -331,44 +331,44 @@ void test_coreReflection() if (reader.isValid()) { - REG_ENSURE(reader.getTypeName().equals(OUString::createFromAscii("ModuleA/ServiceA")), "testCoreReflection error 9e3"); + REG_ENSURE(reader.getTypeName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ServiceA"))), "testCoreReflection error 9e3"); sal_uInt32 referenceCount = reader.getReferenceCount(); REG_ENSURE( referenceCount == 4, "testCoreReflection error 9e4"); OUString refName = reader.getReferenceName(0); - REG_ENSURE(refName.equals(OUString::createFromAscii("ModuleA/XInterfaceA")), "testCoreReflection error 9e5"); + REG_ENSURE(refName.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/XInterfaceA"))), "testCoreReflection error 9e5"); } } { RegistryTypeWriter writer(RT_TYPE_CONSTANTS, - OUString::createFromAscii("ModuleA/ConstansA"), + OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA/ConstansA")), OUString(), 3, 0, 0); RTConstValue aConst; - writer.setDoku(OUString::createFromAscii("Hallo ich bin eine Constants Group")); - writer.setFileName(OUString::createFromAscii("DummyFile")); + writer.setDoku(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bin eine Constants Group"))); + writer.setFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile"))); aConst.m_type = RT_TYPE_BOOL; aConst.m_value.aBool = sal_True; - writer.setFieldData(0, OUString::createFromAscii("ConstantsA_aConstBool"), - OUString::createFromAscii("boolean"), - OUString::createFromAscii("ich bin ein boolean"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(0, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstBool")), + OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein boolean")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_BYTE; aConst.m_value.aByte = 127; - writer.setFieldData(1, OUString::createFromAscii("ConstantsA_aConstByte"), - OUString::createFromAscii("byte"), - OUString::createFromAscii("ich bin ein byte"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(1, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstByte")), + OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein byte")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); aConst.m_type = RT_TYPE_INT16; aConst.m_value.aShort = -10; - writer.setFieldData(2, OUString::createFromAscii("ConstantsA_aConstShort"), - OUString::createFromAscii("short"), - OUString::createFromAscii("ich bin ein short"), - OUString::createFromAscii("DummyFile"), RT_ACCESS_CONST, aConst); + writer.setFieldData(2, OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantsA_aConstShort")), + OUString(RTL_CONSTASCII_USTRINGPARAM("short")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ich bin ein short")), + OUString(RTL_CONSTASCII_USTRINGPARAM("DummyFile")), RT_ACCESS_CONST, aConst); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -388,45 +388,45 @@ void test_registry_CppApi() RegistryKey rootKey, key1, key2, key3, key4 ,key5, key6, key7, key8, key9; - REG_ENSURE(!myRegistry->create(OUString::createFromAscii("test.rdb")), "test_registry_CppApi error 1"); + REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb"))), "test_registry_CppApi error 1"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 2"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("myFirstKey"), key1), "test_registry_CppApi error 3"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("mySecondKey"), key2), "test_registry_CppApi error 4"); - REG_ENSURE(!key1.createKey(OUString::createFromAscii("X"), key3), "test_registry_CppApi error 5"); - REG_ENSURE(!key1.createKey(OUString::createFromAscii("mySecondSubKey"), key4), "test_registry_CppApi error 6"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("myThirdKey"), key5), "test_registry_CppApi error 6a"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")), key1), "test_registry_CppApi error 3"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), key2), "test_registry_CppApi error 4"); + REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("X")), key3), "test_registry_CppApi error 5"); + REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondSubKey")), key4), "test_registry_CppApi error 6"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")), key5), "test_registry_CppApi error 6a"); - REG_ENSURE(!key5.createKey(OUString::createFromAscii("1"), key4), "test_registry_CppApi error 6b"); - REG_ENSURE(!key4.createKey(OUString::createFromAscii("2"), key3), "test_registry_CppApi error 6c"); - REG_ENSURE(!key5.openKey(OUString::createFromAscii("1"), key4), "test_registry_CppApi error 6d"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/myThirdKey/1"), key4), "test_registry_CppApi error 6e"); - REG_ENSURE(key4.getName().equals(OUString::createFromAscii("/myThirdKey/1")), "test_registry_CppApi error 6f"); + REG_ENSURE(!key5.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("1")), key4), "test_registry_CppApi error 6b"); + REG_ENSURE(!key4.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("2")), key3), "test_registry_CppApi error 6c"); + REG_ENSURE(!key5.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("1")), key4), "test_registry_CppApi error 6d"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myThirdKey/1")), key4), "test_registry_CppApi error 6e"); + REG_ENSURE(key4.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myThirdKey/1"))), "test_registry_CppApi error 6f"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("myFourthKey"), key6), "test_registry_CppApi error 7"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("myFifthKey"), key6), "test_registry_CppApi error 7a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("mySixthKey"), key6), "test_registry_CppApi error 7b"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), key6), "test_registry_CppApi error 7"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), key6), "test_registry_CppApi error 7a"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), key6), "test_registry_CppApi error 7b"); // Link Test // - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/myFourthKey/X"), key7), "test_registry_CppApi error 7c)");; - REG_ENSURE(!key6.createLink(OUString::createFromAscii("myFirstLink"), OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7d"); - REG_ENSURE(!key6.createKey(OUString::createFromAscii("mySixthSubKey"), key7), "test_registry_CppApi error 7e"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X")), key7), "test_registry_CppApi error 7c)");; + REG_ENSURE(!key6.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstLink")), OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7d"); + REG_ENSURE(!key6.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthSubKey")), key7), "test_registry_CppApi error 7e"); OUString linkTarget; - REG_ENSURE(!key6.getLinkTarget(OUString::createFromAscii("myFirstLink"), linkTarget), "test_registry_CppApi error 7f"); - REG_ENSURE(linkTarget.equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7g"); + REG_ENSURE(!key6.getLinkTarget(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstLink")), linkTarget), "test_registry_CppApi error 7f"); + REG_ENSURE(linkTarget.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7g"); RegistryKeyNames* pSubKeyNames = new RegistryKeyNames(); sal_uInt32 nSubKeys=0; - REG_ENSURE(!rootKey.getKeyNames(OUString::createFromAscii("mySixthKey"), *pSubKeyNames), "test_registry_CppApi error 7h)"); + REG_ENSURE(!rootKey.getKeyNames(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), *pSubKeyNames), "test_registry_CppApi error 7h)"); REG_ENSURE(pSubKeyNames->getLength() == 2, "test_registry_CppApi error 7i)"); for (sal_uInt32 i=0; i < pSubKeyNames->getLength(); i++) { - if (pSubKeyNames->getElement(i).equals(OUString::createFromAscii("/mySixthKey/myFirstLink"))) + if (pSubKeyNames->getElement(i).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink")))) { RegKeyType keyType; REG_ENSURE(!rootKey.getKeyType(pSubKeyNames->getElement(i), &keyType), "test_registry_CppApi error 7j"); @@ -437,32 +437,32 @@ void test_registry_CppApi() REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7k1"); delete pSubKeyNames; - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/mySixthKey/myFirstLink"), key6), "test_registry_CppApi error 7l"); -// REG_ENSURE(key6.getName().equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7m"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink")), key6), "test_registry_CppApi error 7l"); +// REG_ENSURE(key6.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7m"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("myFifthKey"), key6), "test_registry_CppApi error 7m1"); - REG_ENSURE(!key6.createLink(OUString::createFromAscii("mySecondLink"), - OUString::createFromAscii("/mySixthKey/myFirstLink")), "test_registry_CppApi error 7m2"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), key6), "test_registry_CppApi error 7m1"); + REG_ENSURE(!key6.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondLink")), + OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink"))), "test_registry_CppApi error 7m2"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/myFifthKey/mySecondLink"), key6), "test_registry_CppApi error 7m3"); -// REG_ENSURE(key6.getName().equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7m4"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink")), key6), "test_registry_CppApi error 7m3"); +// REG_ENSURE(key6.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7m4"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/myFifthKey/mySecondLink/myFirstLinkSubKey"), key7), "test_registry_CppApi error 7m5"); - REG_ENSURE(key7.getName().equals(OUString::createFromAscii("/myFourthKey/X/myFirstLinkSubKey")), "test_registry_CppApi error 7m6"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink/myFirstLinkSubKey")), key7), "test_registry_CppApi error 7m5"); + REG_ENSURE(key7.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey"))), "test_registry_CppApi error 7m6"); - REG_ENSURE(!key7.createLink(OUString::createFromAscii("myThirdLink"), OUString::createFromAscii("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m7"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"), key7), "test_registry_CppApi error 7m8"); -// REG_ENSURE(!key7.openKey(OUString::createFromAscii("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink"), key6), "test_registry_CppApi error 7m9"); -// REG_ENSURE(key7.getName().equals(OUString::createFromAscii("/myFourthKey/X")), "test_registry_CppApi error 7m10"); + REG_ENSURE(!key7.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdLink")), OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink"))), "test_registry_CppApi error 7m7"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")), key7), "test_registry_CppApi error 7m8"); +// REG_ENSURE(!key7.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFirstLinkSubKey/myThirdLink/myFirstLinkSubKey/myThirdLink")), key6), "test_registry_CppApi error 7m9"); +// REG_ENSURE(key7.getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X"))), "test_registry_CppApi error 7m10"); REG_ENSURE(!key7.closeKey(), "test_registry_CppApi error 7m11"); - REG_ENSURE(!rootKey.deleteLink(OUString::createFromAscii("/myFifthKey/mySecondLink")), "test_registry_CppApi error 7m12"); + REG_ENSURE(!rootKey.deleteLink(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink"))), "test_registry_CppApi error 7m12"); - REG_ENSURE(!rootKey.createLink(OUString::createFromAscii("/myFifthKey/mySecondLink"), - OUString::createFromAscii("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")), + REG_ENSURE(!rootKey.createLink(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFifthKey/mySecondLink")), + OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"))), "test_registry_CppApi error 7m13"); -// REG_ENSURE(rootKey.openKey(OUString::createFromAscii("/myFourthKey/X/myFirstLinkSubKey/myThirdLink"), key7) == REG_DETECT_RECURSION, +// REG_ENSURE(rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFourthKey/X/myFirstLinkSubKey/myThirdLink")), key7) == REG_DETECT_RECURSION, // "test_registry_CppApi error 7m14"); // REG_ENSURE(key7.closeKey() == REG_INVALID_KEY, "test_registry_CppApi error 7m11"); @@ -470,45 +470,45 @@ void test_registry_CppApi() RegistryKeyNames subKeyNames; nSubKeys=0; - REG_ENSURE(!rootKey.getKeyNames(OUString::createFromAscii("mySixthKey"), subKeyNames), "test_registry_CppApi error 7n"); + REG_ENSURE(!rootKey.getKeyNames(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), subKeyNames), "test_registry_CppApi error 7n"); nSubKeys = subKeyNames.getLength(); REG_ENSURE(nSubKeys == 2, "test_registry_CppApi error 7n1"); - REG_ENSURE(subKeyNames.getElement(0).equals(OUString::createFromAscii("/mySixthKey/myFirstLink")), "test_registry_CppApi error 7p1)"); - REG_ENSURE(subKeyNames.getElement(1).equals(OUString::createFromAscii("/mySixthKey/mySixthSubKey")), "test_registry_CppApi error 7p2"); + REG_ENSURE(subKeyNames.getElement(0).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/myFirstLink"))), "test_registry_CppApi error 7p1)"); + REG_ENSURE(subKeyNames.getElement(1).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/mySixthKey/mySixthSubKey"))), "test_registry_CppApi error 7p2"); RegistryKeyArray subKeys; nSubKeys=0; - REG_ENSURE(!rootKey.openSubKeys(OUString::createFromAscii("myFirstKey"), subKeys), "test_registry_CppApi error 7o"); + REG_ENSURE(!rootKey.openSubKeys(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")), subKeys), "test_registry_CppApi error 7o"); nSubKeys = subKeys.getLength(); REG_ENSURE(nSubKeys == 2, "test_registry_CppApi error 7o1"); - REG_ENSURE(subKeys.getElement(0).getName().equals(OUString::createFromAscii("/myFirstKey/mySecondSubKey")), "test_registry_CppApi error 7p1)"); - REG_ENSURE(subKeys.getElement(1).getName().equals(OUString::createFromAscii("/myFirstKey/X")), "test_registry_CppApi error 7p2"); + REG_ENSURE(subKeys.getElement(0).getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFirstKey/mySecondSubKey"))), "test_registry_CppApi error 7p1)"); + REG_ENSURE(subKeys.getElement(1).getName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("/myFirstKey/X"))), "test_registry_CppApi error 7p2"); REG_ENSURE(!rootKey.closeSubKeys(subKeys), "test_registry_CppApi error 7q)"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/TEST"), key8), "test_registry_CppApi error 8"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/TEST/Child1"), key8), "test_registry_CppApi error 8a"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("/TEST/Child2"), key8), "test_registry_CppApi error 8a1"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/TEST"), key9), "test_registry_CppApi error 8b"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key8), "test_registry_CppApi error 8"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST/Child1")), key8), "test_registry_CppApi error 8a"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST/Child2")), key8), "test_registry_CppApi error 8a1"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key9), "test_registry_CppApi error 8b"); REG_ENSURE(!key8.closeKey() && !key9.closeKey(), "test_registry_CppApi error 8b1"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/TEST"), key8), "test_registry_CppApi error 8b"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/TEST")), key8), "test_registry_CppApi error 8b"); REG_ENSURE(!key8.closeKey(), "test_registry_CppApi error 8c"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("TEST"), key8), "test_registry_CppApi error 8c"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST")), key8), "test_registry_CppApi error 8c"); REG_ENSURE(!key8.closeKey(), "test_registry_CppApi error 8d"); sal_Char* Value=(sal_Char*)"Mein erster Value"; - REG_ENSURE(!rootKey.setValue(OUString::createFromAscii("mySecondKey"), RG_VALUETYPE_STRING, Value, 18), "test_registry_CppApi error 9"); + REG_ENSURE(!rootKey.setValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), RG_VALUETYPE_STRING, Value, 18), "test_registry_CppApi error 9"); RegValueType valueType; sal_uInt32 valueSize; sal_Char* readValue; - REG_ENSURE(!rootKey.getValueInfo(OUString::createFromAscii("mySecondKey"), &valueType, &valueSize), "test_registry_CppApi error 9a"); + REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), &valueType, &valueSize), "test_registry_CppApi error 9a"); readValue = (sal_Char*)rtl_allocateMemory(valueSize); REG_ENSURE(!key2.getValue(OUString(), readValue), "test_registry_CppApi error 10"); @@ -527,16 +527,16 @@ void test_registry_CppApi() pList[1]=n2; pList[2]=n3; - REG_ENSURE(!rootKey.setStringListValue(OUString::createFromAscii("myFourthKey"), (sal_Char**)pList, 3), "test_registry_CppApi error 13a"); + REG_ENSURE(!rootKey.setStringListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), (sal_Char**)pList, 3), "test_registry_CppApi error 13a"); RegistryValueList<sal_Char*> valueList; - REG_ENSURE(!rootKey.getStringListValue(OUString::createFromAscii("myFourthKey"), valueList), "test_registry_CppApi error 13b"); + REG_ENSURE(!rootKey.getStringListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), valueList), "test_registry_CppApi error 13b"); REG_ENSURE(strcmp(n1, valueList.getElement(0)) == 0, "test_registry_CppApi error 13c"); REG_ENSURE(strcmp(n2, valueList.getElement(1)) == 0, "test_registry_CppApi error 13d"); REG_ENSURE(strcmp(n3, valueList.getElement(2)) == 0, "test_registry_CppApi error 13e"); - REG_ENSURE(!rootKey.getValueInfo(OUString::createFromAscii("myFourthKey"), &valueType, &valueSize), "test_registry_CppApi error 13e1"); + REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("myFourthKey")), &valueType, &valueSize), "test_registry_CppApi error 13e1"); REG_ENSURE(valueType == RG_VALUETYPE_STRINGLIST, "test_registry_CppApi error 13e2"); REG_ENSURE(valueSize == 3, "test_registry_CppApi error 13e3"); @@ -545,40 +545,40 @@ void test_registry_CppApi() pLong[1] = 456; pLong[2] = 789; - REG_ENSURE(!rootKey.setLongListValue(OUString::createFromAscii("myFifthKey"), pLong, 3), "test_registry_CppApi error 13f"); + REG_ENSURE(!rootKey.setLongListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), pLong, 3), "test_registry_CppApi error 13f"); RegistryValueList<sal_Int32> longList; - REG_ENSURE(!rootKey.getLongListValue(OUString::createFromAscii("myFifthKey"), longList), "test_registry_CppApi error 13g"); + REG_ENSURE(!rootKey.getLongListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("myFifthKey")), longList), "test_registry_CppApi error 13g"); REG_ENSURE(pLong[0] == longList.getElement(0), "test_registry_CppApi error 13h"); REG_ENSURE(pLong[1] == longList.getElement(1), "test_registry_CppApi error 13i"); REG_ENSURE(pLong[2] == longList.getElement(2), "test_registry_CppApi error 13j"); - OUString sWTestValue(OUString::createFromAscii( "Mein erster Unicode Value" )); + OUString sWTestValue(RTL_CONSTASCII_USTRINGPARAM("Mein erster Unicode Value")); const sal_Unicode* wTestValue= sWTestValue.getStr(); - REG_ENSURE(!rootKey.setValue(OUString::createFromAscii("mySixthKey"), RG_VALUETYPE_UNICODE, (void*)wTestValue, + REG_ENSURE(!rootKey.setValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), RG_VALUETYPE_UNICODE, (void*)wTestValue, (rtl_ustr_getLength(wTestValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 13j1"); - REG_ENSURE(!rootKey.getValueInfo(OUString::createFromAscii("mySixthKey"), &valueType, &valueSize), "test_registry_CppApi error 13j2"); + REG_ENSURE(!rootKey.getValueInfo(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), &valueType, &valueSize), "test_registry_CppApi error 13j2"); sal_Unicode* pTmpValue = (sal_Unicode*)rtl_allocateMemory(valueSize); - REG_ENSURE(!rootKey.getValue(OUString::createFromAscii("mySixthKey"), pTmpValue), "test_registry_CppApi error 13j3"); + REG_ENSURE(!rootKey.getValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), pTmpValue), "test_registry_CppApi error 13j3"); REG_ENSURE(rtl_ustr_getLength(wTestValue) == rtl_ustr_getLength(pTmpValue), "test_registry_CppApi error 13j4"); REG_ENSURE(rtl_ustr_compare(wTestValue, pTmpValue) == 0, "test_registry_CppApi error 13j4"); const sal_Unicode* pUnicode[3]; - OUString w1(OUString::createFromAscii( "Hallo" )); - OUString w2(OUString::createFromAscii( "jetzt komm" )); - OUString w3(OUString::createFromAscii( "ich als unicode" )); + OUString w1(RTL_CONSTASCII_USTRINGPARAM("Hallo")); + OUString w2(RTL_CONSTASCII_USTRINGPARAM("jetzt komm")); + OUString w3(RTL_CONSTASCII_USTRINGPARAM("ich als unicode")); pUnicode[0]=w1.getStr(); pUnicode[1]=w2.getStr(); pUnicode[2]=w3.getStr(); - REG_ENSURE(!rootKey.setUnicodeListValue(OUString::createFromAscii("mySixthKey"), (sal_Unicode**)pUnicode, 3), "test_registry_CppApi error 13k"); + REG_ENSURE(!rootKey.setUnicodeListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), (sal_Unicode**)pUnicode, 3), "test_registry_CppApi error 13k"); RegistryValueList<sal_Unicode*> unicodeList; - REG_ENSURE(!rootKey.getUnicodeListValue(OUString::createFromAscii("mySixthKey"), unicodeList), "test_registry_CppApi error 13l"); + REG_ENSURE(!rootKey.getUnicodeListValue(OUString(RTL_CONSTASCII_USTRINGPARAM("mySixthKey")), unicodeList), "test_registry_CppApi error 13l"); REG_ENSURE(rtl_ustr_compare(w1, unicodeList.getElement(0)) == 0, "test_registry_CppApi error 13m"); REG_ENSURE(rtl_ustr_compare(w2, unicodeList.getElement(1)) == 0, "test_registry_CppApi error 13n"); @@ -590,16 +590,16 @@ void test_registry_CppApi() !key3.closeKey() && !key4.closeKey(), "test_registry_CppApi error 14"); - REG_ENSURE(!rootKey.deleteKey(OUString::createFromAscii("myFirstKey")), "test_registry_CppApi error 15"); + REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey"))), "test_registry_CppApi error 15"); REG_ENSURE(!key2.closeKey(), "test_registry_CppApi error 16"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("mySecondKey"), key2), "test_registry_CppApi error 17"); + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")), key2), "test_registry_CppApi error 17"); REG_ENSURE(!key5.closeKey(), "test_registry_CppApi error 18"); - REG_ENSURE(!rootKey.deleteKey(OUString::createFromAscii("myThirdKey")), "test_registry_CppApi error 19"); + REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey"))), "test_registry_CppApi error 19"); - REG_ENSURE(rootKey.openKey(OUString::createFromAscii("myThirdKey"), key5), "test_registry_CppApi error 20"); + REG_ENSURE(rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")), key5), "test_registry_CppApi error 20"); REG_ENSURE(!key2.closeKey() && !rootKey.closeKey(), "test_registry_CppApi error 21"); @@ -609,14 +609,14 @@ void test_registry_CppApi() // Test loadkey RegistryKey rootKey2, key21, key22, key23, key24 , key25; - REG_ENSURE(!myRegistry->create(OUString::createFromAscii("test2.rdb")), "test_registry_CppApi error 23"); + REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 23"); REG_ENSURE(!myRegistry->openRootKey(rootKey2), "test_registry_CppApi error 24"); - REG_ENSURE(!rootKey2.createKey(OUString::createFromAscii("reg2FirstKey"), key21), "test_registry_CppApi error 25"); - REG_ENSURE(!rootKey2.createKey(OUString::createFromAscii("reg2SecondKey"), key22), "test_registry_CppApi error 26"); - REG_ENSURE(!key21.createKey(OUString::createFromAscii("reg2FirstSubKey"), key23), "test_registry_CppApi error 27"); - REG_ENSURE(!key21.createKey(OUString::createFromAscii("reg2SecondSubKey"), key24), "test_registry_CppApi error 28"); - REG_ENSURE(!rootKey2.createKey(OUString::createFromAscii("reg2ThirdKey"), key25), "test_registry_CppApi error 29"); + REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstKey")), key21), "test_registry_CppApi error 25"); + REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondKey")), key22), "test_registry_CppApi error 26"); + REG_ENSURE(!key21.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstSubKey")), key23), "test_registry_CppApi error 27"); + REG_ENSURE(!key21.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondSubKey")), key24), "test_registry_CppApi error 28"); + REG_ENSURE(!rootKey2.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("reg2ThirdKey")), key25), "test_registry_CppApi error 29"); sal_uInt32 nValue= 123456789; REG_ENSURE(!key23.setValue(OUString(), RG_VALUETYPE_LONG, &nValue, sizeof(sal_uInt32)), "test_registry_CppApi error 30"); @@ -630,38 +630,38 @@ void test_registry_CppApi() REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 32"); - REG_ENSURE(!myRegistry->open(OUString::createFromAscii("test.rdb"), REG_READWRITE), "test_registry_CppApi error 33"); + REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 33"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 34"); - REG_ENSURE(!myRegistry->loadKey(rootKey, OUString::createFromAscii("allFromTest2"), - OUString::createFromAscii("test2.rdb")), "test_registry_CppApi error 35"); - REG_ENSURE(!myRegistry->saveKey(rootKey, OUString::createFromAscii("allFromTest2"), - OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 36"); + REG_ENSURE(!myRegistry->loadKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")), + OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 35"); + REG_ENSURE(!myRegistry->saveKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")), + OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 36"); - REG_ENSURE(!rootKey.createKey(OUString::createFromAscii("allFromTest3"), key1), "test_registry_CppApi error 37"); - REG_ENSURE(!key1.createKey(OUString::createFromAscii("myFirstKey2"), key2), "test_registry_CppApi error 38"); - REG_ENSURE(!key1.createKey(OUString::createFromAscii("mySecondKey2"), key3), "test_registry_CppApi error 39"); + REG_ENSURE(!rootKey.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), key1), "test_registry_CppApi error 37"); + REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey2")), key2), "test_registry_CppApi error 38"); + REG_ENSURE(!key1.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey2")), key3), "test_registry_CppApi error 39"); - REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), - OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 40"); - REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), - OUString::createFromAscii("ucrtest.rdb"), sal_True), "test_registry_CppApi error 40.a)"); + REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), + OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 40"); + REG_ENSURE(!myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), + OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb")), sal_True), "test_registry_CppApi error 40.a)"); -// REG_ENSURE(myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), OUString::createFromAscii("ucrtest.rdb"), sal_True) +// REG_ENSURE(myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb")), sal_True) // == REG_NO_ERROR/*REG_MERGE_CONFLICT*/, "test_registry_CppApi error 40.b)"); REG_ENSURE(!key1.closeKey() && !key2.closeKey(), "test_registry_CppApi error 41"); - const sal_Unicode* wValue= OUString::createFromAscii( "Mein erster Unicode Value" ).getStr(); + const sal_Unicode* wValue= OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster Unicode Value")).getStr(); REG_ENSURE(!key3.setValue(OUString(), RG_VALUETYPE_UNICODE, (void*)wValue, (rtl_ustr_getLength(wValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 42"); REG_ENSURE(!key3.closeKey(), "test_registry_CppApi error 43"); - REG_ENSURE(!rootKey.openKey(OUString::createFromAscii("/allFromTest3/reg2FirstKey/reg2FirstSubKey"), key1), + REG_ENSURE(!rootKey.openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey")), key1), "test_registry_CppApi error 43.a)"); - REG_ENSURE(!rootKey.deleteKey(OUString::createFromAscii("/allFromTest3/reg2FirstKey/reg2FirstSubKey")), "test_registry_CppApi error 44"); + REG_ENSURE(!rootKey.deleteKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey"))), "test_registry_CppApi error 44"); REG_ENSURE(key1.getValueInfo(OUString(), &valueType, &valueSize) == REG_INVALID_KEY, "test_registry_CppApi error 44.a)"); REG_ENSURE(!key1.closeKey(), "test_registry_CppApi error 44.b)"); @@ -670,9 +670,9 @@ void test_registry_CppApi() REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 46"); - REG_ENSURE(!myRegistry->open(OUString::createFromAscii("test.rdb"), REG_READWRITE), "test_registry_CppApi error 47"); + REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 47"); - REG_ENSURE(!myRegistry->destroy(OUString::createFromAscii("test2.rdb")), "test_registry_CppApi error 48"); + REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("test2.rdb"))), "test_registry_CppApi error 48"); // REG_ENSURE(!myRegistry->destroy("test3.rdb"), "test_registry_CppApi error 49"); Registry *myRegistry2 = new Registry(*myRegistry); @@ -681,22 +681,22 @@ void test_registry_CppApi() delete(myRegistry2); - REG_ENSURE(!myRegistry->create(OUString::createFromAscii("destroytest.rdb")), "test_registry_CppApi error 51"); + REG_ENSURE(!myRegistry->create(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb"))), "test_registry_CppApi error 51"); REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 52"); - REG_ENSURE(!myRegistry->open(OUString::createFromAscii("destroytest.rdb"), REG_READONLY), "test_registry_CppApi error 53"); + REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb")), REG_READONLY), "test_registry_CppApi error 53"); REG_ENSURE(!myRegistry->openRootKey(rootKey), "test_registry_CppApi error 54"); - REG_ENSURE(myRegistry->mergeKey(rootKey, OUString::createFromAscii("allFromTest3"), - OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 55"); - REG_ENSURE(!myRegistry->destroy(OUString::createFromAscii("test3.rdb")), "test_registry_CppApi error 56"); + REG_ENSURE(myRegistry->mergeKey(rootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")), + OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 55"); + REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("test3.rdb"))), "test_registry_CppApi error 56"); REG_ENSURE(!rootKey.closeKey(), "test_registry_CppApi error 57"); REG_ENSURE(!myRegistry->close(), "test_registry_CppApi error 58"); - REG_ENSURE(!myRegistry->open(OUString::createFromAscii("destroytest.rdb"), REG_READWRITE), "test_registry_CppApi error 59"); + REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("destroytest.rdb")), REG_READWRITE), "test_registry_CppApi error 59"); REG_ENSURE(!myRegistry->destroy(OUString()), "test_registry_CppApi error 60"); - REG_ENSURE(!myRegistry->open(OUString::createFromAscii("test.rdb"), REG_READWRITE), "test_registry_CppApi error 61"); - REG_ENSURE(!myRegistry->destroy(OUString::createFromAscii("ucrtest.rdb")), "test_registry_CppApi error 62"); + REG_ENSURE(!myRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("test.rdb")), REG_READWRITE), "test_registry_CppApi error 61"); + REG_ENSURE(!myRegistry->destroy(OUString(RTL_CONSTASCII_USTRINGPARAM("ucrtest.rdb"))), "test_registry_CppApi error 62"); REG_ENSURE(!myRegistry->destroy(OUString()), "test_registry_CppApi error 63"); delete(myRegistry); diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx index 1eb3dd09ca7c..8f470bee4da8 100644 --- a/registry/tools/checksingleton.cxx +++ b/registry/tools/checksingleton.cxx @@ -445,7 +445,7 @@ int _cdecl main( int argc, char * argv[] ) typeKey = typeRoot; } - if ( indexRoot.createKey(OUString::createFromAscii("SINGLETONS"), singletonKey) ) + if ( indexRoot.createKey(OUString(RTL_CONSTASCII_USTRINGPARAM("SINGLETONS")), singletonKey) ) { fprintf(stderr, "%s: open/create SINGLETONS key of registry \"%s\" failed\n", options.getProgramName().getStr(), options.getIndexReg().getStr()); diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx index ec821a314fcb..c6089d509380 100644 --- a/registry/tools/regcompare.cxx +++ b/registry/tools/regcompare.cxx @@ -1634,8 +1634,8 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s } /* if ( nError && - (!keyName.compareTo(OUString::createFromAscii("/UCR/drafts"), 11) || - !keyName.compareTo(OUString::createFromAscii("/drafts"), 7)) ) + (!keyName.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("/UCR/drafts")), 11) || + !keyName.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("/drafts")), 7)) ) { if ( options.forceOutput() ) { diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx index 4cf828986abd..db400a73729b 100644 --- a/registry/workben/regspeed.cxx +++ b/registry/workben/regspeed.cxx @@ -194,7 +194,7 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 i=0; i < S1; i++) { - keyName1 = OUString::createFromAscii("/"); + keyName1 = OUString(RTL_CONSTASCII_USTRINGPARAM("/")); keyName1 += sName1; keyName1 += OUString().valueOf(i); if (reg_openKey(hRootKey, keyName1.pData, &hKey)) @@ -203,10 +203,10 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 j=0; j < S2; j++) { - keyName2 = OUString::createFromAscii("/"); + keyName2 = OUString(RTL_CONSTASCII_USTRINGPARAM("/")); keyName2 += sName1; keyName2 += OUString().valueOf(i); - keyName2 += OUString::createFromAscii("/"); + keyName2 += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); keyName2 += sName2; keyName2 += OUString().valueOf(j); if (reg_openKey(hRootKey, keyName2.pData, &hSubKey)) @@ -215,13 +215,13 @@ int _cdecl main( int argc, char * argv[] ) for (sal_Int32 n=0; n < S3; n++) { - keyName3 = OUString::createFromAscii("/"); + keyName3 = OUString(RTL_CONSTASCII_USTRINGPARAM("/")); keyName3 += sName1; keyName3 += OUString().valueOf(i); - keyName3 += OUString::createFromAscii("/"); + keyName3 += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); keyName3 += sName2; keyName3 += OUString().valueOf(j); - keyName3 += OUString::createFromAscii("/"); + keyName3 += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); keyName3 += sName3; keyName3 += OUString().valueOf(n); if (reg_openKey(hRootKey, keyName3.pData, &hSubSubKey)) diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx index b3b2f5004755..b2ed50070d72 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::createFromAscii("test4.rdb").pData, &hReg)) + if (reg_createRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg)) cout << "\t0. creating registry \"test4.rdb\" failed\n"; else cout << "0. registry test4.rdb is created\n"; @@ -60,23 +60,23 @@ int _cdecl main() else cout << "1. root key of \"test4.rdb\" is opened\n"; - if (reg_createKey(hRootKey, OUString::createFromAscii("myFirstKey").pData, &hKey1)) + if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData, &hKey1)) cout << "\t2. creating key \"myFirstKey\" failed\n"; else cout << "2. key \"myFirstKey\" is created\n"; - if (reg_createKey(hRootKey, OUString::createFromAscii("mySecondKey").pData, &hKey2)) + if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &hKey2)) cout << "\t3. creating key \"mySecondKey\" failed\n"; else cout << "3. key \"mySecondKey\" is created\n"; - if (reg_createKey(hKey1, OUString::createFromAscii("myFirstSubKey").pData, &hKey3)) + if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstSubKey")).pData, &hKey3)) cout << "\t4. creating subkey \"myFirstSubKey\" failed\n"; else cout << "4. subkey \"myFirstSubKey\" is created\n"; - if (reg_createKey(hKey1, OUString::createFromAscii("mySecondSubKey").pData, &hKey4)) + if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondSubKey")).pData, &hKey4)) cout << "\t5. creating subkey \"mySecondSubKey\" failed\n"; else cout << "5. subkey \"mySecondSubKey\" is created\n"; - if (reg_createKey(hRootKey, OUString::createFromAscii("myThirdKey").pData, &hKey5)) + if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData, &hKey5)) cout << "\t6. creating key \"myThirdKey\" is created\n\n"; else cout << "6. key \"myThirdKey\" is created\n\n"; @@ -84,7 +84,7 @@ int _cdecl main() RegKeyHandle* phSubKeys; sal_uInt32 nSubKeys; - if (reg_openSubKeys(hRootKey, OUString::createFromAscii("myFirstKey").pData, &phSubKeys, &nSubKeys)) + if (reg_openSubKeys(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData, &phSubKeys, &nSubKeys)) cout << "\t7. open subkeys of \"myfirstKey\" failed\n"; else cout << "7. open " << nSubKeys << "subkeys of \"myfirstKey\"\n"; @@ -102,7 +102,7 @@ int _cdecl main() char* Value=(char*)"Mein erster Value"; - if (reg_setValue(hRootKey, OUString::createFromAscii("mySecondKey").pData, RG_VALUETYPE_STRING, Value, 18)) + if (reg_setValue(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, RG_VALUETYPE_STRING, Value, 18)) cout << "\t9. setValue of key \"mySecondKey\" failed\n"; else cout << "9. setValue (string Value) of key \"mySecondKey\"\n"; @@ -110,7 +110,7 @@ int _cdecl main() RegValueType valueType; sal_uInt32 valueSize; sal_Char* readValue; - if (reg_getValueInfo(hRootKey, OUString::createFromAscii("mySecondKey").pData, &valueType, &valueSize)) + if (reg_getValueInfo(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &valueType, &valueSize)) cout << "\t10. getValueInfo of key \"mySecondKey\" failed\n"; else cout << "10. getValueInfo of key \"mySecondKey\"\n"; @@ -135,7 +135,7 @@ int _cdecl main() else cout << "12. keys \"myFirstKey\" \"myfistSubKey\" \"mySecondSubKey\" are closed\n"; - if (reg_deleteKey(hRootKey, OUString::createFromAscii("myFirstKey").pData)) + if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey")).pData)) cout << "13.\t delete key \"myFirstKey\" failed\n"; else cout << "13. key \"myFirstKey\" is deleted\n"; @@ -145,7 +145,7 @@ int _cdecl main() else cout << "14. key \"mySecondKey\" is closed\n"; - if (reg_openKey(hRootKey, OUString::createFromAscii("mySecondKey").pData, &hKey2)) + if (reg_openKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey")).pData, &hKey2)) cout << "\n15. open key \"mySecondKey\" failed\n"; else cout << "15. key \"mySecondKey\" is opended\n"; @@ -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::createFromAscii("myThirdKey").pData)) + if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData)) cout << "\t16. delete key \"myThirdKey\" failed\n"; else cout << "16. key \"myThirdKey\" is deleted\n"; - if (reg_openKey(hRootKey, OUString::createFromAscii("myThirdKey").pData, &hKey5)) + if (reg_openKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("myThirdKey")).pData, &hKey5)) cout << "\t17. open key \"myThirdKey\" failed\n"; else cout << "17. key \"myThirdKey\" is opened\n"; @@ -187,7 +187,7 @@ int _cdecl main() RegHandle hReg2; RegKeyHandle hRootKey2, h2Key1, h2Key2, h2Key3, h2Key4, h2Key5; - if (reg_createRegistry(OUString::createFromAscii("test5.rdb").pData, &hReg2)) + if (reg_createRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test5.rdb")).pData, &hReg2)) cout << "\t21. creating registry \"test5.rdb\" failed\n"; else cout << "21. registry \"test5.rdb\" is created\n"; @@ -197,23 +197,23 @@ int _cdecl main() else cout << "22. root key of \"test5.rdb\" is opened\n"; - if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2FirstKey").pData, &h2Key1)) + if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstKey")).pData, &h2Key1)) cout << "\t23. creating key \"reg2FirstKey\" failed\n"; else cout << "23. key \"reg2FirstKey\" is created\n"; - if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2SecondKey").pData, &h2Key2)) + if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondKey")).pData, &h2Key2)) cout << "\t24. creating key \"reg2SecondKey\" failed\n"; else cout << "24. key \"reg2SecondKey\" is created\n"; - if (reg_createKey(h2Key1, OUString::createFromAscii("reg2FirstSubKey").pData, &h2Key3)) + if (reg_createKey(h2Key1, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2FirstSubKey")).pData, &h2Key3)) cout << "\t25. creating key \"reg2FirstSubKey\" failed\n"; else cout << "25. key \"reg2FirstSubKey\" is created\n"; - if (reg_createKey(h2Key1, OUString::createFromAscii("reg2SecondSubKey").pData, &h2Key4)) + if (reg_createKey(h2Key1, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2SecondSubKey")).pData, &h2Key4)) cout << "\26. creating key \"reg2SecondSubKey\" failed\n"; else cout << "26. key \"reg2SecondSubKey\" is created\n"; - if (reg_createKey(hRootKey2, OUString::createFromAscii("reg2ThirdKey").pData, &h2Key5)) + if (reg_createKey(hRootKey2, OUString(RTL_CONSTASCII_USTRINGPARAM("reg2ThirdKey")).pData, &h2Key5)) cout << "\n27. creating key \"reg2ThirdKey\" failed\n"; else cout << "27. key \"reg2ThirdKey\" is created\n"; @@ -243,7 +243,7 @@ int _cdecl main() else cout << "30. registry test5.rdb is closed\n"; - if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg, REG_READWRITE)) + if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg, REG_READWRITE)) cout << "\t31. registry test4.rdb is opened\n"; else cout << "31. registry test4.rdb is opened\n"; @@ -253,34 +253,34 @@ int _cdecl main() else cout << "32. root key of \"test4.rdb\" is opened\n"; - if (reg_loadKey(hRootKey, OUString::createFromAscii("allFromTest2").pData, - OUString::createFromAscii("test5.rdb").pData)) + if (reg_loadKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")).pData, + OUString(RTL_CONSTASCII_USTRINGPARAM("test5.rdb")).pData)) cout << "\n\t33. load all keys from \"test5.rdb\" under key \"allFromTest2\" failed\n"; else cout << "\n33. load all keys from test5.rdb under key \"allFromTest2\"\n"; - if (reg_saveKey(hRootKey, OUString::createFromAscii("allFromTest2").pData, - OUString::createFromAscii("test6.rdb").pData)) + if (reg_saveKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest2")).pData, + OUString(RTL_CONSTASCII_USTRINGPARAM("test6.rdb")).pData)) cout << "\n\t34. save all keys under \"allFromTest2\" in test6.rdb\n"; else cout << "\n34. save all keys under \"allFromTest2\" in test6.rdb\n"; - if (reg_createKey(hRootKey, OUString::createFromAscii("allFromTest3").pData, &hKey1)) + if (reg_createKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")).pData, &hKey1)) cout << "\t35. creating key \"allFromTest3\" failed\n"; else cout << "36. key \"allFromTest3\" is created\n"; - if (reg_createKey(hKey1, OUString::createFromAscii("myFirstKey2").pData, &hKey2)) + if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("myFirstKey2")).pData, &hKey2)) cout << "\t37. creating key \"myFirstKey2\" failed\n"; else cout << "37. key \"myFirstKey2\" is created\n"; - if (reg_createKey(hKey1, OUString::createFromAscii("mySecondKey2").pData, &hKey3)) + if (reg_createKey(hKey1, OUString(RTL_CONSTASCII_USTRINGPARAM("mySecondKey2")).pData, &hKey3)) cout << "\t38. creating key \"mySecondKey2\" failed\n"; else cout << "38. key \"mySecondKey2\" is created\n"; - if (reg_mergeKey(hRootKey, OUString::createFromAscii("allFromTest3").pData, - OUString::createFromAscii("test6.rdb").pData, sal_False, sal_False)) + if (reg_mergeKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("allFromTest3")).pData, + OUString(RTL_CONSTASCII_USTRINGPARAM("test6.rdb")).pData, sal_False, sal_False)) cout << "\n\t39. merge all keys under \"allFromTest2\" with all in test6.rdb\n"; else cout << "\n39. merge all keys under \"allFromTest2\" with all in test6.rdb\n"; @@ -299,18 +299,18 @@ int _cdecl main() cout << "\n42. closing key \"mySecondKey2\" of \"test5.rdb\"\n"; - if (reg_deleteKey(hRootKey, OUString::createFromAscii("/allFromTest3/reg2FirstKey/reg2FirstSubKey").pData)) + if (reg_deleteKey(hRootKey, OUString(RTL_CONSTASCII_USTRINGPARAM("/allFromTest3/reg2FirstKey/reg2FirstSubKey")).pData)) cout << "\n\t43. delete key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" failed\n"; else cout << "\n43. key \"/allFromTest3/reg2FirstKey/reg2FirstSubKey\" is deleted\n"; - if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg2, REG_READONLY)) + if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg2, REG_READONLY)) cout << "\n\t44. registry test4.rdb is opened for read only\n"; else cout << "\n44. registry test4.rdb is opened for read only\n"; RegHandle hReg3; - if (reg_openRegistry(OUString::createFromAscii("test4.rdb").pData, &hReg3, REG_READONLY)) + if (reg_openRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("test4.rdb")).pData, &hReg3, REG_READONLY)) cout << "\n\t44.a). registry test4.rdb is opened for read only\n"; else cout << "\n44.a). registry test4.rdb is opened for read only\n"; diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index 92b1469c7ac6..9e01f0fa4445 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -92,7 +92,7 @@ void OfficeClientMain::testWriter( const Reference< XComponent > & rComponent ) Reference< XTextCursor > rCursor = rText->createTextCursor(); Reference< XTextRange > rRange ( rCursor , UNO_QUERY ); - rText->insertString( rRange, OUString::createFromAscii( "This text has been posted by the officeclient component" ), sal_False ); + rText->insertString( rRange, OUString(RTL_CONSTASCII_USTRINGPARAM("This text has been posted by the officeclient component")), sal_False ); } /******************** @@ -105,7 +105,7 @@ void OfficeClientMain::registerServices( ) Reference < XImplementationRegistration > rImplementationRegistration( m_xSMgr->createInstance( - OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))), UNO_QUERY ); if( ! rImplementationRegistration.is() ) @@ -135,7 +135,7 @@ void OfficeClientMain::registerServices( ) { // register the needed services in the servicemanager rImplementationRegistration->registerImplementation( - OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aDllName, Reference< XSimpleRegistry > () ); } @@ -156,7 +156,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw try { registerServices(); Reference < XInterface > r = - m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ) ); + m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) ); Reference < XUnoUrlResolver > rResolver( r , UNO_QUERY ); r = rResolver->resolve( aArguments.getConstArray()[0] ); @@ -165,7 +165,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw { printf( "got the remote NamingService\n" ); - r = rNamingService->getRegisteredObject(OUString::createFromAscii("StarOffice.ServiceManager")); + r = rNamingService->getRegisteredObject(OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager"))); Reference< XMultiServiceFactory > rRemoteSMgr( r , UNO_QUERY ); @@ -262,7 +262,7 @@ Sequence< OUString > getSupportedServiceNames() if( !pNames ) { static Sequence< OUString > seqNames(2); - seqNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.bridge.example.OfficeClientExample" ); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.example.OfficeClientExample")); pNames = &seqNames; } } diff --git a/remotebridges/source/bridge/remote_bridge.cxx b/remotebridges/source/bridge/remote_bridge.cxx index f63a418c3d50..ac6d5a2770ee 100644 --- a/remotebridges/source/bridge/remote_bridge.cxx +++ b/remotebridges/source/bridge/remote_bridge.cxx @@ -109,7 +109,7 @@ namespace remotebridges_bridge if( 4 != aArguments.getLength() ) { - throw IllegalArgumentException( rtl::OUString::createFromAscii("wrong number of arguments") , + throw IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong number of arguments")) , Reference< XInterface >(), 0 ); } @@ -126,7 +126,7 @@ namespace remotebridges_bridge if( ! rConnection.is() ) { - throw IllegalArgumentException( rtl::OUString::createFromAscii("connection is missing") , + throw IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("connection is missing")) , Reference < XInterface > (), 2 ); } @@ -187,7 +187,7 @@ namespace remotebridges_bridge m_pContext = 0; // forgotten exception when specifying the interface - throw RuntimeException( rtl::OUString::createFromAscii("couldn't create uno-remote-environment") , + throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("couldn't create uno-remote-environment")) , Reference < XInterface > () ); } } @@ -418,9 +418,9 @@ namespace remotebridges_bridge if( !pNames ) { static Sequence< OUString > seqNames(3); - seqNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.bridge.Bridge" ); - seqNames.getArray()[1] = OUString::createFromAscii( "com.sun.star.bridge.IiopBridge" ); - seqNames.getArray()[2] = OUString::createFromAscii( "com.sun.star.bridge.UrpBridge" ); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge")); + seqNames.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.IiopBridge")); + seqNames.getArray()[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UrpBridge")); pNames = &seqNames; } diff --git a/remotebridges/source/dynamicloader/dynamicloader.cxx b/remotebridges/source/dynamicloader/dynamicloader.cxx index 93b7a3b0329c..cc656662fb17 100644 --- a/remotebridges/source/dynamicloader/dynamicloader.cxx +++ b/remotebridges/source/dynamicloader/dynamicloader.cxx @@ -150,8 +150,8 @@ namespace dynamic_loader { const OUString& locationUrl) throw(CannotRegisterImplementationException, RuntimeException); }; - const OUString DynamicLoader::implname = OUString::createFromAscii("com.sun.star.comp.stoc.DynamicLoader"); - const OUString DynamicLoader::servname = OUString::createFromAscii("com.sun.star.loader.Dynamic"); + const OUString DynamicLoader::implname (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.DynamicLoader")); + const OUString DynamicLoader::servname (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.Dynamic")); Sequence<OUString> SAL_CALL DynamicLoader::getSupportedServiceNames_Static() throw() { return Sequence<OUString>(&servname, 1); @@ -332,11 +332,11 @@ namespace dynamic_loader { } // create the keys - OUString keyName = OUString::createFromAscii("/"); + OUString keyName (RTL_CONSTASCII_USTRINGPARAM("/")); keyName += implementationLoaderUrl; keyName += OUString(RTL_CONSTASCII_USTRINGPARAM("_")); keyName += serviceName; - keyName += OUString::createFromAscii("/UNO/SERVICES"); + keyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); Reference<XRegistryKey> xNewKey(xKey->createKey(keyName)); xNewKey->createKey(serviceName); @@ -387,9 +387,9 @@ extern "C" { if (pRegistryKey) { try { - OUString x = OUString::createFromAscii("/"); + OUString x (RTL_CONSTASCII_USTRINGPARAM("/")); x += ::dynamic_loader::DynamicLoader::implname; - x += OUString::createFromAscii("/UNO/SERVICES"); + x += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); Reference<XRegistryKey> xNewKey(pRegistryKey->createKey(x)); diff --git a/remotebridges/source/factory/bridgefactory.cxx b/remotebridges/source/factory/bridgefactory.cxx index cc56cbf1d5db..a52ac0bea2f1 100644 --- a/remotebridges/source/factory/bridgefactory.cxx +++ b/remotebridges/source/factory/bridgefactory.cxx @@ -240,7 +240,7 @@ namespace remotebridges_factory else { // fallback to the old solution, deprecated, should be removed ! - sService = OUString::createFromAscii( "com.sun.star.bridge.Bridge." ); + sService = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.")); sService += sProtocolName; } return sService; diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx index 7430f0a4c3b7..2e2640378973 100644 --- a/sal/osl/os2/file.cxx +++ b/sal/osl/os2/file.cxx @@ -567,7 +567,7 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto if ( pItemImpl->ustrDrive->buffer[pItemImpl->ustrDrive->length-1] != sal_Unicode('\\') ) rtl_uString_newConcat( &pItemImpl->ustrDrive, - pItemImpl->ustrDrive, rtl::OUString::createFromAscii( "\\" ).pData); + pItemImpl->ustrDrive, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\")).pData); *pItem = pItemImpl; } diff --git a/sal/osl/os2/file_path_helper.cxx b/sal/osl/os2/file_path_helper.cxx index 8402da30a606..33a370de028a 100644 --- a/sal/osl/os2/file_path_helper.cxx +++ b/sal/osl/os2/file_path_helper.cxx @@ -63,11 +63,11 @@ const sal_Unicode FPH_CHAR_COLON = (sal_Unicode)':'; inline const rtl::OUString FPH_PATH_SEPARATOR() - { return rtl::OUString::createFromAscii("\\"); } + { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\")); } inline const rtl::OUString FPH_LOCAL_DIR_ENTRY() - { return rtl::OUString::createFromAscii("."); } + { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); } inline const rtl::OUString FPH_PARENT_DIR_ENTRY() - { return rtl::OUString::createFromAscii(".."); } + { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); } /******************************************* * osl_systemPathRemoveSeparator diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx index 395cfea13e41..966f31cecab0 100644 --- a/sal/osl/os2/file_url.cxx +++ b/sal/osl/os2/file_url.cxx @@ -890,7 +890,7 @@ namespace /* private */ bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result) { bool bfound = false; - rtl::OUString path = rtl::OUString::createFromAscii("PATH"); + rtl::OUString path(RTL_CONSTASCII_USTRINGPARAM("PATH")); rtl::OUString env_path; if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData)) diff --git a/sal/osl/os2/path_helper.cxx b/sal/osl/os2/path_helper.cxx index f433e79201f2..bc5e0039aaa6 100644 --- a/sal/osl/os2/path_helper.cxx +++ b/sal/osl/os2/path_helper.cxx @@ -42,8 +42,8 @@ Constants ******************************************************************/ -const rtl::OUString BACKSLASH = rtl::OUString::createFromAscii("\\"); -const rtl::OUString SLASH = rtl::OUString::createFromAscii("/"); +const rtl::OUString BACKSLASH (RTL_CONSTASCII_USTRINGPARAM("\\")); +const rtl::OUString SLASH (RTL_CONSTASCII_USTRINGPARAM("/")); /******************************************************************* osl_systemPathEnsureSeparator diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx index 3edf3d48aafb..aaf59f4ef586 100644 --- a/sal/osl/w32/path_helper.cxx +++ b/sal/osl/w32/path_helper.cxx @@ -44,8 +44,8 @@ Constants ******************************************************************/ -const rtl::OUString BACKSLASH = rtl::OUString::createFromAscii("\\"); -const rtl::OUString SLASH = rtl::OUString::createFromAscii("/"); +const rtl::OUString BACKSLASH (RTL_CONSTASCII_USTRINGPARAM("\\")); +const rtl::OUString SLASH (RTL_CONSTASCII_USTRINGPARAM("/")); /******************************************************************* osl_systemPathEnsureSeparator diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 24918fd5060c..313fd0ec736b 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -62,7 +62,7 @@ extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile //################################################# const sal_Unicode NAME_VALUE_SEPARATOR = TEXT('='); const sal_Char* SPACE = " "; -const rtl::OUString ENV_COMSPEC = rtl::OUString::createFromAscii("COMSPEC"); +const rtl::OUString ENV_COMSPEC (RTL_CONSTASCII_USTRINGPARAM("COMSPEC")); const rtl::OUString QUOTE = rtl::OUString::createFromAscii("\""); namespace /* private */ diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 276ee03626c6..4b02edb332f4 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -105,9 +105,9 @@ inline ::rtl::OString errorToString( const ::osl::FileBase::RC _nError ) rtl::OUString errorToStr( ::osl::FileBase::RC const& nError) { rtl::OUStringBuffer suBuf; - suBuf.append( rtl::OUString::createFromAscii("The returned error is: ") ); + suBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The returned error is: ")) ); suBuf.append( rtl::OStringToOUString(errorToString(nError), RTL_TEXTENCODING_ASCII_US) ); - suBuf.append( rtl::OUString::createFromAscii("!\n") ); + suBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!\n")) ); return suBuf.makeStringAndClear(); } @@ -491,7 +491,7 @@ inline void deleteTestDirectory( const ::rtl::OUString dirname ) // LLA: { // LLA: // t_print("nError == %d\n", nError); // LLA: } - rtl::OUString strError = rtl::OUString::createFromAscii( "In deleteTestDirectory function: remove Directory "); + rtl::OUString strError (RTL_CONSTASCII_USTRINGPARAM("In deleteTestDirectory function: remove Directory ")); strError += aPathURL; CPPUNIT_ASSERT_MESSAGE( strError, ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) ); // LLA: if (! ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT )) @@ -679,11 +679,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r if ( returnVal.equals( rightVal ) ) return aUString; aUString += ::rtl::OUString::createFromAscii(msg); - aUString += ::rtl::OUString::createFromAscii(": the returned value is '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '")); aUString += returnVal; - aUString += ::rtl::OUString::createFromAscii("', but the value should be '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '")); aUString += rightVal; - aUString += ::rtl::OUString::createFromAscii("'."); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); return aUString; } @@ -784,52 +784,52 @@ namespace osl_FileBase void getAbsoluteFileURL::getAbsoluteFileURL_001_1() { - rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/file1") ); + rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/file1")) ); check_getAbsoluteFileURL( aUserDirectoryURL, "relative/file1",::osl::FileBase::E_None, suAssume ); } void getAbsoluteFileURL::getAbsoluteFileURL_001_2() { - rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/file2") ); + rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/file2")) ); check_getAbsoluteFileURL( aUserDirectoryURL, "relative/./file2",::osl::FileBase::E_None, suAssume ); } void getAbsoluteFileURL::getAbsoluteFileURL_001_3() { - rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/file3") ); + rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/file3")) ); check_getAbsoluteFileURL( aUserDirectoryURL, "relative/../file3",::osl::FileBase::E_None, suAssume ); } void getAbsoluteFileURL::getAbsoluteFileURL_001_4() { - rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/file4") ); + rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/file4")) ); check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/../file4",::osl::FileBase::E_None, suAssume ); } void getAbsoluteFileURL::getAbsoluteFileURL_001_5() { rtl::OUString suAssume; #if ( defined UNX ) - suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/") ); + suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/")) ); #else - suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative") ); + suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative")) ); #endif check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/.",::osl::FileBase::E_None, suAssume ); } void getAbsoluteFileURL::getAbsoluteFileURL_001_6() { - rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.relative") ); + rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.relative")) ); check_getAbsoluteFileURL( aUserDirectoryURL, "./.relative",::osl::FileBase::E_None, suAssume ); } void getAbsoluteFileURL::getAbsoluteFileURL_001_7() { rtl::OUString suAssume; #if (defined UNX ) - suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.a/") ); + suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.a/")) ); #else //windows - suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.a") ); + suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.a")) ); #endif check_getAbsoluteFileURL( aUserDirectoryURL, "./.a/mydir/..",::osl::FileBase::E_None, suAssume ); } void getAbsoluteFileURL::getAbsoluteFileURL_001_8() { - rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/tmp/ok") ); + rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp/ok")) ); #if ( defined UNX ) || ( defined OS2 ) check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_None, suAssume ); #else @@ -840,8 +840,8 @@ namespace osl_FileBase { #if ( defined UNX ) || ( defined OS2 ) //Link is not defined in Windows ::rtl::OUString aUStr_AbsURL, aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); - ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/link.file"); - ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/canonical.name"); + ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/link.file")); + ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/canonical.name")); rtl::OString strLinkFileName, strSrcFileName; strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US ); @@ -851,7 +851,7 @@ namespace osl_FileBase sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() ); CPPUNIT_ASSERT( fd == 0 ); rtl::OString sLnkURL = OUStringToOString( aLnkURL1, RTL_TEXTENCODING_ASCII_US ); - rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/canonical.name") ); + rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/canonical.name")) ); check_getAbsoluteFileURL( aUserDirectoryURL, sLnkURL, ::osl::FileBase::E_None, suAssume ); deleteTestFile( aCanURL1 ); fd = remove( strLinkFileName.getStr() ); @@ -865,12 +865,12 @@ namespace osl_FileBase void getAbsoluteFileURL::getAbsoluteFileURL_004() { //create two level directories under $Temp/PID/ - ::rtl::OUString aUStrUpBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1"); + ::rtl::OUString aUStrUpBase = aUserDirectoryURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test1")); createTestDirectory( aUStrUpBase ); - ::rtl::OUString aUStrBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1/dir1"); + ::rtl::OUString aUStrBase = aUserDirectoryURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test1/dir1")); createTestDirectory( aUStrBase ); - ::rtl::OUString suAssume = aUserDirectoryURL.concat( ::rtl::OUString::createFromAscii("/mytestfile") ); + ::rtl::OUString suAssume = aUserDirectoryURL.concat( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/mytestfile")) ); check_getAbsoluteFileURL( aUStrBase, "../../mytestfile" , ::osl::FileBase::E_None, suAssume ); deleteTestDirectory( aUStrBase ); deleteTestDirectory( aUStrUpBase ); @@ -1229,9 +1229,9 @@ namespace osl_FileBase sal_Bool bOk = compareFileName( aUStr, aResultURL ); - ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getSystemPathFromFileURL(' "); + ::rtl::OUString suError(RTL_CONSTASCII_USTRINGPARAM("test for getSystemPathFromFileURL(' ")); suError += aNormalURL; - suError += ::rtl::OUString::createFromAscii(" ') function:use an absolute file URL, "); + suError += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ') function:use an absolute file URL, ")); suError += outputError(aUStr, aResultURL); CPPUNIT_ASSERT_MESSAGE( suError, ( osl::FileBase::E_None == nError ) && ( sal_True == bOk ) ); @@ -1250,9 +1250,9 @@ namespace osl_FileBase sal_Bool bOk = compareFileName( aUStr, aResultURL ); - ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getSystemPathFromFileURL(' "); + ::rtl::OUString suError(RTL_CONSTASCII_USTRINGPARAM("test for getSystemPathFromFileURL(' ")); suError += aNormalURL; - suError += ::rtl::OUString::createFromAscii(" ') function:use a CJK coded absolute URL, "); + suError += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ') function:use a CJK coded absolute URL, ")); suError += outputError(aUStr, aResultURL); deleteTestDirectory( aTmpName10 ); @@ -2652,8 +2652,8 @@ namespace osl_FileStatus sal_Int32 fd; ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); - ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/link.file"); - ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/tmpname"); + ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/link.file")); + ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/tmpname")); rtl::OString strLinkFileName; rtl::OString strSrcFileName; @@ -2667,7 +2667,7 @@ namespace osl_FileStatus // testDirectory is "/tmp/PID/tmpdir/" ::osl::Directory testDirectory( aTmpName3 ); ::osl::FileBase::RC nError1 = testDirectory.open( ); - ::rtl::OUString aFileName = ::rtl::OUString::createFromAscii("link.file"); + ::rtl::OUString aFileName (RTL_CONSTASCII_USTRINGPARAM("link.file")); sal_Bool bOk = sal_False; while (1) { nError1 = testDirectory.getNextItem( rItem_link, 4 ); @@ -2839,7 +2839,7 @@ namespace osl_FileStatus // LLA: { // LLA: #if defined ( SOLARIS ) //Socket file may differ in Windows // LLA: // nError1 = ::osl::DirectoryItem::get( aTypeURL1, m_aSocketItem ); -// LLA: nError1 = ::osl::DirectoryItem::get( rtl::OUString::createFromAscii("/dev/null"), m_aSocketItem ); +// LLA: nError1 = ::osl::DirectoryItem::get( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/dev/null")), m_aSocketItem ); // LLA: printError(nError1); // LLA: CPPUNIT_ASSERT_MESSAGE("get Socket type file failed", ::osl::FileBase::E_None == nError1 ); // LLA: @@ -3019,7 +3019,7 @@ namespace osl_FileStatus #else //Windows version void getAttributes_004( ) { - ::rtl::OUString aUserHiddenFileURL = ::rtl::OUString::createFromAscii("file:///c:/AUTOEXEC.BAT"); + ::rtl::OUString aUserHiddenFileURL (RTL_CONSTASCII_USTRINGPARAM("file:///c:/AUTOEXEC.BAT")); nError = ::osl::DirectoryItem::get( aUserHiddenFileURL, rItem_hidden ); //printFileName( aUserHiddenFileURL ); CPPUNIT_ASSERT_MESSAGE("get item fail", nError == FileBase::E_None ); @@ -3328,8 +3328,8 @@ namespace osl_FileStatus { //create a link file; ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); - ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/link.file"); - ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpname"); + ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/link.file")); + ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname")); rtl::OString strLinkFileName, strSrcFileName; strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US ); @@ -4516,10 +4516,10 @@ namespace osl_File //create directory $TEMP/tmpname/tmpdir createTestDirectory( aTmpName8 ); //move directory $TEMP/tmpname to $TEMP/tmpname/tmpdir/tmpname - rtl::OUString newName = aTmpName8 + OUString::createFromAscii("/tmpname"); + rtl::OUString newName = aTmpName8 + OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname")); //printFileName( newName ); nError1 = ::osl::File::move( aTmpName3, newName ); - //deleteTestDirectory( newName + OUString::createFromAscii("/tmpname") ); + //deleteTestDirectory( newName + OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname")) ); //deleteTestDirectory( newName ); deleteTestDirectory( aTmpName8 ); deleteTestDirectory( aTmpName6 ); @@ -5695,8 +5695,8 @@ namespace osl_Directory #ifdef UNX sal_Bool bOK = sal_False; ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys ); - ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/link.file"); - ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/tmpname"); + ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/link.file")); + ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/tmpname")); rtl::OString strLinkFileName, strSrcFileName; strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US ); strSrcFileName = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US ); @@ -5708,7 +5708,7 @@ namespace osl_Directory //open a directory nError1 = testDirectory.open( ); - ::rtl::OUString aFileName = ::rtl::OUString::createFromAscii("link.file"); + ::rtl::OUString aFileName (RTL_CONSTASCII_USTRINGPARAM("link.file")); while (1) { nError1 = testDirectory.getNextItem( rItem, 4 ); @@ -6046,7 +6046,7 @@ namespace osl_Directory nError1 = ::osl::Directory::remove( aTmpName3 ); deleteTestFile( aTmpName4 ); deleteTestDirectory( aTmpName3 ); - ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for remove function: try to remove a directory that is not empty.") + errorToStr( nError1 ); + ::rtl::OUString suError = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test for remove function: try to remove a directory that is not empty.")) + errorToStr( nError1 ); #if defined ( SOLARIS ) //on UNX, the implementation uses rmdir(), which EEXIST is thrown on Solaris when the directory is not empty, refer to: 'man -s 2 rmdir', while on linux, ENOTEMPTY is thrown. //EEXIST The directory contains entries other than those for "." and "..". @@ -6243,7 +6243,7 @@ namespace osl_Directory void with_UNC_path() { - OUString tp_unc = OUString::createFromAscii("\\\\Tra-1\\TRA_D\\hello\\world\\"); + OUString tp_unc (RTL_CONSTASCII_USTRINGPARAM("\\\\Tra-1\\TRA_D\\hello\\world\\")); OUString tp_url; FileBase::getFileURLFromSystemPath(tp_unc, tp_url); diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 291a8022036c..1796248d5f6a 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -82,7 +82,7 @@ public: FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(WRITE_DEST_PATH), dest_url); File tmp_file(dest_url); - rtl::OUString suErrorMsg = rtl::OUString::createFromAscii("File creation failed: ")+ dest_url; + rtl::OUString suErrorMsg = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("File creation failed: "))+ dest_url; FileBase::RC err = tmp_file.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); CPPUNIT_ASSERT_MESSAGE( suErrorMsg, err == FileBase::E_None || err == FileBase::E_EXIST ); diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index 7ee367d95ae9..0da5701dd2c2 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::OUString::createFromAscii( "Module_DLL.dll" ) ); + ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("Module_DLL.dll") ); #else - ::rtl::OUString libPath( rtl::OUString::createFromAscii( "libModule_DLL.so" ) ); + ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("libModule_DLL.so") ); #endif ::rtl::OUString dirPath, dllPath; @@ -92,7 +92,7 @@ inline void printFileName( const ::rtl::OUString & str ) inline sal_Bool isURL( const ::rtl::OUString pathname ) { - ::rtl::OUString aPreURL( rtl::OUString::createFromAscii( "file:///" ) ); + ::rtl::OUString aPreURL( RTL_CONSTASCII_USTRINGPARAM("file:///") ); return ( ( pathname.indexOf( aPreURL ) == 0 ) ? sal_True : sal_False ); } @@ -252,7 +252,7 @@ namespace osl_Module void getUrlFromAddress_002( ) { ::osl::Module aMod( getDllURL( ) ); - FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) ); + FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) ); OUString aFileURL; bRes = osl::Module::getUrlFromAddress( ( void* )pFunc, aFileURL ); @@ -302,12 +302,12 @@ namespace osl_Module { #ifdef UNX //Can not get a CJK directory already exist, so here create one. Perhaps reason is encoding problem. - ::rtl::OUString aPidDirURL = rtl::OUString::createFromAscii( "file:///tmp/" ) + ::rtl::OUString::valueOf( ( long )getpid( ) ); + ::rtl::OUString aPidDirURL = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///tmp/")) + ::rtl::OUString::valueOf( ( long )getpid( ) ); ::rtl::OUString aMyDirURL = aPidDirURL + aKname; createTestDirectory( aPidDirURL ); createTestDirectory( aMyDirURL ); - ::rtl::OUString aDLLURL = aMyDirURL + rtl::OUString::createFromAscii( "/libModule_DLL.so" ); + ::rtl::OUString aDLLURL = aMyDirURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/libModule_DLL.so")); //check if the lib exist. //FIXME: if assert condition is false, the case will return, so the directory will not be clean-up CPPUNIT_ASSERT_MESSAGE( "#Source file is not exist. please manually clean-up directory and file under /tmp", ifFileExist( getDllURL( ) ) == sal_True ); @@ -317,7 +317,7 @@ namespace osl_Module CPPUNIT_ASSERT_MESSAGE( "#This file is not exist, copy failed. please manually clean-up directory and file under /tmp", ifFileExist( aDLLURL ) == sal_True ); //test if can create a normal file - ::rtl::OUString aFileURL = aMyDirURL + rtl::OUString::createFromAscii( "/test_file" ); + ::rtl::OUString aFileURL = aMyDirURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test_file")); ::osl::File testFile( aFileURL ); nError = testFile.open( OpenFlag_Create ); CPPUNIT_ASSERT_MESSAGE( "#create failed. please manually clean-up directory and file under /tmp", nError == ::osl::FileBase::E_None ); @@ -416,7 +416,7 @@ namespace osl_Module void getSymbol_001( ) { ::osl::Module aMod( getDllURL( ) ); - FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) ); + FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) ); bRes = sal_False; if ( pFunc ) bRes = pFunc( bRes ); @@ -457,7 +457,7 @@ namespace osl_Module void optr_oslModule_002( ) { ::osl::Module aMod( getDllURL( ) ); - ::rtl::OUString funcName(::rtl::OUString::createFromAscii( "firstfunc" ) ); + ::rtl::OUString funcName( RTL_CONSTASCII_USTRINGPARAM("firstfunc") ); FuncPtr pFunc = ( FuncPtr ) osl_getSymbol( (oslModule)aMod, funcName.pData ); bRes = sal_False; @@ -487,7 +487,7 @@ namespace osl_Module void getFunctionSymbol_001( ) { ::osl::Module aMod( getDllURL( ) ); - oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString::createFromAscii( "firstfunc" ) ); + oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) ); ::rtl::OUString aLibraryURL; bRes = ::osl::Module::getUrlFromAddress( oslFunc, aLibraryURL); aMod.unload(); diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 27c0c8dcff97..0304b00da133 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -129,9 +129,9 @@ inline void printPipeError( ::osl::Pipe aPipe ) //------------------------------------------------------------------------ // pipe name and transfer contents //------------------------------------------------------------------------ -const rtl::OUString aTestPipeName = rtl::OUString::createFromAscii( "testpipe2" ); -const rtl::OUString aTestPipe1 = rtl::OUString::createFromAscii( "testpipe1" ); -const rtl::OUString aTestString = rtl::OUString::createFromAscii( "Sun Microsystems" ); +const rtl::OUString aTestPipeName(RTL_CONSTASCII_USTRINGPARAM("testpipe2")); +const rtl::OUString aTestPipe1(RTL_CONSTASCII_USTRINGPARAM("testpipe1")); +const rtl::OUString aTestString(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems")); const OString m_pTestString1("Sun Microsystems"); const OString m_pTestString2("test pipe PASS/OK"); diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index eaee6bdc72af..d3cea39002bc 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -60,9 +60,9 @@ #include <string> #if defined(WNT) || defined(OS2) - const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("osl_process_child.exe"); + const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child.exe")); #else - const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("osl_process_child"); + const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child")); #endif @@ -96,7 +96,7 @@ inline ::rtl::OUString getExecutablePath( void ) osl::Module::getUrlFromAddress( ( void* ) &getExecutablePath, dirPath ); dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') ); dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1); - dirPath += rtl::OUString::createFromAscii("bin"); + dirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin")); return dirPath; } @@ -116,15 +116,15 @@ class Test_osl_joinProcess : public CppUnit::TestFixture public: Test_osl_joinProcess() : - join_param_(OUString::createFromAscii("-join")), - wait_time_(OUString::createFromAscii("1")), + join_param_(OUString(RTL_CONSTASCII_USTRINGPARAM("-join"))), + wait_time_(OUString(RTL_CONSTASCII_USTRINGPARAM("1"))), parameters_count_(2) { parameters_[0] = join_param_.pData; parameters_[1] = wait_time_.pData; suCWD = getExecutablePath(); suExecutableFileURL = suCWD; - suExecutableFileURL += rtl::OUString::createFromAscii("/"); + suExecutableFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); suExecutableFileURL += EXECUTABLE_NAME; } @@ -386,13 +386,13 @@ public: //------------------------------------------------ // ctor Test_osl_executeProcess() : - env_param_(OUString::createFromAscii("-env")), + env_param_(OUString(RTL_CONSTASCII_USTRINGPARAM("-env"))), parameters_count_(2) { parameters_[0] = env_param_.pData; suCWD = getExecutablePath(); suExecutableFileURL = suCWD; - suExecutableFileURL += rtl::OUString::createFromAscii("/"); + suExecutableFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); suExecutableFileURL += EXECUTABLE_NAME; } @@ -604,7 +604,7 @@ public: void osl_execProc_test_batch() { oslProcess process; - rtl::OUString suBatch = suCWD + rtl::OUString::createFromAscii("/") + rtl::OUString::createFromAscii("batch.bat"); + rtl::OUString suBatch = suCWD + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("batch.bat")); oslProcessError osl_error = osl_executeProcess( suBatch.pData, NULL, diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index dd2b3789bf1c..e6ce837bbbbe 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -193,8 +193,8 @@ namespace osl_AcceptorSocket void listen_accept_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -215,9 +215,9 @@ namespace osl_AcceptorSocket void listen_accept_002() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index e1dbf2be8764..6bfc718c9967 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -158,9 +158,9 @@ namespace osl_ConnectorSocket void connect_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT2 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT2 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -187,9 +187,9 @@ namespace osl_ConnectorSocket //non-blocking mode connect? void connect_002() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); asAcceptorSocket.enableNonBlockingMode( sal_True ); @@ -213,8 +213,8 @@ namespace osl_ConnectorSocket // how to design senarios that will return osl_Socket_Interrupted, osl_Socket_TimedOut void connect_003() { - ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 ); csConnectorSocket.enableNonBlockingMode( sal_False ); @@ -231,7 +231,7 @@ namespace osl_ConnectorSocket // really an error in non-blocking mode void connect_004() { - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 ); csConnectorSocket.enableNonBlockingMode( sal_True ); diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index 5a1acff9ef7b..9ff799e95e98 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -149,7 +149,7 @@ protected: public: TalkerThread( ): - saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ) + saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ) { } @@ -170,7 +170,7 @@ protected: void SAL_CALL run( ) { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); if ( dsSocket.bind( saLocalSocketAddr ) == sal_False ) { @@ -189,7 +189,7 @@ protected: public: sal_Char pRecvBuffer[30]; ListenerThread( ): - saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ) + saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ) { pRecvBuffer[0] = '\0'; } @@ -215,7 +215,7 @@ public: void sr_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); ::osl::DatagramSocket dsSocket; dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); dsSocket.bind( saLocalSocketAddr ); @@ -235,7 +235,7 @@ public: void sr_002() { - ::osl::SocketAddr saListenSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; //listener thread construct a DatagramSocket, recvFrom waiting for data, then main thread sendto data @@ -260,7 +260,7 @@ public: //sendTo error, return -1; recvFrom error, return -1 void sr_003() { - ::osl::SocketAddr saListenSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; // Transport endpoint is not connected sal_Int32 nSend = dsSocket.sendTo( saListenSocketAddr, pTestString2, strlen( pTestString2 ) + 1 ); @@ -270,8 +270,8 @@ public: void sr_004() { - ::osl::SocketAddr saListenSocketAddr1( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT10 ); - ::osl::SocketAddr saListenSocketAddr2( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; dsSocket.enableNonBlockingMode( sal_True ); diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 98c32ee7b32a..c3505fad72e8 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -195,11 +195,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r if ( returnVal.equals( rightVal ) ) return aUString; aUString += ::rtl::OUString::createFromAscii(msg); - aUString += ::rtl::OUString::createFromAscii(": the returned value is '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '")); aUString += returnVal; - aUString += ::rtl::OUString::createFromAscii("', but the value should be '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '")); aUString += rightVal; - aUString += ::rtl::OUString::createFromAscii("'."); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); return aUString; } @@ -744,11 +744,11 @@ namespace osl_SocketAddr sal_Bool bOk = compareUString(suHost, suHost2); - rtl::OUString suError = rtl::OUString::createFromAscii("Host names should be the same. From SocketAddr.getLocalHostname() it is'"); + rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'")); suError += suHost; - suError += rtl::OUString::createFromAscii("', from getThisHostname() it is '"); + suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '")); suError += suHost2; - suError += rtl::OUString::createFromAscii("'."); + suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); CPPUNIT_ASSERT_MESSAGE(suError, sal_True == bOk); } @@ -936,7 +936,7 @@ namespace osl_SocketAddr // LLA: this function does not work in company (Linux, Windows) but at home void getHostname_002() { - rtl::OUString suHostname = rtl::OUString::createFromAscii("cn-1.germany.sun.com"); + rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com")); rtl::OUString aHostIP = getIPbyName( oustring2char( suHostname ) ); ::osl::SocketAddr saSocketAddr( aHostName1, IP_PORT_FTP ); @@ -1345,7 +1345,7 @@ namespace osl_SocketAddr // LLA: IMHO localhost, or hostname by itself should be ok. rtl::OUString suThisHost = getThisHostname( ); bool bOk = false; - if (suThisHost.equals(rtl::OUString::createFromAscii("localhost"))) + if (suThisHost.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")))) { bOk = true; } @@ -1402,7 +1402,7 @@ namespace osl_SocketAddr /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, - const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) ); + const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) ); */ class gettheServicePort : public CppUnit::TestFixture @@ -1430,7 +1430,7 @@ namespace osl_SocketAddr void gettheServicePort_004() { CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.", - OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString::createFromAscii( "notexist" ), aProtocolUDP ) ); + OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), aProtocolUDP ) ); } CPPUNIT_TEST_SUITE( gettheServicePort ); @@ -1772,7 +1772,7 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); sSocket.getLocalAddr( saLocalSocketAddr ); @@ -1820,7 +1820,7 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( ) ); @@ -1851,7 +1851,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::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"); + ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case")); #endif CPPUNIT_ASSERT_MESSAGE( suError, sal_False ); @@ -1865,10 +1865,10 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )), - ::rtl::OUString::createFromAscii("34463"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")), "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned"); sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 && sSocket.getLocalPort( ) <= 65535); @@ -1917,7 +1917,7 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( 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 2f15d8539f2f..a6a681a8a731 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -376,7 +376,7 @@ namespace osl_Socket { //#if defined(LINUX) ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("127.0.0.1") ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -395,7 +395,7 @@ namespace osl_Socket void close_003() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("0.0.0.0") ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0.0.0")) ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -437,13 +437,13 @@ namespace osl_Socket void getLocalAddr_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT8 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT8 ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); sSocket.getLocalAddr( saLocalSocketAddr ); @@ -485,13 +485,13 @@ namespace osl_Socket void getLocalPort_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT7 ); // aHostIp1 localhost + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT7 ); // aHostIp1 localhost ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( ) ); @@ -509,7 +509,7 @@ namespace osl_Socket */ void getLocalPort_002() { - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_TELNET); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_TELNET); #ifdef WNT ::osl::Socket sSocket(sHandle); sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True); @@ -522,7 +522,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::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"); + ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case")); #endif CPPUNIT_ASSERT_MESSAGE( suError, sal_False ); @@ -536,10 +536,10 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )), - ::rtl::OUString::createFromAscii("34463"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")), "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned"); sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 && sSocket.getLocalPort( ) <= 65535); @@ -583,12 +583,12 @@ namespace osl_Socket { ::osl::Socket sSocket(sHandle); //port number from IP_PORT_HTTP1 to IP_PORT_MYPORT6, mindyliu - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT6 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT6 ); sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); sal_Bool bOK; ::rtl::OUString suError; @@ -610,14 +610,14 @@ namespace osl_Socket void getLocalHost_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_POP3); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_POP3); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr ); //Invalid IP, so bind should fail - sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString::createFromAscii("") ) ; - ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString::createFromAscii(""), "test for getLocalHost function: getLocalHost with invalid SocketAddr"); + sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ) ; + ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString(), "test for getLocalHost function: getLocalHost with invalid SocketAddr"); CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); } @@ -664,9 +664,9 @@ namespace osl_Socket void getPeer_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); /// launch server socket @@ -740,7 +740,7 @@ namespace osl_Socket void bind_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_NETBIOS ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_NETBIOS ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1); // sal_True); @@ -792,9 +792,9 @@ namespace osl_Socket void isRecvReady_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT1 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT1 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True); @@ -855,9 +855,9 @@ namespace osl_Socket void isSendReady_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1222,7 +1222,7 @@ namespace osl_Socket void enableNonBlockingMode_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1260,7 +1260,7 @@ namespace osl_Socket void isNonBlockingMode_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1311,7 +1311,7 @@ namespace osl_Socket void clearError_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_HTTP2 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_HTTP2 ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail" @@ -1353,7 +1353,7 @@ namespace osl_Socket void getError_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); ::osl::SocketAddr saLocalSocketAddr; CPPUNIT_ASSERT_MESSAGE( "test for getError function: should get no error.", @@ -1363,7 +1363,7 @@ namespace osl_Socket void getError_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_FTP ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_FTP ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail" diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index 953d43548e6c..086123805e4f 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -116,11 +116,11 @@ namespace osl_SocketAddr sal_Bool bOk = compareUString(suHost, suHost2); - rtl::OUString suError = rtl::OUString::createFromAscii("Host names should be the same. From SocketAddr.getLocalHostname() it is'"); + rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'")); suError += suHost; - suError += rtl::OUString::createFromAscii("', from getThisHostname() it is '"); + suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '")); suError += suHost2; - suError += rtl::OUString::createFromAscii("'."); + suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); CPPUNIT_ASSERT_MESSAGE(suError, sal_True == bOk); } @@ -128,7 +128,7 @@ namespace osl_SocketAddr void ctors_copy() { /// SocketAddr copy constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); ::osl::SocketAddr saCopySocketAddr( saSocketAddr ); sal_Int32 nPort = saCopySocketAddr.getPort( ); @@ -139,7 +139,7 @@ namespace osl_SocketAddr void ctors_copy_no_001() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); @@ -156,7 +156,7 @@ namespace osl_SocketAddr void ctors_copy_no_002() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY ); @@ -169,7 +169,7 @@ namespace osl_SocketAddr void ctors_copy_handle_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) ); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr copy handle constructor function: copy another Socket's handle, get its port to check copy effect.", @@ -178,7 +178,7 @@ namespace osl_SocketAddr void ctors_copy_handle_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) ); saSocketAddrCopy.setPort( IP_PORT_HTTP2 ); @@ -189,7 +189,7 @@ namespace osl_SocketAddr void ctors_hostname_port_001() { /// tcpip-specif constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); printUString( saSocketAddr.getHostname( ), "ctors_hostname_port_001:getHostname"); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: do a constructor using tcpip spec, check the result.", @@ -202,7 +202,7 @@ namespace osl_SocketAddr void ctors_hostname_port_002() { /// tcpip-specif constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT2 ); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: using an invalid IP address, the socketaddr ctors should fail", sal_False == saSocketAddr.is( )); } @@ -238,7 +238,7 @@ namespace osl_SocketAddr // refer to setPort_003() void is_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_INVAL ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_INVAL ); CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid port number", sal_True == saSocketAddr.is( ) ); @@ -246,7 +246,7 @@ namespace osl_SocketAddr void is_003() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid Ip number", sal_True != saSocketAddr.is( ) ); @@ -278,7 +278,7 @@ namespace osl_SocketAddr void getHostname_000() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.107"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP ); rtl::OUString suResult = saSocketAddr.getHostname( 0 ); } @@ -290,16 +290,16 @@ namespace osl_SocketAddr */ void getHostname_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.107"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP ); rtl::OUString suResult = saSocketAddr.getHostname( 0 ); - rtl::OUString suError = outputError(suResult, rtl::OUString::createFromAscii("sceri.PRC.Sun.COM"), "test for getHostname(0)"); - sal_Bool bOK = compareUString( suResult, rtl::OUString::createFromAscii("sceri.PRC.Sun.COM") ); + rtl::OUString suError = outputError(suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")), "test for getHostname(0)"); + sal_Bool bOK = compareUString( suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")) ); // search the returned hostname in /etc/hosts, if find, and the IP in the row is same as IP // in the Addr, it's right also. if ( bOK == sal_False) { rtl::OString aString = ::rtl::OUStringToOString( suResult, RTL_TEXTENCODING_ASCII_US ); - if ( compareUString( getIPbyName( aString ), rtl::OUString::createFromAscii("129.158.217.107") ) == sal_True ) + if ( compareUString( getIPbyName( aString ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")) ) == sal_True ) bOK = sal_True; } CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK); @@ -309,11 +309,11 @@ namespace osl_SocketAddr // LLA: this function does not work in company (Linux, Windows) but at home void getHostname_002() { - rtl::OUString suHostname = rtl::OUString::createFromAscii("cn-1.germany.sun.com"); + rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com")); rtl::OString aString = ::rtl::OUStringToOString( suHostname, RTL_TEXTENCODING_ASCII_US ); rtl::OUString aHostIP = getIPbyName( aString ); - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setHostname( suHostname ); CPPUNIT_ASSERT_MESSAGE("#SocketAddr.setHostname failed", sal_True == bOK ); oslSocketResult aResult; @@ -353,7 +353,7 @@ namespace osl_SocketAddr public: void getPort_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); CPPUNIT_ASSERT_MESSAGE( "test for getPort() function: get a normal port number.", IP_PORT_FTP == saSocketAddr.getPort( ) ); @@ -361,7 +361,7 @@ namespace osl_SocketAddr void getPort_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_INVAL ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_INVAL ); //t_print("#getPort_002: Port number is %d \n", saSocketAddr.getPort( )); @@ -372,7 +372,7 @@ namespace osl_SocketAddr //2. SocketAddr family is not osl_Socket_FamilyInet, but case 2 could not be constructed void getPort_003() { - rtl::OUString suInvalidIP = rtl::OUString::createFromAscii("123.345.67.89"); + rtl::OUString suInvalidIP (RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")); ::osl::SocketAddr saSocketAddr( suInvalidIP, IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE( "test for getPort( ) function: give an invalid IP to a SocketAddr, get the port to see returned value. ", @@ -399,7 +399,7 @@ namespace osl_SocketAddr public: void setPort_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for setPort() function: modify a port number setting, and check it.", @@ -417,7 +417,7 @@ namespace osl_SocketAddr */ void setPort_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_ZERO ); oslSocket sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp ); @@ -436,7 +436,7 @@ namespace osl_SocketAddr void setPort_003() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_INVAL ); //on Linux, getPort return 34463 //t_print("#Port number is %d \n", saSocketAddr.getPort( )); @@ -449,7 +449,7 @@ namespace osl_SocketAddr /* this is not a inet-addr => can't set port */ void setPort_004() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_FTP); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE( "test for setPort( ) function: set an invalid address with valid port. it should return error.", @@ -486,8 +486,8 @@ namespace osl_SocketAddr public: void setAddr_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); - saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString::createFromAscii("127.0.0.1") ) ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ) ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 ); sal_Bool bOK = sal_False; @@ -517,7 +517,7 @@ namespace osl_SocketAddr void getAddr_001() { oslSocketResult SocketResult; - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( &SocketResult ); sal_Bool bOK = sal_False; @@ -550,8 +550,8 @@ namespace osl_SocketAddr public: void operator_equal_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; sal_Bool bOK = sal_False; @@ -568,8 +568,8 @@ namespace osl_SocketAddr void operator_equal_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.199"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.199")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; CPPUNIT_ASSERT_MESSAGE( "after assign, the assigned SocketAddr is not same as the original Addr", @@ -583,8 +583,8 @@ namespace osl_SocketAddr void operator_equal_const_001() { - const ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; sal_Bool bOK = sal_False; @@ -600,8 +600,8 @@ namespace osl_SocketAddr void operator_equal_const_002() { - const ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; saSocketAddrEqual.setPort( IP_PORT_HTTP1 ); @@ -612,9 +612,9 @@ namespace osl_SocketAddr void operator_equal_assign_001() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); - ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); oslSocketAddr poslSocketAddr = pSocketAddr->getHandle( ); //if( m_handle ) osl_destroySocketAddr( m_handle ); so pSocketAddrAssign had been destroyed and then point to pSocketAddr pSocketAddrAssign->assign(poslSocketAddr, SAL_NO_COPY); @@ -627,8 +627,8 @@ namespace osl_SocketAddr void operator_is_equal_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrequal( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two identical Address.", sal_True == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) ); @@ -636,8 +636,8 @@ namespace osl_SocketAddr void operator_is_equal_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP); - ::osl::SocketAddr saSocketAddrequal( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two different Address.", sal_False == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) ); @@ -667,7 +667,7 @@ namespace osl_SocketAddr void getSocketAddrHandle_001() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY ); @@ -680,7 +680,7 @@ namespace osl_SocketAddr void getSocketAddrHandle_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("deuce.PRC.Sun.COM"), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("deuce.PRC.Sun.COM")), IP_PORT_MYPORT4 ); oslSocketAddr poslSocketAddr = saSocketAddr.getHandle( ); sal_Bool bOK = ( saSocketAddr == poslSocketAddr ); @@ -725,7 +725,7 @@ namespace osl_SocketAddr // LLA: IMHO localhost, or hostname by itself should be ok. rtl::OUString suThisHost = getThisHostname( ); bool bOk = false; - if (suThisHost.equals(rtl::OUString::createFromAscii("localhost"))) + if (suThisHost.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")))) { bOk = true; } @@ -761,7 +761,7 @@ namespace osl_SocketAddr void resolveHostname_001() { ::osl::SocketAddr saSocketAddr; - ::osl::SocketAddr::resolveHostname( rtl::OUString::createFromAscii("127.0.0.1"), saSocketAddr ); + ::osl::SocketAddr::resolveHostname( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), saSocketAddr ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 ); sal_Bool bOK = sal_False; @@ -782,7 +782,7 @@ namespace osl_SocketAddr /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, - const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) ); + const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) ); */ class gettheServicePort : public CppUnit::TestFixture @@ -790,8 +790,8 @@ namespace osl_SocketAddr public: void gettheServicePort_001() { - rtl::OUString suServiceFTP = rtl::OUString::createFromAscii( "ftp" ); - rtl::OUString suProtocolTCP = rtl::OUString::createFromAscii( "tcp" ); + rtl::OUString suServiceFTP (RTL_CONSTASCII_USTRINGPARAM("ftp")); + rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp")); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get ftp service port on TCP protocol.", IP_PORT_FTP== ::osl::SocketAddr::getServicePort( suServiceFTP, suProtocolTCP ) ); @@ -799,8 +799,8 @@ namespace osl_SocketAddr void gettheServicePort_002() { - rtl::OUString suServiceTELNET = rtl::OUString::createFromAscii( "telnet" ); - rtl::OUString suProtocolTCP = rtl::OUString::createFromAscii( "tcp" ); + rtl::OUString suServiceTELNET (RTL_CONSTASCII_USTRINGPARAM("telnet")); + rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp")); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get telnet service port on TCP protocol.", IP_PORT_TELNET== ::osl::SocketAddr::getServicePort( suServiceTELNET, suProtocolTCP ) ); } @@ -808,17 +808,17 @@ namespace osl_SocketAddr void gettheServicePort_003() { //Solaris has no service called "https", please see /etc/services - rtl::OUString suServiceNETBIOS = rtl::OUString::createFromAscii( "netbios-dgm" ); - rtl::OUString suProtocolUDP = rtl::OUString::createFromAscii( "udp" ); + rtl::OUString suServiceNETBIOS (RTL_CONSTASCII_USTRINGPARAM("netbios-dgm")); + rtl::OUString suProtocolUDP (RTL_CONSTASCII_USTRINGPARAM("udp")); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get netbios-ssn service port on UDP protocol.", IP_PORT_NETBIOS_DGM == ::osl::SocketAddr::getServicePort( suServiceNETBIOS, suProtocolUDP ) ); } void gettheServicePort_004() { - rtl::OUString suProtocolUDP = rtl::OUString::createFromAscii( "udp" ); + rtl::OUString suProtocolUDP(RTL_CONSTASCII_USTRINGPARAM( "udp" )); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.", - OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString::createFromAscii( "notexist" ), suProtocolUDP ) ); + OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), suProtocolUDP ) ); } CPPUNIT_TEST_SUITE( gettheServicePort ); @@ -839,7 +839,7 @@ namespace osl_SocketAddr public: void getFamilyOfSocketAddr_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( ); CPPUNIT_ASSERT_EQUAL( osl_Socket_FamilyInet, diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index 939c01b24a04..2164dbcd72b3 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -138,7 +138,7 @@ protected: void SAL_CALL run( ) { ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); ::osl::StreamSocket ssStreamConnection; //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket @@ -248,7 +248,7 @@ protected: public: ClientSocketThread( osl::Condition &_aCond ): m_aCondition(_aCond), - m_saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ), + m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ), m_csConnectorSocket( ) { m_id = getIdentifier( ); @@ -331,7 +331,7 @@ protected: void SAL_CALL run( ) { - ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); ::osl::ConnectorSocket m_aConnectorSocket; if (! m_aTargetSocketAddr.is()) @@ -412,7 +412,7 @@ protected: { t_print("start WriteSocketThread\n"); ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); if (! saLocalSocketAddr.is()) { t_print("LocalSocketAddr was NOT created successfully!\n"); @@ -636,7 +636,7 @@ namespace osl_StreamSocket void send_recv2() { ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); ::osl::StreamSocket ssStreamConnection; sal_Char pReadBuffer[30] = ""; @@ -756,7 +756,7 @@ namespace osl_StreamSocket } public: SendClientThread( ): - m_saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ), + m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ), m_csConnectorSocket( ) { //t_print("# successfully creat this SendClientThread %d!\n", m_id ); @@ -788,7 +788,7 @@ namespace osl_StreamSocket { #if defined(LINUX) ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("127.0.0.1") ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -805,7 +805,7 @@ namespace osl_StreamSocket void shutdown_002() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9); asSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True); CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True ); @@ -858,7 +858,7 @@ namespace osl_StreamSocket void shutdown_003() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9); asSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True); CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True ); @@ -937,7 +937,7 @@ namespace osl_StreamSocket // LLA: void SAL_CALL run( ) // LLA: { // LLA: ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); -// LLA: ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("10.16.66.252"), 8888 ); +// LLA: ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.66.252")), 8888 ); // LLA: ::osl::StreamSocket ssStreamConnection; // LLA: // LLA: //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket @@ -1216,9 +1216,9 @@ namespace osl_StreamSocket public: // LLA: orig void send_recv() // LLA: orig { -// LLA: orig if ( ifAvailable(rtl::OUString::createFromAscii("margritte.germany")) == sal_True ) +// LLA: orig if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True ) // LLA: orig t_print("margritte is alive ! \n"); -// LLA: orig if ( ifAvailable(rtl::OUString::createFromAscii("10.16.66.252")) == sal_False ) +// LLA: orig if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.66.252"))) == sal_False ) // LLA: orig { // LLA: orig t_print("ip 10.16.66.252 is not alive! \n"); // LLA: orig return; @@ -1297,7 +1297,7 @@ namespace osl_StreamSocket void send_recv() { rtl::OString sAddr; - // if ( ifAvailable(rtl::OUString::createFromAscii("margritte.germany")) == sal_True ) + // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True ) // { // t_print("margritte is alive ! \n"); // sAddr = "margritte.germany"; @@ -1310,21 +1310,21 @@ namespace osl_StreamSocket } // else // { -// if ( ifAvailable(rtl::OUString::createFromAscii("192.168.7.2")) == sal_True ) +// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("192.168.7.2"))) == sal_True ) // { // sAddr = "192.168.7.2"; // t_print("moon found ! \n"); // } // else // { -// if ( ifAvailable(rtl::OUString::createFromAscii("moon.linux.bogus")) == sal_True ) +// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon.linux.bogus"))) == sal_True ) // { // sAddr = "moon.linux.bogus"; // t_print("moon found ! \n"); // } // else // { -// if ( ifAvailable(rtl::OUString::createFromAscii("moon")) == sal_True ) +// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon"))) == sal_True ) // { // sAddr = "moon"; // t_print("moon found ! \n"); @@ -1333,7 +1333,7 @@ namespace osl_StreamSocket // } // } - // if ( ifAvailable(rtl::OUString::createFromAscii("10.16.64.196")) == sal_False ) + // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.64.196"))) == sal_False ) // { // t_print("ip 10.16.64.196 is not alive! \n"); // return; diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 242b8b792fac..8be0a525451f 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -175,11 +175,11 @@ void printUString( const ::rtl::OUString & str, const char* msg) if ( returnVal.equals( rightVal ) ) return aUString; aUString += ::rtl::OUString::createFromAscii(msg); - aUString += ::rtl::OUString::createFromAscii(": the returned value is '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '")); aUString += returnVal; - aUString += ::rtl::OUString::createFromAscii("', but the value should be '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '")); aUString += rightVal; - aUString += ::rtl::OUString::createFromAscii("'."); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); return aUString; } diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx b/sal/qa/rtl/bootstrap/bootstrap_process.cxx index 7c6880822ca4..30b7c2308208 100644 --- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx +++ b/sal/qa/rtl/bootstrap/bootstrap_process.cxx @@ -45,7 +45,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) //custom .ini/rc file Bootstrap aBs_custom( OUString::createFromAscii(argv[3]) ); OUString suValue; - OUString suDefault( OUString::createFromAscii("mydefault") ); + OUString suDefault( RTL_CONSTASCII_USTRINGPARAM("mydefault") ); int flag = atoi( argv[1] ); switch( flag ) { diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index daa992a1bd4f..0efb69351889 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -95,7 +95,7 @@ inline ::rtl::OUString getModulePath( void ) suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') ); suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1); - suDirPath += rtl::OUString::createFromAscii("bin"); + suDirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin")); return suDirPath; } @@ -122,12 +122,12 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename) { rtl::OUString aDirURL(getExecutableDirectory()); - aDirURL += OUString::createFromAscii( "/"); + aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aDirURL += OUString::createFromAscii( _sFilename.getStr() ); #if defined(WNT) || defined(OS2) - aDirURL += rtl::OUString::createFromAscii(".ini"); + aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini")); #else - aDirURL += rtl::OUString::createFromAscii("rc"); + aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc")); #endif return aDirURL; @@ -137,12 +137,12 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename) rtl::OUString suPath; if (filename != "") { - suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString::createFromAscii( "/sal/qa/rtl/bootstrap/" ) + suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sal/qa/rtl/bootstrap/")) + rtl::OUString::createFromAscii( filename ); } else { - suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString::createFromAscii( "/sal/qa/rtl/bootstrap" ); + suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sal/qa/rtl/bootstrap")); } rtl::OUString suURL; ::osl::FileBase::getFileURLFromSystemPath( suPath, suURL ); @@ -185,7 +185,7 @@ namespace rtl_Bootstrap rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); printUString( suIniname ); Bootstrap aBootstrap( suIniname ); - rtl::OUString suGetname; // = rtl::OUString::createFromAscii(""); + rtl::OUString suGetname; // = rtl::OUString(); aBootstrap.getIniName( suGetname ); printUString( suGetname ); @@ -230,7 +230,7 @@ namespace rtl_Bootstrap { Bootstrap aBootstrap; rtl::OUString suValue; - rtl::OUString suValuename = rtl::OUString::createFromAscii( "SOLAR_JAVA" ); + rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("SOLAR_JAVA")); //aBootstrap.getFrom( suValuename, suValue ); aBootstrap.getFrom( suValuename, suValue ); sal_Char * pStr = getenv("SOLAR_JAVA"); @@ -242,7 +242,7 @@ namespace rtl_Bootstrap { Bootstrap aBootstrap; rtl::OUString suValue; - rtl::OUString suValuename = rtl::OUString::createFromAscii( "SRC_ROOT" ); + rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("SRC_ROOT")); //aBootstrap.getFrom( suValuename, suValue ); aBootstrap.getFrom( suValuename, suValue ); sal_Char * pStr = getenv("SRC_ROOT"); @@ -263,7 +263,7 @@ namespace rtl_Bootstrap rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); Bootstrap aBootstrap( suIniname ); rtl::OUString suGetname; - rtl::OUString suValuename = rtl::OUString::createFromAscii( "INHERITED_VALUE" ); + rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE")); aBootstrap.getFrom( suValuename, suGetname ); printUString( suGetname ); CPPUNIT_ASSERT_MESSAGE("get the value of a variable in ini file.", suGetname.getLength() != 0 ); @@ -275,8 +275,8 @@ namespace rtl_Bootstrap rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); Bootstrap aBootstrap( suIniname ); rtl::OUString suGetname; - rtl::OUString suValuename = rtl::OUString::createFromAscii( "MY_VALUE" ); - rtl::OUString myDefault = rtl::OUString::createFromAscii( "2" ); + rtl::OUString suValuename(RTL_CONSTASCII_USTRINGPARAM("MY_VALUE")); + rtl::OUString myDefault(RTL_CONSTASCII_USTRINGPARAM("2")); aBootstrap.getFrom( suValuename, suGetname, myDefault ); //printUString( suGetname ); CPPUNIT_ASSERT_MESSAGE("getFrom use default.", suGetname.compareTo( myDefault ) == 0 ); @@ -294,29 +294,29 @@ namespace rtl_Bootstrap aBootstrap.getIniName( suGetIniName ); printUString(suGetIniName, "Current bootstrap file"); - sal_Int32 nIndex = suGetIniName.indexOf(rtl::OUString::createFromAscii( "pseudo" )); + sal_Int32 nIndex = suGetIniName.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pseudo"))); CPPUNIT_ASSERT_MESSAGE("ini name must have 'pseudo' in name.", nIndex > 0); // rtlBootstrapHandle bsHandle = aBootstrap.getHandle(); // CPPUNIT_ASSERT_MESSAGE("getHandle return NULL!", bsHandle != 0); rtl::OUString suValue; - rtl::OUString suKeyName = rtl::OUString::createFromAscii( "FILE" ); + rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("FILE")); aBootstrap.getFrom( suKeyName, suValue ); printUString( suValue ); - sal_Int32 nCompare = suValue.compareTo( rtl::OUString::createFromAscii("pseudo file") ); + sal_Int32 nCompare = suValue.compareTo( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pseudo file")) ); CPPUNIT_ASSERT_MESSAGE("<Bootstrap('pseudo')>.getFrom('FILE', ...) result is unexpected.", nCompare == 0); } void getFrom_004_1() { // get the same key out of the default context - rtl::OUString suKeyName = rtl::OUString::createFromAscii( "FILE" ); + rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("FILE")); rtl::OUString suGetValue; Bootstrap::get( suKeyName, suGetValue ); printUString( suGetValue ); - CPPUNIT_ASSERT_MESSAGE("Bootstrap::get('FILE', ...)", suGetValue.compareTo( rtl::OUString::createFromAscii("testshl2 file") ) == 0 ); + CPPUNIT_ASSERT_MESSAGE("Bootstrap::get('FILE', ...)", suGetValue.compareTo( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2 file")) ) == 0 ); } /** helper function: return the child process's ret value( typedef sal_uInt32 oslProcessExitCode;) @@ -327,17 +327,17 @@ namespace rtl_Bootstrap rtl::OUString suCWD = getModulePath(); oslProcess hProcess = NULL; rtl::OUString suFileURL = suCWD; - suFileURL += rtl::OUString::createFromAscii("/") + rtl::OUString::createFromAscii(process_name) ; + suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString::createFromAscii(process_name) ; #if defined(WNT) || defined(OS2) - suFileURL += rtl::OUString::createFromAscii(".exe"); + suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe")); #endif const int nParameterCount = 3; rtl_uString* pParameters[ nParameterCount ]; OUString suFlag( OUString::createFromAscii(flag) ); - OUString suEnv1( OUString::createFromAscii("-env:UNO_SERVICES=service.rdb")); + OUString suEnv1( RTL_CONSTASCII_USTRINGPARAM("-env:UNO_SERVICES=service.rdb") ); OUString suIniname = t_getSourcePath("rtl"); printUString( suIniname, "rtl path:"); - //OUString suEnv2( OUString::createFromAscii("-env:MYENV=bootstrap_process")); + //OUString suEnv2( RTL_CONSTASCII_USTRINGPARAM("-env:MYENV=bootstrap_process") ); pParameters[0] = suFlag.pData; pParameters[1] = suEnv1.pData; @@ -473,7 +473,7 @@ namespace rtl_Bootstrap Bootstrap::setIniFilename( suIniname ); //rtl_bootstrap_args_open( suIniname.pData ); rtl::OUString suGetname; - rtl::OUString suValuename = rtl::OUString::createFromAscii( "INHERITED_VALUE" ); + rtl::OUString suValuename(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE")); //aBootstrap.getFrom( suValuename, suGetname ); Bootstrap::get( suValuename, suGetname ); printUString( suGetname ); @@ -517,11 +517,11 @@ namespace rtl_Bootstrap //rtl_bootstrap_get_iniName_from_handle( bsHandle, &iniName.pData ); rtl::OUString suValue; - rtl::OUString suKeyName = rtl::OUString::createFromAscii( "PSEUDOFILE" ); + rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("PSEUDOFILE")); rtl_bootstrap_get_from_handle(bsHandle, suKeyName.pData, &suValue.pData, NULL); printUString( suValue); - CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!", suValue.equals( rtl::OUString::createFromAscii("be pseudo") ) == sal_True ); + CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!", suValue.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("be pseudo")) ) == sal_True ); // CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!", // suGetname.equalsIgnoreAsciiCase( iniName ) == sal_True ); @@ -550,8 +550,8 @@ namespace rtl_Bootstrap //in ini fle, INHERITED_VALUE=inherited_value rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); Bootstrap aBootstrap( suIniname); - rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" ); - rtl::OUString suValue = rtl::OUString::createFromAscii( "ok" ); + rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE")); + rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("ok")); // set to another value Bootstrap::set( suName, suValue ); rtl::OUString suGetValue; @@ -562,7 +562,7 @@ namespace rtl_Bootstrap { rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); Bootstrap myBootstrap( suIniname); - rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" ); + rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE")); rtl::OUString suGetOrientValue; Bootstrap::get( suName, suGetOrientValue); // ?? INHERITED_VALUE = ok now, which is set in set_001 @@ -596,11 +596,11 @@ namespace rtl_Bootstrap { rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); Bootstrap aBootstrap( suIniname); - rtl::OUString suMacro = rtl::OUString::createFromAscii( "$MYVAR/expand1" ); + rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("$MYVAR/expand1")); //printUString( suMacro ); //expandMacro now aBootstrap.expandMacrosFrom( suMacro ); - rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "src680_test/expand1" ); + rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("src680_test/expand1")); //printUString( suMacro ); CPPUNIT_ASSERT_MESSAGE("expandMacrosFrom failed.", suMacro.compareTo(suExpectedMacro) == 0 ); } @@ -619,19 +619,19 @@ namespace rtl_Bootstrap t_print("inifile is:"); printUString( suIniname ); Bootstrap aBootstrap( suIniname) ; - rtl::OUString suMacro = rtl::OUString::createFromAscii( "${" ); //rtlrc:Bootstrap:RTLVALUE}"); + rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("${")); //rtlrc:Bootstrap:RTLVALUE}"); - rtl::OUString aDirURL = OUString::createFromAscii( "$ORIGIN"); - aDirURL += OUString::createFromAscii( "/"); - aDirURL += OUString::createFromAscii( "rtl" ); + rtl::OUString aDirURL(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN")); + aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("rtl")); #if defined(WNT) || defined(OS2) - aDirURL += rtl::OUString::createFromAscii(".ini"); + aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini")); #else - aDirURL += rtl::OUString::createFromAscii("rc"); + aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc")); #endif suMacro += aDirURL;//t_getSourcePath("rtl"); - suMacro += rtl::OUString::createFromAscii( "::RTLVALUE}"); + suMacro += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("::RTLVALUE}")); t_print("created macro is: "); printUString( suMacro ); @@ -639,7 +639,7 @@ namespace rtl_Bootstrap aBootstrap.expandMacrosFrom( suMacro ); t_print("expanded macro is:"); printUString( suMacro ); - rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "qadev17" ); + rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("qadev17")); CPPUNIT_ASSERT_MESSAGE("failed, can't expand '${file:///.../" SAL_CONFIGFILE("rtl") "::RTLVALUE}' to 'qadev17'", suMacro.compareTo(suExpectedMacro) == 0 ); } void expandMacrosFrom_002_1() @@ -651,12 +651,12 @@ namespace rtl_Bootstrap rtl::OUString suMacro; // just a simple test, if this really work. - aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE2" ), suMacro ); + aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE2")), suMacro ); t_print("SOFROMVALUE2:"); printUString( suMacro ); CPPUNIT_ASSERT_MESSAGE("'SOFROMVALUE2' seems to do not exist.", suMacro.getLength() > 0 ); - aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE" ), suMacro ); + aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE")), suMacro ); t_print("SOFROMVALUE:"); printUString( suMacro ); @@ -666,7 +666,7 @@ namespace rtl_Bootstrap // t_print("expanded macro is:"); // aBootstrap.expandMacrosFrom( suMacro ); // printUString( suMacro ); - rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "src680_qadev" ); + rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("src680_qadev")); CPPUNIT_ASSERT_MESSAGE("failed, can't expand '${" SAL_CONFIGFILE("rtl") "::SOVALUE}' to 'src680_qadev'", suMacro.compareTo(suExpectedMacro) == 0 ); } void expandMacrosFrom_002_2() @@ -680,18 +680,18 @@ namespace rtl_Bootstrap Bootstrap aBootstrap( suIniname); rtl::OUString suMacro; - aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE3" ), suMacro ); + aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE3")), suMacro ); t_print("SOFROMVALUE3:"); printUString( suMacro ); - if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file") ) == sal_True) + if (suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2_file")) ) == sal_True) { CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE3' is read from the wrong ini file.", 0 ); } else { - CPPUNIT_ASSERT_MESSAGE("SOFROMVALUE3 should contain 'rtlfile'.", suMacro.equals(rtl::OUString::createFromAscii("rtlfile") ) == sal_True ); + CPPUNIT_ASSERT_MESSAGE("SOFROMVALUE3 should contain 'rtlfile'.", suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rtlfile")) ) == sal_True ); } } //? I don't know if this is a right test. @@ -706,22 +706,22 @@ namespace rtl_Bootstrap // Bootstrap aBootstrap( suIniname); // // rtl::OUString suMacro; -// aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE4" ), suMacro ); +// aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE4")), suMacro ); // // t_print("SOFROMVALUE4:"); // printUString( suMacro ); // -// if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file") ) == sal_True) +// if (suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2_file")) ) == sal_True) // { // CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' is read from the wrong section out of the wrong ini file.", 0 ); // } -// else if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file_other") ) == sal_True) +// else if (suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2_file_other")) ) == sal_True) // { // CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' is read from the wrong ini file.", 0 ); // } // else // { -// CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' should contain 'rtlfile_other'.", suMacro.equals(rtl::OUString::createFromAscii("rtlfile_other") ) == sal_True ); +// CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' should contain 'rtlfile_other'.", suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rtlfile_other")) ) == sal_True ); // } // } void expandMacrosFrom_003() @@ -729,10 +729,10 @@ namespace rtl_Bootstrap rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); Bootstrap aBootstrap( suIniname); rtl::OUString suMacro[4]; - suMacro[0] = rtl::OUString::createFromAscii( "$SYSUSERCONFIG" ); - suMacro[1] = rtl::OUString::createFromAscii( "$SYSUSERHOME" ); - suMacro[2] = rtl::OUString::createFromAscii( "$SYSBINDIR" ); - suMacro[3] = rtl::OUString::createFromAscii( "$ORIGIN" ); + suMacro[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG")); + suMacro[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERHOME")); + suMacro[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSBINDIR")); + suMacro[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN")); for ( int i = 0; i < 4; i++ ) { @@ -844,13 +844,13 @@ namespace rtl_Bootstrap { rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI); Bootstrap aBootstrap( suIniname) ; - rtl::OUString suMacro = rtl::OUString::createFromAscii( "$INHERITED_VALUE/well" ); + rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("$INHERITED_VALUE/well")); Bootstrap::expandMacros( suMacro ); - rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" ); + rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE")); OUString suGetValue; Bootstrap::get( suName, suGetValue ); - suGetValue += OUString::createFromAscii( "/well" ); + suGetValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/well")); CPPUNIT_ASSERT_MESSAGE("expandMacros failed.", suGetValue.compareTo(suMacro) == 0 ); } @@ -929,9 +929,9 @@ static void create_rtlrc() { rtl::OUString aFileURL(getExecutableDirectory()); #if defined(WNT) || defined(OS2) - aFileURL += rtl::OUString::createFromAscii("/rtl.ini"); + aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtl.ini")); #else - aFileURL += rtl::OUString::createFromAscii("/rtlrc"); + aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtlrc")); #endif rtl::OString sLines; @@ -952,9 +952,9 @@ static void create_testshl2rc() { rtl::OUString aFileURL(getExecutableDirectory()); #if defined(WNT) || defined(OS2) - aFileURL += rtl::OUString::createFromAscii("/testshl2.ini"); + aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2.ini")); #else - aFileURL += rtl::OUString::createFromAscii("/testshl2rc"); + aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2rc")); #endif rtl::OString sLines; sLines += "[Bootstrap]\n"; @@ -994,9 +994,9 @@ static void create_pseudorc() { rtl::OUString aFileURL(getExecutableDirectory()); #if defined(WNT) || defined(OS2) - aFileURL += rtl::OUString::createFromAscii("/pseudo.ini"); + aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudo.ini")); #else - aFileURL += rtl::OUString::createFromAscii("/pseudorc"); + aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudorc")); #endif rtl::OString sLines; sLines += "[Bootstrap]\n"; @@ -1011,9 +1011,9 @@ void create_bootstrap_processrc() { rtl::OUString aDirURL(getModulePath()); #if defined(WNT) || defined(OS2) - aDirURL += rtl::OUString::createFromAscii("/bootstrap_process.ini"); + aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_process.ini")); #else - aDirURL += rtl::OUString::createFromAscii("/bootstrap_processrc"); + aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_processrc")); #endif rtl::OString sLines; sLines += "[Bootstrap]\n"; diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index 2c140c36a306..4dffc21f56da 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -40,7 +40,7 @@ namespace rtl_locale // default locale for test purpose void setDefaultLocale() { - rtl::OLocale::setDefault(rtl::OUString::createFromAscii("de"), rtl::OUString::createFromAscii("DE"), /* rtl::OUString() */ rtl::OUString::createFromAscii("hochdeutsch") ); + rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), /* rtl::OUString() */ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch")) ); } class getDefault : public CppUnit::TestFixture @@ -69,7 +69,7 @@ public: void getDefault_001() { - // rtl::OLocale::setDefault(rtl::OUString::createFromAscii("de"), rtl::OUString::createFromAscii("DE"), rtl::OUString()); + // rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), rtl::OUString()); rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); CPPUNIT_ASSERT_MESSAGE("locale must not null", aLocale.getData() != NULL); } @@ -101,7 +101,7 @@ public: // insert your test code here. void setDefault_001() { - rtl::OLocale::setDefault(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString()); + rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString()); rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); CPPUNIT_ASSERT_MESSAGE("locale must not null", aLocale.getData() != NULL); @@ -136,14 +136,14 @@ public: rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); rtl::OUString suLanguage = aLocale.getLanguage(); t_print("Language: %s\n", rtl::OUStringToOString(suLanguage, osl_getThreadTextEncoding()).getStr()); - CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString::createFromAscii("de"))); + CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")))); } void getLanguage_002() { rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); rtl::OUString suLanguage = rtl_locale_getLanguage(aLocale.getData()); t_print("Language: %s\n", rtl::OUStringToOString(suLanguage, osl_getThreadTextEncoding()).getStr()); - CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString::createFromAscii("de"))); + CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")))); } // Change the following lines only, if you add, remove or rename @@ -175,14 +175,14 @@ public: rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); rtl::OUString suCountry = aLocale.getCountry(); t_print("Country: %s\n", rtl::OUStringToOString(suCountry, osl_getThreadTextEncoding()).getStr()); - CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString::createFromAscii("DE"))); + CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")))); } void getCountry_002() { rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); rtl::OUString suCountry = rtl_locale_getCountry(aLocale.getData()); t_print("Country: %s\n", rtl::OUStringToOString(suCountry, osl_getThreadTextEncoding()).getStr()); - CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString::createFromAscii("DE"))); + CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")))); } // Change the following lines only, if you add, remove or rename @@ -214,14 +214,14 @@ public: rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); rtl::OUString suVariant = aLocale.getVariant(); t_print("Variant: %s\n", rtl::OUStringToOString(suVariant, osl_getThreadTextEncoding()).getStr()); - CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString::createFromAscii("hochdeutsch"))); + CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch")))); } void getVariant_002() { rtl::OLocale aLocale = ::rtl::OLocale::getDefault(); rtl::OUString suVariant = rtl_locale_getVariant(aLocale.getData()); t_print("Variant: %s\n", rtl::OUStringToOString(suVariant, osl_getThreadTextEncoding()).getStr()); - CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString::createFromAscii("hochdeutsch"))); + CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch")))); } // Change the following lines only, if you add, remove or rename @@ -289,8 +289,8 @@ public: // insert your test code here. void equals_001() { - rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString()); - rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US")); + rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString()); + rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"))); sal_Bool bLocaleAreEqual = sal_False; bLocaleAreEqual = (aLocale1 == aLocale2); @@ -300,8 +300,8 @@ public: void equals_002() { - rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString()); - rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US")); + rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString()); + rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"))); sal_Int32 nEqual = rtl_locale_equals(aLocale1.getData(), aLocale2.getData()); t_print("rtl_locale_equals() result: %d\n", nEqual); diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx index 34f1d0624dc8..e89a55c8e2e2 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -71,9 +71,9 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" inline ::rtl::OUString getTempPath( void ) { #ifdef UNX - rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///tmp/")); + rtl::OUString suDirURL( RTL_CONSTASCII_USTRINGPARAM("file:///tmp/") ); #else /* Windows */ - rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///c:/temp/")); + rtl::OUString suDirURL( RTL_CONSTASCII_USTRINGPARAM("file:///c:/temp/") ); #endif return suDirURL; } @@ -137,8 +137,8 @@ namespace rtl_logfile rtl_logfile_trace("trace %d %d %d\n" , 1 , 2 ,3 ); rtl::OUString suFilePath = getTempPath(); - suFilePath += rtl::OUString::createFromAscii("logfile1_") + getCurrentPID( ); - suFilePath += rtl::OUString::createFromAscii(".log"); + suFilePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("logfile1_")) + getCurrentPID( ); + suFilePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".log")); ::osl::FileBase::RC nError1; ::osl::File aTestFile( suFilePath ); @@ -226,8 +226,8 @@ public: { t_print( "\n#Do some clean-ups ... only delete logfile1_*.log here!\n" ); rtl::OUString suFilePath = getTempPath(); - suFilePath += rtl::OUString::createFromAscii("logfile1_") + getCurrentPID( ); - suFilePath += rtl::OUString::createFromAscii(".log"); + suFilePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("logfile1_")) + getCurrentPID( ); + suFilePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".log")); //if ( ifFileExist( suFilePath ) == sal_True ) ::osl::FileBase::RC nError1; diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index 55b1f62cd9a4..d55e60e94e45 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -114,7 +114,7 @@ namespace rtl_string void convertUStringToString_001() { - rtl::OUString suString = rtl::OUString::createFromAscii("Hello"); + rtl::OUString suString(RTL_CONSTASCII_USTRINGPARAM("Hello")); rtl::OString sString; sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS); diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 4b05a027b57e..664b8b52fdea 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -59,7 +59,7 @@ namespace rtl_OUString /// test of OUString(rtl_uString*) void ctors_001() { - rtl::OUString *pStr = new rtl::OUString( rtl::OUString::createFromAscii("a String") ); + rtl::OUString *pStr = new rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("a String") ); rtl::OUString aStrToTest(pStr->pData); delete pStr; @@ -69,7 +69,7 @@ namespace rtl_OUString memset(pBuffer, 0, 2 * 8); free(pBuffer); - sal_Bool bResult = aStrToTest.equals(rtl::OUString::createFromAscii("a String")); + sal_Bool bResult = aStrToTest.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a String"))); CPPUNIT_ASSERT_MESSAGE("String must not be empty", bResult == sal_True); } @@ -692,88 +692,88 @@ public: void lastIndexOf_test_oustring_offset_001() { // search for sun, start at the end, found (pos==0) - rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring_offset(aStr, aSearchStr, 0, aStr.getLength()); } void lastIndexOf_test_oustring_offset_002() { // search for sun, start at pos = 3, found (pos==0) - rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring_offset(aStr, aSearchStr, 0, 3); } void lastIndexOf_test_oustring_offset_003() { // search for sun, start at pos = 2, found (pos==-1) - rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 2); } void lastIndexOf_test_oustring_offset_004() { // search for sun, start at the end, found (pos==0) - rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring_offset(aStr, aSearchStr, -1, -1); } void lastIndexOf_test_oustring_001() { // search for sun, found (pos==0) - rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring(aStr, aSearchStr, 0); } void lastIndexOf_test_oustring_002() { // search for sun, found (pos==4) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun java system"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun java system")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring(aStr, aSearchStr, 4); } void lastIndexOf_test_oustring_003() { // search for sun, found (pos==8) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring(aStr, aSearchStr, 8); } void lastIndexOf_test_oustring_004() { // search for sun, found (pos==8) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring(aStr, aSearchStr, 8); } void lastIndexOf_test_oustring_005() { // search for sun, found (pos==4) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun su"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun su")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring(aStr, aSearchStr, 4); } void lastIndexOf_test_oustring_006() { // search for sun, found (pos==-1) - rtl::OUString aStr = rtl::OUString::createFromAscii("the su su"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the su su")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun")); lastIndexOf_oustring(aStr, aSearchStr, -1); } void lastIndexOf_test_oustring_007() { // search for earth, not found (-1) - rtl::OUString aStr = rtl::OUString::createFromAscii("the su su"); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("earth"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the su su")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("earth")); lastIndexOf_oustring(aStr, aSearchStr, -1); } @@ -781,7 +781,7 @@ public: { // search for earth, not found (-1) rtl::OUString aStr = rtl::OUString(); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("earth"); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("earth")); lastIndexOf_oustring(aStr, aSearchStr, -1); } @@ -797,7 +797,7 @@ public: void lastIndexOf_test_salunicode_001() { // search for 's', found (19) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); sal_Unicode suChar = L's'; lastIndexOf_salunicode(aStr, suChar, 19); } @@ -805,7 +805,7 @@ public: void lastIndexOf_test_salunicode_002() { // search for 'x', not found (-1) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); sal_Unicode suChar = L'x'; lastIndexOf_salunicode(aStr, suChar, -1); } @@ -813,21 +813,21 @@ public: void lastIndexOf_test_salunicode_offset_001() { // search for 's', start from pos last char, found (19) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); sal_Unicode cuChar = L's'; lastIndexOf_salunicode_offset(aStr, cuChar, 19, aStr.getLength()); } void lastIndexOf_test_salunicode_offset_002() { // search for 's', start pos is last occur from search behind, found (17) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); sal_Unicode cuChar = L's'; lastIndexOf_salunicode_offset(aStr, cuChar, 17, 19); } void lastIndexOf_test_salunicode_offset_003() { // search for 't', start pos is 1, found (0) - rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system"); + rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system")); sal_Unicode cuChar = L't'; lastIndexOf_salunicode_offset(aStr, cuChar, 0, 1); } @@ -886,66 +886,66 @@ public: void getToken_001() { - rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;b"); + rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;b")); sal_Int32 nIndex = 0; rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True); /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True); CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1); } void getToken_002() { - rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;b.c"); + rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;b.c")); sal_Int32 nIndex = 0; rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True); /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True); /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be a 'c'", suToken.equals(rtl::OUString::createFromAscii("c")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be a 'c'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("c"))) == sal_True); CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1); } void getToken_003() { - rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;;b"); + rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;;b")); sal_Int32 nIndex = 0; rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True); /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex ); CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.getLength() == 0); /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True); CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1); } void getToken_004() { - rtl::OUString suTokenStr = rtl::OUString::createFromAscii("longer.then.ever."); + rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("longer.then.ever.")); sal_Int32 nIndex = 0; rtl::OUString suToken = suTokenStr.getToken( 0, '.', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be 'longer'", suToken.equals(rtl::OUString::createFromAscii("longer")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be 'longer'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("longer"))) == sal_True); /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be 'then'", suToken.equals(rtl::OUString::createFromAscii("then")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be 'then'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("then"))) == sal_True); /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex ); - CPPUNIT_ASSERT_MESSAGE("Token should be 'ever'", suToken.equals(rtl::OUString::createFromAscii("ever")) == sal_True); + CPPUNIT_ASSERT_MESSAGE("Token should be 'ever'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ever"))) == sal_True); /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex ); CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.getLength() == 0); diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index ccc161ec9b01..f0cd05c3e4f6 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -59,7 +59,7 @@ namespace rtl_ustr void compare_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl_ustr_compare( aStr1.getStr(), NULL); // should not GPF } @@ -74,8 +74,8 @@ namespace rtl_ustr void compare_002() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -83,8 +83,8 @@ namespace rtl_ustr void compare_003() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ.")); sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -115,7 +115,7 @@ namespace rtl_ustr void compare_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), NULL); } void compare_001() @@ -129,8 +129,8 @@ namespace rtl_ustr void compare_002() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -138,8 +138,8 @@ namespace rtl_ustr void compare_002_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("LINE MUST BE EQUAL."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("LINE MUST BE EQUAL.")); sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0); @@ -147,8 +147,8 @@ namespace rtl_ustr void compare_003() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ.")); sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -181,7 +181,7 @@ namespace rtl_ustr void compare_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1); } void compare_001() @@ -195,8 +195,8 @@ namespace rtl_ustr void compare_002() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -206,8 +206,8 @@ namespace rtl_ustr void compare_002_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("LINE MUST BE EQUAL."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("LINE MUST BE EQUAL.")); sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -217,8 +217,8 @@ namespace rtl_ustr void compare_003() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ.")); sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -228,8 +228,8 @@ namespace rtl_ustr void compare_004() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ."); - rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); + rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ.")); sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -321,7 +321,7 @@ namespace rtl_ustr void indexOfChar_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfChar."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfChar.")); sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'L' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); @@ -338,7 +338,7 @@ namespace rtl_ustr void indexOfChar_002() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfChar."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfChar.")); sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'y' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -367,7 +367,7 @@ namespace rtl_ustr void lastIndexOfChar_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfChar."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfChar.")); sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'C' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22); @@ -384,7 +384,7 @@ namespace rtl_ustr void lastIndexOfChar_002() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfChar."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfChar.")); sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'y' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -415,35 +415,35 @@ namespace rtl_ustr void indexOfStr_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr.")); rtl_ustr_indexOfStr( aStr1.getStr(), 0 ); } void indexOfStr_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr.")); - rtl::OUString suSearch = rtl::OUString::createFromAscii("Line"); + rtl::OUString suSearch(RTL_CONSTASCII_USTRINGPARAM("Line")); sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); - /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("for"); + /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("for")); /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 5); - /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("a"); + /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("a")); /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 9); - /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("a index"); + /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("a index")); /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex ==9); } void indexOfStr_002() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr."); - rtl::OUString suSearch = rtl::OUString::createFromAscii("not exist"); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr.")); + rtl::OUString suSearch(RTL_CONSTASCII_USTRINGPARAM("not exist")); sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -473,31 +473,31 @@ namespace rtl_ustr void lastIndexOfStr_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr.")); rtl_ustr_lastIndexOfStr( aStr1.getStr(), NULL ); } void lastIndexOfStr_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr."); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("Index"); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr.")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("Index")); sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15); - /* rtl::OString */ aSearchStr = rtl::OUString::createFromAscii("Line"); + /* rtl::OString */ aSearchStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line")); /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); - /* rtl::OString */ aSearchStr = rtl::OUString::createFromAscii(""); + /* rtl::OString */ aSearchStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1); } void lastIndexOfStr_002() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr."); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("foo"); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr.")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("foo")); sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -505,8 +505,8 @@ namespace rtl_ustr void lastIndexOfStr_003() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr."); - rtl::OUString aSearchStr = rtl::OUString::createFromAscii("O"); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr.")); + rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("O")); sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 ); @@ -537,8 +537,8 @@ namespace rtl_ustr void replaceChar_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("replace char."); - rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("ruplacu char."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("replace char.")); + rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("ruplacu char.")); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc( nLength + sizeof(sal_Unicode)); // length + 1 (null terminator) @@ -580,8 +580,8 @@ namespace rtl_ustr } void replaceChar_WithLength_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("replace char."); - rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("ruplace char."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("replace char.")); + rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("ruplace char.")); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); @@ -597,8 +597,8 @@ namespace rtl_ustr void replaceChar_WithLength_002() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("eeeeeeeeeeeee"); - rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("uuuuuueeeeeee"); + rtl::OUString aStr1 (RTL_CONSTASCII_USTRINGPARAM("eeeeeeeeeeeee")); + rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("uuuuuueeeeeee")); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); // no null terminator is need @@ -638,8 +638,8 @@ namespace rtl_ustr void toAsciiLowerCase_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII LOWER CASE."); - rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("change this to ascii lower case."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII LOWER CASE.")); + rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii lower case.")); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode) ); // we need to add '\0' so one more @@ -676,8 +676,8 @@ namespace rtl_ustr void toAsciiLowerCase_WithLength_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII LOWER CASE."); - rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("change thiS TO ASCII LOWER CASE."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII LOWER CASE.")); + rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("change thiS TO ASCII LOWER CASE.")); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); @@ -720,8 +720,8 @@ namespace rtl_ustr void toAsciiUpperCase_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("change this to ascii upper case."); - rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case.")); + rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE.")); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator @@ -758,8 +758,8 @@ namespace rtl_ustr void toAsciiUpperCase_WithLength_001() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("change this to ascii lower case."); - rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIs to ascii lower case."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii lower case.")); + rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIs to ascii lower case.")); sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode); sal_Unicode* pStr = (sal_Unicode*) malloc(nLength); @@ -798,7 +798,7 @@ namespace rtl_ustr void trim_WithLength_000_1() { - rtl::OUString suStr = rtl::OUString::createFromAscii(" trim this"); + rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM(" trim this")); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -810,7 +810,7 @@ namespace rtl_ustr void trim_WithLength_001() { - rtl::OUString suStr = rtl::OUString::createFromAscii(" trim this"); + rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM(" trim this")); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); memcpy(pStr, suStr.getStr(), nLength); @@ -824,7 +824,7 @@ namespace rtl_ustr void trim_WithLength_002() { - rtl::OUString suStr = rtl::OUString::createFromAscii("trim this"); + rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("trim this")); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -839,7 +839,7 @@ namespace rtl_ustr void trim_WithLength_003() { - rtl::OUString suStr = rtl::OUString::createFromAscii(" trim this"); + rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM(" trim this")); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -853,7 +853,7 @@ namespace rtl_ustr void trim_WithLength_004() { - rtl::OUString suStr = rtl::OUString::createFromAscii("\r\n\t \n\r trim \n this"); + rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("\r\n\t \n\r trim \n this")); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -867,7 +867,7 @@ namespace rtl_ustr void trim_WithLength_005() { - rtl::OUString suStr = rtl::OUString::createFromAscii("\r\n\t \n\r trim \t this \n\r\t\t "); + rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("\r\n\t \n\r trim \t this \n\r\t\t ")); sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode); sal_Unicode *pStr = (sal_Unicode*)malloc(nLength); @@ -1022,13 +1022,13 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0); // should not GPF } void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_2() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl::OString sStr2 = "Line is shorter."; rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr(), 0); // should not GPF @@ -1044,7 +1044,7 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_002() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength()); @@ -1053,7 +1053,7 @@ namespace rtl_ustr void ascii_shortenedCompareIgnoreAsciiCase_WithLength_003() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); rtl::OString sStr2 = "Line must be differ and longer."; sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength()); @@ -1088,13 +1088,13 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), 0, NULL); // should not GPF } void ascii_compareIgnoreAsciiCase_WithLength_000_2() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl::OString sStr2 = "Line is shorter."; rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr()); // should not GPF @@ -1110,7 +1110,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_002() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr()); @@ -1119,7 +1119,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_WithLength_003() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); rtl::OString sStr2 = "Line must be differ and longer."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr()); @@ -1154,7 +1154,7 @@ namespace rtl_ustr void ascii_compare_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl_ustr_ascii_compare( aStr1.getStr(), NULL); // should not GPF } @@ -1169,7 +1169,7 @@ namespace rtl_ustr void ascii_compare_002() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr()); @@ -1178,7 +1178,7 @@ namespace rtl_ustr void ascii_compare_003() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); rtl::OString sStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr()); @@ -1212,7 +1212,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL); // should not GPF } @@ -1227,7 +1227,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1236,7 +1236,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002_1() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal, when ignore case."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal, when ignore case.")); rtl::OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1245,7 +1245,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_003() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); rtl::OString sStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1256,8 +1256,8 @@ namespace rtl_ustr // void ascii_compareIgnoreAsciiCase_001() // { - // rtl::OUString suStr1 = rtl::OUString::createFromAscii("change this to ascii upper case."); - // rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE."); + // rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case.")); + // rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE.")); // // sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode); // sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator @@ -1310,7 +1310,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_000_1() { - rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL); // should not GPF } @@ -1325,7 +1325,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal.")); rtl::OString sStr2 = "Line must be equal."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1334,7 +1334,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_002_1() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal, when ignore case."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal, when ignore case.")); rtl::OString sStr2 = "LINE MUST BE EQUAL, WHEN IGNORE CASE."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1343,7 +1343,7 @@ namespace rtl_ustr void ascii_compareIgnoreAsciiCase_003() { - rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ."); + rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ.")); rtl::OString sStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr()); @@ -1354,8 +1354,8 @@ namespace rtl_ustr // void ascii_compareIgnoreAsciiCase_001() // { - // rtl::OUString suStr1 = rtl::OUString::createFromAscii("change this to ascii upper case."); - // rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE."); + // rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case.")); + // rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE.")); // // sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode); // sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index 0372551d3225..c69436467427 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -69,7 +69,7 @@ inline ::rtl::OUString getModulePath( void ) printUString(suDirPath, "modulePath:"); suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') ); suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1); - suDirPath += rtl::OUString::createFromAscii("bin"); + suDirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin")); return suDirPath; } @@ -92,9 +92,9 @@ public: void getAppCommandArg_001() { #if defined(WNT) || defined(OS2) - const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("child_process.exe"); + const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process.exe")); #else - const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("child_process"); + const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process")); #endif rtl::OUString suCWD = getModulePath(); // rtl::OUString suCWD2 = getExecutableDirectory(); @@ -113,7 +113,7 @@ public: pParameters[3] = suParam3.pData; rtl::OUString suFileURL = suCWD; - suFileURL += rtl::OUString::createFromAscii("/"); + suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); suFileURL += EXECUTABLE_NAME; oslProcessError osl_error = osl_executeProcess( @@ -229,9 +229,9 @@ public: void getGlobalProcessId_002() { #if defined(WNT) || defined(OS2) - const rtl::OUString EXEC_NAME = rtl::OUString::createFromAscii("child_process_id.exe"); + const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id.exe")); #else - const rtl::OUString EXEC_NAME = rtl::OUString::createFromAscii("child_process_id"); + const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id")); #endif sal_uInt8 pTargetUUID1[16]; rtl_getGlobalProcessId( pTargetUUID1 ); @@ -243,7 +243,7 @@ public: rtl::OUString suCWD = getModulePath(); oslProcess hProcess = NULL; rtl::OUString suFileURL = suCWD; - suFileURL += rtl::OUString::createFromAscii("/"); + suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); suFileURL += EXEC_NAME; oslFileHandle* pChildOutputRead = new oslFileHandle(); oslProcessError osl_error = osl_executeProcess_WithRedirectedIO( diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx index 919aa04a24b4..741bab924e91 100644 --- a/sal/qa/rtl/uri/rtl_Uri.cxx +++ b/sal/qa/rtl/uri/rtl_Uri.cxx @@ -224,9 +224,9 @@ namespace Stringtest void test_UTF8_files() { #ifdef UNX - rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///tmp/atestdir")); + rtl::OUString suDirURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///tmp/atestdir"))); #else /* Windows */ - rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///c:/temp/atestdir")); + rtl::OUString suDirURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c:/temp/atestdir"))); #endif osl::Directory aDir(suDirURL); aDir.open(); diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx index 880e326ee562..63778adb9112 100644 --- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx +++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx @@ -76,14 +76,14 @@ void oldtests::test_OUString() // "Mein erster RTL OUString\n" // | | | | | // Index 0 5 10 15 20 - OUString s1(OUString::createFromAscii("Mein erster RTL OUString\n")); - TEST_ENSURE( s1 == OUString::createFromAscii("Mein erster RTL OUString\n"), "test_OWString error 1"); + OUString s1(OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n"))); + TEST_ENSURE( s1 == OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n")), "test_OWString error 1"); TEST_ENSURE( s1.getLength() == 25, "test_OWString error 2"); OUString s2 = s1; TEST_ENSURE( s2[16] == (sal_Unicode)'O', "test_OWString error 3"); TEST_ENSURE( s2.equals(s1), "test_OWString error 4"); - TEST_ENSURE( OUString( OUString::createFromAscii("hallo")) == OUString::createFromAscii( "hallo"), "test_OWString error 4"); + TEST_ENSURE( OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("hallo"))) == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 4"); TEST_ENSURE( s2.indexOf((sal_Unicode)'O') == 16, "test_OWString error 5"); TEST_ENSURE( s2.indexOf((sal_Unicode)'O', 5) == 16, "test_OWString error 5a"); TEST_ENSURE( s2.lastIndexOf((sal_Unicode)'r') == 20, "test_OWString error 6"); @@ -98,24 +98,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::createFromAscii(" ist ein String aus der RTL Library\n") ); + OUString s4 = s3.concat( OUString(RTL_CONSTASCII_USTRINGPARAM(" ist ein String aus der RTL Library\n")) ); TEST_ENSURE( s4.getLength() == 60, "test_OWString error 11"); s1 = s4.copy(0, 39); OUString s5; - s5 = s1 + OUString::createFromAscii( " aus der RTL Library\n" ); + s5 = s1 + OUString(RTL_CONSTASCII_USTRINGPARAM(" aus der RTL Library\n")); TEST_ENSURE( s5.compareTo(s4) == 0 , "test_OWString error 12"); - TEST_ENSURE( s5.indexOf(OUString::createFromAscii("RTL")) == 12, "test_OWString error 13"); - TEST_ENSURE( s5.lastIndexOf(OUString::createFromAscii("RTL")) == 48, "test_OWString error 13"); + TEST_ENSURE( s5.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("RTL"))) == 12, "test_OWString error 13"); + TEST_ENSURE( s5.lastIndexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("RTL"))) == 48, "test_OWString error 13"); sal_Bool b = sal_False; OUString s6 = s5.valueOf(b); -// TEST_ENSURE( s6.compareTo(OUString::createFromAscii("False")) == 0, "test_OWString error 14"); +// TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("False"))) == 0, "test_OWString error 14"); s6 = s5.valueOf((sal_Unicode)'H'); - TEST_ENSURE( s6.compareTo(OUString::createFromAscii("H")) == 0, "test_OWString error 15"); + TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("H"))) == 0, "test_OWString error 15"); sal_Int32 n = 123456789L; s6 = s5.valueOf(n); - TEST_ENSURE( s6.compareTo(OUString::createFromAscii("123456789")) == 0, "test_OWString error 16"); + TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("123456789"))) == 0, "test_OWString error 16"); #ifndef SAL_OS2 #ifdef SAL_UNX @@ -127,92 +127,92 @@ void oldtests::test_OUString() sal_Int64 m = -3223372036854775807; #endif s6 = s5.valueOf(m); - TEST_ENSURE( s6.compareTo( OUString::createFromAscii( "-3223372036854775807" ) ) == 0, "test_OWString error 17"); + TEST_ENSURE( s6.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-3223372036854775807")) ) == 0, "test_OWString error 17"); #endif // LLA: locale tests removed ::rtl::OLocale locale = ::rtl::OLocale::getDefault(); // LLA: locale tests removed -// LLA: locale tests removed OUString s61(OUString::createFromAscii("HaLLo")); +// LLA: locale tests removed OUString s61(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo"))); // LLA: locale tests removed s61 = s61.toLowerCase(locale); -// LLA: locale tests removed TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17a"); +// LLA: locale tests removed TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 17a"); // LLA: locale tests removed s61 = s61.toUpperCase(); -// LLA: locale tests removed TEST_ENSURE( s61 == OUString::createFromAscii("HALLO"), "test_OWString error 17b"); +// LLA: locale tests removed TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO")), "test_OWString error 17b"); // LLA: locale tests removed s61 = s61.toLowerCase(); -// LLA: locale tests removed TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17c"); +// LLA: locale tests removed TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 17c"); // LLA: locale tests removed -// LLA: locale tests removed ::rtl::OLocale::setDefault( OUString::createFromAscii( "de" ), OUString::createFromAscii( "DE" ), OUString() ); +// LLA: locale tests removed ::rtl::OLocale::setDefault( OUString(RTL_CONSTASCII_USTRINGPARAM("de")), OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), OUString() ); // LLA: locale tests removed locale = OLocale::getDefault(); // LLA: locale tests removed // LLA: locale tests removed // AB, 24.3.2000, removed NAMESPACE_RTL(OLocale)::getENGLISH() and error 18 // LLA: locale tests removed -// LLA: locale tests removed OUString s7(OUString::createFromAscii("HaLLo")); +// LLA: locale tests removed OUString s7(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo"))); // LLA: locale tests removed s7 = s7.toLowerCase(locale); -// LLA: locale tests removed TEST_ENSURE( s7 == OUString::createFromAscii("hallo"), "test_OWString error 19"); +// LLA: locale tests removed TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 19"); // LLA: locale tests removed s7 = s7.toUpperCase(locale); -// LLA: locale tests removed TEST_ENSURE( s7 == OUString::createFromAscii("HALLO"), "test_OWString error 20"); +// LLA: locale tests removed TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO")), "test_OWString error 20"); // LLA: locale tests removed -// LLA: locale tests removed OUString s8(OUString::createFromAscii("HaLLo ICH BIn eIn ")); +// LLA: locale tests removed OUString s8(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo ICH BIn eIn "))); // LLA: locale tests removed s8 += OUString::valueOf( (sal_Unicode)0xDF ); -// LLA: locale tests removed locale = OLocale::registerLocale( OUString::createFromAscii("tr"), OUString::createFromAscii("TR"), OUString()); +// LLA: locale tests removed locale = OLocale::registerLocale( OUString(RTL_CONSTASCII_USTRINGPARAM("tr")), OUString(RTL_CONSTASCII_USTRINGPARAM("TR")), OUString()); // LLA: locale tests removed s8 = s8.toLowerCase(locale); // LLA: locale tests removed s8 = s8.toUpperCase(locale); -// LLA: locale tests removed TEST_ENSURE( s8 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 21"); +// LLA: locale tests removed TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")), "test_OWString error 21"); // LLA: locale tests removed -// LLA: locale tests removed s7 = OUString::createFromAscii("Hallo ich bIn ein I"); +// LLA: locale tests removed s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bIn ein I")); // LLA: locale tests removed s7 = s8.toUpperCase(locale); -// LLA: locale tests removed TEST_ENSURE( s7 != OUString::createFromAscii("HALLO ICH BIN EIN I"), "test_OWString error 21.b"); +// LLA: locale tests removed TEST_ENSURE( s7 != OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN I")), "test_OWString error 21.b"); OUString s7; - OUString s8(OUString::createFromAscii("HALLO ICH BIN EIN SS")); - s7 = OUString::createFromAscii(" "); - s8 = s7 + s8 + OUString::createFromAscii(" " ); - TEST_ENSURE( s8 == OUString::createFromAscii(" HALLO ICH BIN EIN SS "), + OUString s8(OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS"))); + s7 = OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + s8 = s7 + s8 + OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); + TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM(" HALLO ICH BIN EIN SS ")), "test_OWString error 22"); s7 = s8.trim(); - TEST_ENSURE( s7 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 23"); + TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")), "test_OWString error 23"); // TEST_ENSURE( wcscmp(s7.getStr(), L"HALLO ICH BIN EIN SS") == 0, "test_OWString error 24"); - s7 = OUString::createFromAscii("Hallo"); - s8 = OUString::createFromAscii("aber Hallo"); + s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")); + s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("aber Hallo")); TEST_ENSURE( s7 < s8, "test_OWString error 25"); TEST_ENSURE( s8 > s7, "test_OWString error 26"); TEST_ENSURE( s7 != s8, "test_OWString error 27"); - TEST_ENSURE( s7 != OUString::createFromAscii("blabla"), "test_OWString error 28"); - TEST_ENSURE( OUString::createFromAscii("blabla") != s7, "test_OWString error 29"); + TEST_ENSURE( s7 != OUString(RTL_CONSTASCII_USTRINGPARAM("blabla")), "test_OWString error 28"); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("blabla")) != s7, "test_OWString error 29"); - s8 = OUString::createFromAscii("Hallo"); + s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")); TEST_ENSURE( s7 <= s8, "test_OWString error 30"); TEST_ENSURE( s7 >= s8, "test_OwString error 31"); s8 = s8.replace((sal_Unicode)'l', (sal_Unicode)'r'); - TEST_ENSURE( s8 == OUString::createFromAscii("Harro"), "test_OWString error 32"); + TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("Harro")), "test_OWString error 32"); // LLA: len() unknown TEST_ENSURE( s8.len() == 5, "test_OWString error 33"); // "Ich bin ein String mit einem A und C und vielen m, m, m, m" // | | | | | | | | | | | | //index 0 5 10 15 20 25 30 35 40 45 50 55 - s8 = OUString::createFromAscii("Ich bin ein String mit einem A und C und vielen m, m, m, m"); + s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("Ich bin ein String mit einem A und C und vielen m, m, m, m")); // LLA: no matching TEST_ENSURE( s8.search((sal_Unicode)'I') == 0, "test_OWString error 34"); // LLA: no matching TEST_ENSURE( s8.search((sal_Unicode)'A') == 29, "test_OWString error 35"); -// LLA: no matching s7 = OUString::createFromAscii("A und C"); +// LLA: no matching s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("A und C")); // LLA: no matching TEST_ENSURE( s8.search(s7) == 29, "test_OWString error 36"); -// LLA: no matching TEST_ENSURE( s8.search(OUString::createFromAscii("mit einem A")) == 19, "test_OWString error 37"); +// LLA: no matching TEST_ENSURE( s8.search(OUString(RTL_CONSTASCII_USTRINGPARAM("mit einem A"))) == 19, "test_OWString error 37"); // LLA: no matching -// LLA: no matching s8 = OUString::createFromAscii("||token1|token2|token3||token4|token5||" ); +// LLA: no matching s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("||token1|token2|token3||token4|token5||")); // LLA: no matching TEST_ENSURE( s8.getTokenCount('|') == 10, "test_OWString error 38a"); // LLA: no matching TEST_ENSURE( s8.getToken(10,'|') == OUString(), "test_OWString error 39a"); // LLA: no matching -// LLA: no matching s8 = OUString::createFromAscii("token1"); +// LLA: no matching s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("token1")); // LLA: no matching TEST_ENSURE( s8.getTokenCount('|') == 1, "test_OWString error 38b"); -// LLA: no matching TEST_ENSURE( s8.getToken(0,'|') == OUString::createFromAscii("token1"), "test_OWString error 39b"); +// LLA: no matching TEST_ENSURE( s8.getToken(0,'|') == OUString(RTL_CONSTASCII_USTRINGPARAM("token1")), "test_OWString error 39b"); // LLA: no matching TEST_ENSURE( s8.getToken(-1,'|') == OUString(), "test_OWString error 39c"); // LLA: no matching TEST_ENSURE( s8.getToken(1,'|') == OUString(), "test_OWString error 39d"); // LLA: no matching -// LLA: no matching s8 = OUString::createFromAscii("|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|"); +// LLA: no matching s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|")); // LLA: no matching TEST_ENSURE( s8.getTokenCount((sal_Unicode)'|') == 10, "test_OWString error 38"); -// LLA: no matching TEST_ENSURE( s8.getToken(3, (sal_Unicode)'|') == OUString::createFromAscii("hallo3"), "test_OWString error 39"); +// LLA: no matching TEST_ENSURE( s8.getToken(3, (sal_Unicode)'|') == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo3")), "test_OWString error 39"); // LLA: removed due to the fact, this is not a clean test! @@ -220,48 +220,48 @@ void oldtests::test_OUString() // LLA: s7 += s8; // LLA: TEST_ENSURE( s7 == s8, "test_OWString error 40"); // LLA: -// LLA: s7 = s8.replaceAt(8, 6, OUString::createFromAscii("mmmmmmmmmm")); +// LLA: s7 = s8.replaceAt(8, 6, OUString(RTL_CONSTASCII_USTRINGPARAM("mmmmmmmmmm"))); // LLA: TEST_ENSURE( s7.getLength() == 61, "test_OWString error 41"); // LLA: // LLA: s8 = s7.replaceAt(8, 11, OUString()); // LLA: TEST_ENSURE( s8.getLength() == 50, "test_OWString error 42"); // LLA: -// LLA: s7 = s8.replaceAt(8, 0, OUString::createFromAscii("hallo2|")); +// LLA: s7 = s8.replaceAt(8, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("hallo2|"))); // LLA: TEST_ENSURE( s7.getLength() == 57, "test_OWString error 43"); // LLA: // LLA: sal_Int32 pos = 0; -// LLA: while ((pos = s7.indexOf(OUString::createFromAscii("|"))) >= 0) +// LLA: while ((pos = s7.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("|")))) >= 0) // LLA: { -// LLA: s8 = s7.replaceAt(pos, 1, OUString::createFromAscii("**")); +// LLA: s8 = s7.replaceAt(pos, 1, OUString(RTL_CONSTASCII_USTRINGPARAM("**"))); // LLA: s7 = s8; // LLA: } // LLA: TEST_ENSURE( s7.getLength() == 66, "test_OWString error 44"); - TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("bbb" ) ) < 0, "test_OWString error 46" ); - TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("aaa" ) ) == 0, "test_OWString error 46" ); - TEST_ENSURE( OUString::createFromAscii("bbb" ).compareTo( OUString::createFromAscii("aaa" ) ) > 0, "test_OWString error 47" ); - TEST_ENSURE( OUString::createFromAscii("aaaa" ).compareTo( OUString::createFromAscii("bbb" ) ) < 0, "test_OWString error 48" ); - TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("bbbb" ) ) < 0, "test_OWString error 49" ); - TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("aaaa" ) ) < 0, "test_OWString error 50" ); - TEST_ENSURE( OUString::createFromAscii("aaaa" ).compareTo( OUString::createFromAscii("aaa" ) ) > 0, "test_OWString error 51" ); - TEST_ENSURE( OUString::createFromAscii("bbbb" ).compareTo( OUString::createFromAscii("bbb" ) ) > 0, "test_OWString error 52" ); - TEST_ENSURE( OUString::createFromAscii("bbb" ) == OUString::createFromAscii("bbb" ), "test_OWString error 53" ); - TEST_ENSURE( OUString::createFromAscii("bbb" ) == OUString::createFromAscii("bbb" ), "test_OWString error 54" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) < 0, "test_OWString error 46" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) == 0, "test_OWString error 46" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) > 0, "test_OWString error 47" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) < 0, "test_OWString error 48" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbbb")) ) < 0, "test_OWString error 49" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")) ) < 0, "test_OWString error 50" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) > 0, "test_OWString error 51" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbbb")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) > 0, "test_OWString error 52" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) == OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")), "test_OWString error 53" ); + TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) == OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")), "test_OWString error 54" ); { - OUString uStr = OUString::createFromAscii( "Hallo" ); - TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Hallo"), 5 ) == 0, "test_OWString error 54.2.1" ); - TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Halloa"), 6 ) < 0 , "test_OWString error 54.2.2" ); - TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("1Hallo"), 6 ) > 0, "test_OWString error 54.2.3" ); - TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Aallo"), 5 ) > 0, "test_OWString error 54.2.4" ); - TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Halla"), 5 ) > 0, "test_OWString error 54.2.5" ); - TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Mallo"), 5 ) < 0, "test_OWString error 54.2.6" ); - TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Hallp"), 5 ) < 0, "test_OWString error 54.2.7" ); + OUString uStr = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")); + TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")), 5 ) == 0, "test_OWString error 54.2.1" ); + TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Halloa")), 6 ) < 0 , "test_OWString error 54.2.2" ); + TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("1Hallo")), 6 ) > 0, "test_OWString error 54.2.3" ); + TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Aallo")), 5 ) > 0, "test_OWString error 54.2.4" ); + TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Halla")), 5 ) > 0, "test_OWString error 54.2.5" ); + TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Mallo")), 5 ) < 0, "test_OWString error 54.2.6" ); + TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallp")), 5 ) < 0, "test_OWString error 54.2.7" ); } #if OSL_DEBUG_LEVEL == 0 //YD will fail copy assert on indexes, because ':' returns -1 - s7 = OUString::createFromAscii("Hallo jetzt komm ich"); + s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich")); s8 = s7.copy(0, s7.indexOf((sal_Unicode)':')); TEST_ENSURE( s8.getLength() == 0, "test_OWString error 55"); TEST_ENSURE( s8.compareTo(OUString()) == 0, "test_OWString error 56"); @@ -306,7 +306,7 @@ void oldtests::test_OUString() TEST_ENSURE( nCompareResult21_Len13 > 0, "test_OWString error 66" ); { - OUString uStr = OUString::createFromAscii( "Hallo" ); + OUString uStr = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")); TEST_ENSURE( uStr.equalsAsciiL( "Hallo", 5 ), "test_OWString error 66.1.1" ); TEST_ENSURE( !uStr.equalsAsciiL( "Hallo1", 6 ), "test_OWString error 66.1.2" ); TEST_ENSURE( !uStr.equalsAsciiL( "1Hallo", 6 ), "test_OWString error 66.1.3" ); @@ -323,14 +323,14 @@ void oldtests::test_OUString() } // toInt64 - OUString s9( OUString::createFromAscii(" -3223372036854775807") ); + OUString s9( OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807")) ); sal_Int64 ln1 = s9.toInt64(); #if (defined UNX) || (defined OS2) TEST_ENSURE( ln1 == -3223372036854775807LL, "test_OWString error 67" ); #else TEST_ENSURE( ln1 == -3223372036854775807, "test_OWString error 67" ); #endif - OUString s10( OUString::createFromAscii("13243A65f1H45") ); + OUString s10( OUString(RTL_CONSTASCII_USTRINGPARAM("13243A65f1H45")) ); sal_Int64 ln2 = s10.toInt64(); TEST_ENSURE( ln2 == 13243, "test_OWString error 68" ); @@ -341,16 +341,16 @@ void oldtests::test_OUString() TEST_ENSURE( ln3 == 0x13243A65F1, "test_OWString error 69" ); #endif // Exotic base - OUString s11( OUString::createFromAscii("H4A") ); + OUString s11( OUString(RTL_CONSTASCII_USTRINGPARAM("H4A")) ); sal_Int64 ln4 = s11.toInt64( 23 ); TEST_ENSURE( ln4 == 23*23*17 + 4 * 23 + 10, "test_OWString error 70" ); // toInt32 - OUString s12( OUString::createFromAscii(" -220368507") ); + OUString s12( OUString(RTL_CONSTASCII_USTRINGPARAM(" -220368507")) ); sal_Int32 n1 = s12.toInt32(); TEST_ENSURE( n1 == -220368507, "test_OWString error 71" ); - OUString s13( OUString::createFromAscii("4423A61H45") ); + OUString s13( OUString(RTL_CONSTASCII_USTRINGPARAM("4423A61H45")) ); sal_Int64 n2 = s13.toInt32(); TEST_ENSURE( n2 == 4423, "test_OWString error 72" ); @@ -376,13 +376,13 @@ void oldtests::test_OString2OUStringAndViceVersa() { OString s1("Hallo jetzt komm ich"); OUString u1 = OStringToOUString(s1, RTL_TEXTENCODING_MS_1252); - TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 1" ); + TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 1" ); u1 = OStringToOUString(s1, RTL_TEXTENCODING_IBM_850); - TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 2" ); + TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 2" ); u1 = OStringToOUString(s1, RTL_TEXTENCODING_ISO_8859_15); - TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 3" ); + TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 3" ); u1 = OStringToOUString(s1, RTL_TEXTENCODING_ASCII_US); - TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 4" ); + TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 4" ); OString s2 = OUStringToOString(u1, RTL_TEXTENCODING_MS_1252); TEST_ENSURE( s2.equals("Hallo jetzt komm ich"), "test_OString2OWStringAndViceVersa error 5" ); diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx index fa03107e2a28..6f21cf655cac 100644 --- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx +++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx @@ -159,29 +159,29 @@ void oldtests::test_OUStringBuffer() // "Mein erster RTL OUString\n" // | | | | | // Index 0 5 10 15 20 - OUString s1(OUString::createFromAscii("Mein erster RTL OUString\n")); + OUString s1(OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n"))); OUStringBuffer b1(s1); TEST_ENSURE( b1.getCapacity() == 16 + s1.getLength(), "test_OWStringBuffer error 1"); - b1.insert(b1.getLength() - 1, OUString::createFromAscii("Buffer")); - s1 = OUString::createFromAscii("Mein erster RTL OUStringBuffer\n"); + b1.insert(b1.getLength() - 1, OUString(RTL_CONSTASCII_USTRINGPARAM("Buffer"))); + s1 = OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUStringBuffer\n")); TEST_ENSURE( s1 == b1.getStr(), "test_OWStringBuffer error 2"); - b1.insert(b1.getLength() - 1, OUString::createFromAscii(" ist viel zu gross fuer den alten Buffer")); + b1.insert(b1.getLength() - 1, OUString(RTL_CONSTASCII_USTRINGPARAM(" ist viel zu gross fuer den alten Buffer"))); //TEST_ENSURE( b1.getCapacity() == b1.getLength(), "test_OWStringBuffer error 3"); OUStringBuffer b2(30); - s1 = OUString::createFromAscii("false"); + s1 = OUString(RTL_CONSTASCII_USTRINGPARAM("false")); sal_Bool b = sal_False; b2.append(b); TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 4"); sal_Int32 n = 123456789L; - s1 += OUString::createFromAscii(" 123456789"); - b2.append(OUString::createFromAscii(" ")); + s1 += OUString(RTL_CONSTASCII_USTRINGPARAM(" 123456789")); + b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); b2.append(n); TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 5"); @@ -194,8 +194,8 @@ void oldtests::test_OUStringBuffer() #else sal_Int64 m = -3223372036854775807; #endif - s1 += OUString::createFromAscii(" -3223372036854775807"); - b2.append(OUString::createFromAscii(" ")); + s1 += OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807")); + b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); b2.append(m); TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 6"); #endif @@ -206,34 +206,34 @@ void oldtests::test_OUStringBuffer() b2.ensureCapacity(50); TEST_ENSURE( b2.getCapacity() == 50, "test_OWStringBuffer error 8"); - b2.append(OUString::createFromAscii("Hier fuege ich jetzt ein > <\n")); - b2.insert(26, OUString::createFromAscii(" Hallo")); - s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > Hallo <\n"); + b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > <\n"))); + b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" Hallo"))); + s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > Hallo <\n")); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 9"); b2.insert(26, b); - b2.insert(26, OUString::createFromAscii(" ")); - s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > false Hallo <\n"); + b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); + s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > false Hallo <\n")); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 10"); b2.insert(26, n); - b2.insert(26, OUString::createFromAscii(" ")); - s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > 123456789 false Hallo <\n"); + b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); + s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > 123456789 false Hallo <\n")); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 11"); #ifndef SAL_OS2 b2.insert(26, m); - b2.insert(26, OUString::createFromAscii(" ")); - s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n"); + b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); + s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n")); TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 12"); #endif // ASCII-Schnittstelle, AB 15.10.1999 - OUString s3(OUString::createFromAscii("Noch'n RTL OUString")); + OUString s3(OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString"))); OUStringBuffer b3(s3); sal_Char aAsciiStr[] = " mit appendetem ASCII\n"; b3.appendAscii( aAsciiStr ); - s3 = OUString::createFromAscii("Noch'n RTL OUString mit appendetem ASCII\n"); + s3 = OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString mit appendetem ASCII\n")); TEST_ENSURE( b3.getStr() == s3 , "test_OWStringBuffer error 13"); diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testHelperFunctions.cxx index be58ac4effa6..6341fe35a980 100644 --- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx +++ b/sal/qa/testHelperFunctions/testHelperFunctions.cxx @@ -216,7 +216,7 @@ namespace testOfHelperFunctions rtl::OString sValue("foo bar"); t_print("a String '%s' (should be 'foo bar')\n", sValue.getStr()); - rtl::OUString suValue(rtl::OUString::createFromAscii("a unicode string")); + rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("a unicode string")); sValue <<= suValue; t_print("a String '%s'\n", sValue.getStr()); } diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx index 465b05229555..52ec09121c6d 100644 --- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx +++ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx @@ -47,7 +47,7 @@ namespace testOfHelperFunctions void test_valueequal::valueequal_001( ) { rtl::OString sValue; - rtl::OUString suValue(rtl::OUString::createFromAscii("This is only a test of some helper functions")); + rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("This is only a test of some helper functions")); sValue <<= suValue; t_print("'%s'\n", sValue.getStr()); } diff --git a/sal/workben/getlocaleinfotest.cxx b/sal/workben/getlocaleinfotest.cxx index da2642ca147b..f8467e945a91 100644 --- a/sal/workben/getlocaleinfotest.cxx +++ b/sal/workben/getlocaleinfotest.cxx @@ -35,8 +35,8 @@ int _cdecl main( int argc, char * argv[] ) { - rtl::OUString lang = rtl::OUString::createFromAscii( "de" ); - rtl::OUString country = rtl::OUString::createFromAscii( "DE" ); + rtl::OUString lang(RTL_CONSTASCII_USTRINGPARAM("de")); + rtl::OUString country(RTL_CONSTASCII_USTRINGPARAM("DE")); rtl_TextEncoding rtlTextEnc; rtl_Locale* rtlLocale = diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx index bff7d6dea096..f99b06c0727f 100644 --- a/sal/workben/measure_oustrings.cxx +++ b/sal/workben/measure_oustrings.cxx @@ -53,7 +53,7 @@ SAL_IMPLEMENT_MAIN() //get my cpu fan up to speed :-) for (int i = 0; i < 10000000; ++i) { - rtl::OUString sFoo(rtl::OUString::createFromAscii("X")); + rtl::OUString sFoo(RTL_CONSTASCII_USTRINGPARAM("X")); rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM("X")); #ifdef SAL_DECLARE_UTF16 rtl::OUString sBoo(RTL_CONSTASCII_USTRINGPARAM_WIDE("X")); @@ -75,7 +75,7 @@ SAL_IMPLEMENT_MAIN() { sal_uInt32 nStartTime = osl_getGlobalTimer(); for (int i = 0; i < 100000000; ++i) - rtl::OUString sFoo(rtl::OUString::createFromAscii("")); + rtl::OUString sFoo(OUString()); sal_uInt32 nEndTime = osl_getGlobalTimer(); std::cout << "rtl::OUString::createFromAscii() " << nEndTime - nStartTime << "ms" << std::endl; } @@ -85,7 +85,7 @@ SAL_IMPLEMENT_MAIN() { sal_uInt32 nStartTime = osl_getGlobalTimer(); for (int i = 0; i < 100000000; ++i) - rtl::OUString sFoo(rtl::OUString::createFromAscii("X")); + rtl::OUString sFoo(RTL_CONSTASCII_USTRINGPARAM("X")); sal_uInt32 nEndTime = osl_getGlobalTimer(); std::cout << "rtl::OUString::createFromAscii(\"X\") " << nEndTime - nStartTime << "ms" << std::endl; } @@ -120,7 +120,7 @@ SAL_IMPLEMENT_MAIN() { sal_uInt32 nStartTime = osl_getGlobalTimer(); for (int i = 0; i < 100000000; ++i) - rtl::OUString sFoo(rtl::OUString::createFromAscii("XXXXXXXXXXXXXXX")); + rtl::OUString sFoo(RTL_CONSTASCII_USTRINGPARAM("XXXXXXXXXXXXXXX")); sal_uInt32 nEndTime = osl_getGlobalTimer(); std::cout << "rtl::OUString::createFromAscii(\"XXXXXXXX\") " << nEndTime - nStartTime << "ms" << std::endl; } diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index d92522fa07ca..4881248eb212 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -163,7 +163,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::createFromAscii("/testfile.ini"); + iniFileURL+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testfile.ini")); // Open the ini-File pFile=new File( iniFileURL ); @@ -906,7 +906,7 @@ void FileCopyAndMoveTest( void ) // FileCopyTest //-------------------------------------------------- - destPath+=rtl::OUString::createFromAscii("/"); + destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); destPath+=file3; printf( "Copy the file "); @@ -940,7 +940,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir_not_exist ); - destPath+=rtl::OUString::createFromAscii("/"); + destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); destPath+=file3; printf( "Copy a file to a not existing directory \n"); @@ -973,7 +973,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir2 ); - destPath+=rtl::OUString::createFromAscii("/"); + destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); destPath+=file3; printf( "Move the file "); @@ -1022,7 +1022,7 @@ void FileCopyAndMoveTest( void ) //-------------------------------------------------- destPath=rtl::OUString( dir_not_exist ); - destPath+=rtl::OUString::createFromAscii("/"); + destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); destPath+=file3; printf( "Move a file to a not existing directory: \n"); @@ -2302,15 +2302,15 @@ void AbsolutePathTest(void) printf( "AbsolutePath-Test\n" ); printf( "--------------------------------------------\n\n" ); - DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii(".")); - DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("..")); - DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("../..")); - DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("../HUHU")); + DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); + DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".."))); + DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../.."))); + DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU"))); - DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii(".")); - DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("..")); - DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("../..")); - DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("../HUHU")); + DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))); + DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".."))); + DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../.."))); + DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU"))); PressKey(); return; @@ -2420,7 +2420,7 @@ void SearchPathTest(void) printFileName( file3 ); printf( "\n" ); - rc=FileBase::searchFileURL( file3 , rtl::OUString::createFromAscii("") , strResultPath ); + rc=FileBase::searchFileURL( file3 , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) , strResultPath ); if ( rc == FileBase::E_None ) { @@ -2457,7 +2457,7 @@ void SearchPathTest(void) //------------------------------------------------------------ rtl::OUString strSearchPath( dir_not_exist ); - strSearchPath+=rtl::OUString::createFromAscii(";"); + strSearchPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")); strSearchPath+=dir_on_server; printf( "\nsearchFileURL: File : "); diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 5bf2e3abb34d..2063073cbcd9 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -1324,7 +1324,7 @@ void SAL_CALL NestedRegistryImpl::close( ) } /* throw InvalidRegistryException( - OUString::createFromAscii("the 'close' method is not specified for a nested registry"), + OUString(RTL_CONSTASCII_USTRINGPARAM("the 'close' method is not specified for a nested registry")), Reference< XInterface >() ); */ } diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx index 91d04623c0ec..deb523d70e0b 100644 --- a/stoc/test/excomp/excomp.cxx +++ b/stoc/test/excomp/excomp.cxx @@ -86,25 +86,25 @@ SAL_IMPLEMENT_MAIN() OUString exePath( getExePath() ); OUString excompRdb(exePath); - excompRdb += OUString::createFromAscii("excomp.rdb"); + excompRdb += OUString(RTL_CONSTASCII_USTRINGPARAM("excomp.rdb")); Reference< XMultiServiceFactory > xSMgr = ::cppu::createRegistryServiceFactory( excompRdb ); TEST_ENSHURE( xSMgr.is(), "excomp error 0" ); typelib_TypeDescription* pTypeDesc = NULL; - OUString sType = OUString::createFromAscii("com.sun.star.text.XTextDocument"); + OUString sType(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.XTextDocument")); typelib_typedescription_getByName( &pTypeDesc, sType.pData); // typelib_InterfaceTypeDescription* pInterDesc = (typelib_InterfaceTypeDescription*)pTypeDesc; - Reference< XInterface > xIFace = xSMgr->createInstance(OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration")); + Reference< XInterface > xIFace = xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))); Reference< XImplementationRegistration > xImpReg( xIFace, UNO_QUERY); TEST_ENSHURE( xImpReg.is(), "excomp error 1" ); try { - xImpReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + xImpReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), compName1, Reference< XSimpleRegistry >() ); - xImpReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + xImpReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), compName2, Reference< XSimpleRegistry >() ); } @@ -113,10 +113,10 @@ SAL_IMPLEMENT_MAIN() TEST_ENSHURE( e.Message.getLength(), OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr() ); } - Reference< XTest > xTest1( xSMgr->createInstance(OUString::createFromAscii("example.ExampleComponent1")), + Reference< XTest > xTest1( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("example.ExampleComponent1"))), UNO_QUERY); TEST_ENSHURE( xTest1.is(), "excomp error 2" ); - Reference< XTest > xTest2( xSMgr->createInstance(OUString::createFromAscii("example.ExampleComponent2")), + Reference< XTest > xTest2( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("example.ExampleComponent2"))), UNO_QUERY); TEST_ENSHURE( xTest2.is(), "excomp error 3" ); diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx index cb71cdc83203..058a06bc3f97 100644 --- a/stoc/test/excomp/excomp1.cxx +++ b/stoc/test/excomp/excomp1.cxx @@ -129,7 +129,7 @@ Sequence<OUString> SAL_CALL ExampleComponent1Impl::getSupportedServiceNames_Stat OUString SAL_CALL ExampleComponent1Impl::getMessage() throw(RuntimeException) { Guard< Mutex > aGuard( m_mutex ); - return OUString::createFromAscii("Lalelu nur der Mann im Mond schaut zu ..."); + return OUString(RTL_CONSTASCII_USTRINGPARAM("Lalelu nur der Mann im Mond schaut zu ...")); } diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx index 6439296f703a..f62e957efec4 100644 --- a/stoc/test/excomp/excomp2.cxx +++ b/stoc/test/excomp/excomp2.cxx @@ -199,7 +199,7 @@ Sequence<OUString> SAL_CALL ExampleComponent2Impl::getSupportedServiceNames_Stat OUString SAL_CALL ExampleComponent2Impl::getMessage() throw(RuntimeException) { Guard< Mutex > aGuard( m_mutex ); - return OUString::createFromAscii("Alle meine Entchen schwimmen auf dem See, schwimmen auf dem See ..."); + return OUString(RTL_CONSTASCII_USTRINGPARAM("Alle meine Entchen schwimmen auf dem See, schwimmen auf dem See ...")); } diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx index 02471d1c5d87..cb47b3371e8c 100644 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx +++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx @@ -868,7 +868,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &) } rtl::OUString Service::getImplementationName() { - return rtl::OUString::createFromAscii("test.registrytdprovider.impl"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test.registrytdprovider.impl")); } css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() { @@ -912,9 +912,9 @@ namespace { bool writeInfo(void * registryKey, rtl::OUString const & implementationName, css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName(rtl::OUString::createFromAscii("/")); + rtl::OUString keyName(RTL_CONSTASCII_USTRINGPARAM("/")); keyName += implementationName; - keyName += rtl::OUString::createFromAscii("/UNO/SERVICES"); + keyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index 0901ae6522e7..6f3542697b94 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -299,7 +299,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) } rtl::OUString Service::getImplementationName() { - return rtl::OUString::createFromAscii("test.tdmanager.impl"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test.tdmanager.impl")); } css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() { @@ -343,9 +343,9 @@ namespace { bool writeInfo(void * registryKey, rtl::OUString const & implementationName, css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName(rtl::OUString::createFromAscii("/")); + rtl::OUString keyName(RTL_CONSTASCII_USTRINGPARAM("/")); keyName += implementationName; - keyName += rtl::OUString::createFromAscii("/UNO/SERVICES"); + keyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index 05ebf9a82de5..978bab5b0c2e 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -306,66 +306,66 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) sal_uInt32 nElems = 0; // ==BYTE== - aVal <<= OUString::createFromAscii( "0xff" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xff")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "255" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("255")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_Int8)0xffu; pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "0x80" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x80")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "128" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("128")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_Int8)( 0x80u ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "0x7f" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7f")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "127" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("127")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (sal_Int8)( 0x7f ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "5" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("5")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "+5" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+5")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (sal_Int8)( 5 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "-5" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-5")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa aVal <<= (sal_Int8)( -5 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "256" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("256")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==UINT16== - aVal <<= OUString::createFromAscii( "65535" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("65535")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "0xffff" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xffff")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt16)( 0xffff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "32768" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("32768")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt16)( 0x8000 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "32767" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("32767")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "0x7fff" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7fff")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt16)( 0x7fff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "256" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("256")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "0x100" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x100")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt16)( 0x100 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0 ); @@ -396,33 +396,33 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==UINT32== - aVal <<= OUString::createFromAscii( "+4294967295" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+4294967295")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "4294967295" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("4294967295")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "0xffffffff" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xffffffff")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt32)( 0xffffffff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "-2147483648" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-2147483648")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "-0x80000000" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-0x80000000")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa aVal <<= (sal_uInt32)( 0x80000000 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "2147483647" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("2147483647")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "0x7fffffff" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x7fffffff")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt32)( 0x7fffffff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "65536" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("65536")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); - aVal <<= OUString::createFromAscii( "0x10000" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x10000")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt32)( 0x10000 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0 ); @@ -433,7 +433,7 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) aVal <<= (sal_uInt32)( 5 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "0xfffffffb" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0xfffffffb")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (sal_uInt32)( -5 ); // is 0xfffffffb pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); @@ -461,27 +461,27 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==FLOAT== - aVal <<= OUString::createFromAscii( "-3.4e+38" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-3.4e+38")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (float)( MIN_FLOAT ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "+3.4e+38" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+3.4e+38")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (float)( MAX_FLOAT ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "9e-20" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("9e-20")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (float)( 9e-20 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "+.7071067811865" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("+.7071067811865")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (float)( .7071067811865 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "3.14159265359" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("3.14159265359")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); aVal <<= (float)( 3.14159265359 ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); @@ -490,12 +490,12 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==DOUBLE== - aVal <<= OUString::createFromAscii( "-1.7976931348623155e+308" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-1.7976931348623155e+308")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (double)( MIN_DOUBLE ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "1.7976931348623155e+308" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("1.7976931348623155e+308")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); aVal <<= (double)( MAX_DOUBLE ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); @@ -521,7 +521,7 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) aVal <<= (double)( 0xffffffff ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "0x100000000" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0x100000000")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); #ifndef OS2 aVal <<= (double)( SAL_CONST_INT64(0x100000000) ); @@ -536,20 +536,20 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) aVal.setValue( &c, ::getCharCppuType() ); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "A" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("A")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==BOOL== - aVal <<= OUString::createFromAscii( "0" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "1" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("1")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "False" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("False")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "true" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("true")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa @@ -561,17 +561,17 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) aVal <<= OUString(); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "-" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "-0" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("-0")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa // ==TYPECLASS ENUM== - aVal <<= OUString::createFromAscii( "eNuM" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("eNuM")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa - aVal <<= OUString::createFromAscii( "DOUBLE" ); + aVal <<= OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")); pTestBlocks[nElems++] = ConvBlock( aVal, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa int e = 1; @@ -601,19 +601,19 @@ static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) Sequence< Any > aAnySeq( 2 ), aAnySeq2( 2 ), aAnySeq3( 2 ); Any * pAnySeq = aAnySeq.getArray(); pAnySeq[0] = makeAny( aINT32Seq ); - pAnySeq[1] = makeAny( OUString::createFromAscii("lala") ); + pAnySeq[1] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("lala")) ); aVal <<= aAnySeq; pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa pAnySeq = aAnySeq2.getArray(); pAnySeq[0] <<= (sal_Int32)4711; - pAnySeq[1] <<= OUString::createFromAscii("0815"); + pAnySeq[1] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("0815")); aVal <<= aAnySeq2; pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa pAnySeq = aAnySeq3.getArray(); - pAnySeq[0] <<= OUString::createFromAscii("TypeClass_UNION"); - pAnySeq[1] <<= OUString::createFromAscii("TypeClass_ENUM"); + pAnySeq[0] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TypeClass_UNION")); + pAnySeq[1] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("TypeClass_ENUM")); aVal <<= aAnySeq3; pTestBlocks[nElems++] = ConvBlock( aVal, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 ); // st,do,fl,u3,i3,u1,i1,by,bo,ch,tc,si,sa @@ -626,7 +626,7 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr ) printf( "test_Conversion(): start...\n" ); Reference< XTypeConverter > xConverter( xMgr->createInstance( - OUString::createFromAscii( "com.sun.star.script.Converter" ) ), UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ), UNO_QUERY ); ConvBlock * pTestBlocks = new ConvBlock[256]; sal_Int32 nPos = initBlocks( pTestBlocks ); @@ -676,18 +676,18 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr ) SAL_IMPLEMENT_MAIN() { - Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString::createFromAscii("stoctest.rdb") ) ); + Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")) ) ); try { Reference< XImplementationRegistration > xImplReg( - xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY ); + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); OUString aLibName( RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION) ); xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aLibName, Reference< XSimpleRegistry >() ); test_Conversion( xMgr ); diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index 75d0782b1cf5..e2e44c366e96 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -106,23 +106,23 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Reference< XHierarchicalNameAccess > xHNameAccess( xRefl, UNO_QUERY ); TEST_ENSHURE(xHNameAccess.is(), "### cannot get XHierarchicalNameAccess!" ); - TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.StructA"))->getName() == OUString::createFromAscii("ModuleA.StructA"), "test_RegCoreReflection(): error 2b"); - TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.ExceptionB"))->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 2c"); - TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.ModuleB.EnumA")).is(), "test_RegCoreReflection(): error 2e"); + TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")))->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 2b"); + TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionB")))->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 2c"); + TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA"))).is(), "test_RegCoreReflection(): error 2e"); // const - TEST_ENSHURE(*(const sal_Bool *)xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstBoolean")).getValue() == aConstBoolean, "test_RegCoreReflection(): error 4c"); - TEST_ENSHURE(*(const sal_Int8 *)xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstByte")).getValue() == aConstByte, "test_RegCoreReflection(): error 4e"); - TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstShort")) == aConstShort, "test_RegCoreReflection(): error 4g"); - TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstUShort")) == aConstUShort, "test_RegCoreReflection(): error 4i"); - TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstLong")) == aConstLong, "test_RegCoreReflection(): error 4k"); - TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstULong")) == aConstULong, "test_RegCoreReflection(): error 4m"); -// TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstFloat")) == aConstFloat, "test_RegCoreReflection(): error 4o"); -// TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString::createFromAscii("ModuleC.aConstDouble")) == aConstDouble, "test_RegCoreReflection(): error 4q"); + TEST_ENSHURE(*(const sal_Bool *)xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstBoolean"))).getValue() == aConstBoolean, "test_RegCoreReflection(): error 4c"); + TEST_ENSHURE(*(const sal_Int8 *)xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstByte"))).getValue() == aConstByte, "test_RegCoreReflection(): error 4e"); + TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstShort"))) == aConstShort, "test_RegCoreReflection(): error 4g"); + TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstUShort"))) == aConstUShort, "test_RegCoreReflection(): error 4i"); + TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstLong"))) == aConstLong, "test_RegCoreReflection(): error 4k"); + TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstULong"))) == aConstULong, "test_RegCoreReflection(): error 4m"); +// TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstFloat"))) == aConstFloat, "test_RegCoreReflection(): error 4o"); +// TEST_ENSHURE(xHNameAccess->getByHierarchicalName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.aConstDouble"))) == aConstDouble, "test_RegCoreReflection(): error 4q"); // Enums - xClass = xRefl->forName(OUString::createFromAscii("ModuleA.ModuleB.EnumA")); + xClass = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA"))); TEST_ENSHURE(xClass.is(), "test_RegCoreReflection(): error 5"); @@ -141,9 +141,9 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) // Interface - Reference< XIdlClass > xA = xRefl->forName( OUString::createFromAscii("ModuleC.XInterfaceB") ); + Reference< XIdlClass > xA = xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceB")) ); - xClass = xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceB")); + xClass = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceB"))); TEST_ENSHURE(xClass == xA, "test_RegCoreReflection(): error 7"); TEST_ENSHURE(xClass.is(), "test_RegCoreReflection(): error 7a"); @@ -159,10 +159,10 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) typelib_typedescription_release( pTD ); TEST_ENSHURE(xClass->getSuperclasses().getLength() == 1, "test_RegCoreReflection(): error 9"); - TEST_ENSHURE(xClass->getSuperclasses().getArray()[0]->getName() == OUString::createFromAscii("ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 10"); + TEST_ENSHURE(xClass->getSuperclasses().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")), "test_RegCoreReflection(): error 10"); TEST_ENSHURE(xClass->getMethods().getLength() == 7, "test_RegCoreReflection(): error 11"); TEST_ENSHURE(xA->getMethods().getLength() == 7, "test_RegCoreReflection(): error 11a"); - TEST_ENSHURE(xClass->getMethods().getArray()[3]->getName() == OUString::createFromAscii("methodA"), "test_RegCoreReflection(): 12"); + TEST_ENSHURE(xClass->getMethods().getArray()[3]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodA")), "test_RegCoreReflection(): 12"); TEST_ENSHURE(xClass->getMethods().getArray()[3]->getReturnType()->getTypeClass() == TypeClass_VOID, "test_RegCoreReflection(): error 13"); TEST_ENSHURE(xClass->getMethods().getArray()[3]->getParameterTypes().getLength() == 0, "test_RegCoreReflection(): error 14"); TEST_ENSHURE(xClass->getMethods().getArray()[3]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 15"); @@ -175,44 +175,44 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) TEST_ENSHURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aType == xRefl->forName( OUString( RTL_CONSTASCII_USTRINGPARAM("short") ) ), "test_RegCoreReflection(): error 18b"); TEST_ENSHURE(xClass->getMethods().getArray()[4]->getParameterInfos().getArray()[0].aMode == ParamMode_IN, "test_RegCoreReflection(): error 18c"); TEST_ENSHURE(xClass->getMethods().getArray()[4]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 19"); - TEST_ENSHURE(xClass->getMethods().getArray()[5]->getName() == OUString::createFromAscii("methodC"), "test_RegCoreReflection(): error 20"); + TEST_ENSHURE(xClass->getMethods().getArray()[5]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")), "test_RegCoreReflection(): error 20"); TEST_ENSHURE(xClass->getMethods().getArray()[5]->getMode() == MethodMode_TWOWAY, "test_RegCoreReflection(): error 20a"); TEST_ENSHURE(xClass->getMethods().getArray()[5]->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 21"); TEST_ENSHURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 22"); - TEST_ENSHURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getName() == OUString::createFromAscii("ModuleA.StructB"), "test_RegCoreReflection(): error 23"); + TEST_ENSHURE(xClass->getMethods().getArray()[5]->getReturnType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructB")), "test_RegCoreReflection(): error 23"); TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getLength() == 2, "test_RegCoreReflection(): error 24"); TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 25"); - TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getName() == OUString::createFromAscii("ModuleA.StructC"), "test_RegCoreReflection(): error 26"); + TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")), "test_RegCoreReflection(): error 26"); TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 27"); - TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getName() == OUString::createFromAscii("ModuleA.StructA"), "test_RegCoreReflection(): error 28"); + TEST_ENSHURE(xClass->getMethods().getArray()[5]->getParameterTypes().getArray()[1]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 28"); TEST_ENSHURE(xClass->getMethods().getArray()[5]->getExceptionTypes().getLength() == 0, "test_RegCoreReflection(): error 29"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getName() == OUString::createFromAscii("methodD"), "test_RegCoreReflection(): error 30"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("methodD")), "test_RegCoreReflection(): error 30"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getReturnType()->getTypeClass() == TypeClass_INTERFACE, "test_RegCoreReflection(): error 31"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getReturnType()->getName() == OUString::createFromAscii("ModuleC.XInterfaceA"), "test_RegCoreReflection(): error 32"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getReturnType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")), "test_RegCoreReflection(): error 32"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getParameterTypes().getLength() == 1, "test_RegCoreReflection(): error 33"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getTypeClass() == TypeClass_ENUM, "test_RegCoreReflection(): error 34"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getName() == OUString::createFromAscii("ModuleA.ModuleB.EnumA"), "test_RegCoreReflection(): error 35"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getParameterTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ModuleB.EnumA")), "test_RegCoreReflection(): error 35"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getLength() == 3, "test_RegCoreReflection(): error 36"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 37"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getName() == OUString::createFromAscii("ModuleA.ExceptionA"), "test_RegCoreReflection(): error 38"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[0]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionA")), "test_RegCoreReflection(): error 38"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 38"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getName() == OUString::createFromAscii("ModuleA.ExceptionB"), "test_RegCoreReflection(): error 39"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[1]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionB")), "test_RegCoreReflection(): error 39"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getTypeClass() == TypeClass_EXCEPTION, "test_RegCoreReflection(): error 40"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getName() == OUString::createFromAscii("ModuleA.ExceptionC"), "test_RegCoreReflection(): error 41"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.ExceptionC")), "test_RegCoreReflection(): error 41"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getLength() == 3, "test_RegCoreReflection(): error 42"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getTypeClass() == TypeClass_BOOLEAN, "test_RegCoreReflection(): error 43"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getName() == OUString::createFromAscii("boolean"), "test_RegCoreReflection(): error 43a"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[0]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")), "test_RegCoreReflection(): error 43a"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getTypeClass() == TypeClass_STRUCT, "test_RegCoreReflection(): error 44"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getName() == OUString::createFromAscii("ModuleA.StructC"), "test_RegCoreReflection(): error 45"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[1]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")), "test_RegCoreReflection(): error 45"); TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getTypeClass() == TypeClass_INTERFACE, "test_RegCoreReflection(): error 46"); - TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getName() == OUString::createFromAscii("ModuleA.XInterface1"), "test_RegCoreReflection(): error 47"); + TEST_ENSHURE(xClass->getMethods().getArray()[6]->getExceptionTypes().getArray()[2]->getFields().getArray()[2]->getType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.XInterface1")), "test_RegCoreReflection(): error 47"); // SequenceReflections - TEST_ENSHURE(xRefl->forName( OUString::createFromAscii("[]ModuleA.StructA") )->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 48"); - TEST_ENSHURE(xRefl->forName( OUString::createFromAscii("[]ModuleA.StructA") )->getComponentType().is(), "test_RegCoreReflection(): error 49"); - TEST_ENSHURE(xRefl->forName( OUString::createFromAscii("[][]ModuleA.StructA") )->getComponentType()->getComponentType()->getName() == OUString::createFromAscii("ModuleA.StructA"), "test_RegCoreReflection(): error 50"); - TEST_ENSHURE(xRefl->forName( OUString::createFromAscii("[]com.sun.star.uno.XInterface") ) == xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString::createFromAscii("aInterfaceSeq"))->getType(), "test_RegCoreReflection(): error 51"); + TEST_ENSHURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 48"); + TEST_ENSHURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->getComponentType().is(), "test_RegCoreReflection(): error 49"); + TEST_ENSHURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[][]ModuleA.StructA")) )->getComponentType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")), "test_RegCoreReflection(): error 50"); + TEST_ENSHURE(xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]com.sun.star.uno.XInterface")) ) == xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aInterfaceSeq")))->getType(), "test_RegCoreReflection(): error 51"); StructC aStructC; aStructC.aLong = aConstLong; @@ -223,7 +223,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any aAny; - xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aInterfaceSeq"))->getType()->createObject(aAny); + xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aInterfaceSeq")))->getType()->createObject(aAny); TEST_ENSHURE(aAny.getValueType() == ::getCppuType( (const Sequence<Reference< XInterface > > *)0 ), "test_RegCoreReflection(): error 51a"); @@ -234,33 +234,33 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) TEST_ENSHURE(*(sal_Int32*)xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get( Any(&aStructC, ::getCppuType( (const StructC *)0 ))).getValue() == aConstLong, "test_RegCoreReflection(): error 52"); - TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleA.StructA"))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->getAccessMode() == FieldAccessMode_READWRITE, "test_RegCoreReflection(): error 52a"); + TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructA")))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->getAccessMode() == FieldAccessMode_READWRITE, "test_RegCoreReflection(): error 52a"); Reference< XIdlField2 > rField ( xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC") ))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") )) , UNO_QUERY ); rField->set(aStructAny, aAny); - TEST_ENSHURE(*(sal_Int32*)xRefl->forName(OUString::createFromAscii("ModuleA.StructB"))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get(aStructAny).getValue() == *(sal_Int32*)aAny.getValue(), "test_RegCoreReflection(): error 53"); + TEST_ENSHURE(*(sal_Int32*)xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructB")))->getField(OUString( RTL_CONSTASCII_USTRINGPARAM("aLong") ))->get(aStructAny).getValue() == *(sal_Int32*)aAny.getValue(), "test_RegCoreReflection(): error 53"); - xRefl->forName( OUString::createFromAscii("[]ModuleA.StructA") )->createObject(aAny); + xRefl->forName( OUString(RTL_CONSTASCII_USTRINGPARAM("[]ModuleA.StructA")) )->createObject(aAny); TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]ModuleA.StructA")), "test_RegCoreReflection(): error 54"); - xRefl->forName(OUString::createFromAscii("[][]ModuleA.StructA"))->createObject(aAny); + xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][]ModuleA.StructA")))->createObject(aAny); TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[][]ModuleA.StructA") ), "test_RegCoreReflection(): error 56"); // xClass = xRefl->forName(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.XIntroTest") )); // TEST_ENSHURE(xClass.is(), "test_RegCoreReflection(): error 58"); -// TEST_ENSHURE(xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59"); -// TEST_ENSHURE(xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->getComponentType()->getName() == OUString::createFromAscii("string"), "test_RegCoreReflection(): error 60"); +// TEST_ENSHURE(xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->getTypeClass() == TypeClass_SEQUENCE, "test_RegCoreReflection(): error 59"); +// TEST_ENSHURE(xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->getComponentType()->getName() == OUString(RTL_CONSTASCII_USTRINGPARAM("string")), "test_RegCoreReflection(): error 60"); -// xClass->getMethod(OUString::createFromAscii("getStrings"))->getReturnType()->createObject(aAny); +// xClass->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("getStrings")))->getReturnType()->createObject(aAny); // TEST_ENSHURE(aAny.getValueTypeName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("[]string") ), "test_RegCoreReflection(): error 61"); - TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("[][][]unsigned long"))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62"); + TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("[][][]unsigned long")))->getComponentType()->getComponentType()->getComponentType()->getTypeClass() == TypeClass_UNSIGNED_LONG, "test_RegCoreReflection(): error 62"); try { fprintf( stderr, "%1\n" ); - Any bla = xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->get(Any()); + Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->get(Any()); TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 63"); return sal_False; } @@ -274,9 +274,9 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any blup; blup <<= aStructC; Any gulp; - rField = Reference< XIdlField2 > ( xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString")) , UNO_QUERY); + rField = Reference< XIdlField2 > ( xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString"))) , UNO_QUERY); rField->set( blup, gulp); -// xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp); +// xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp); TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 64"); return sal_False; } @@ -292,8 +292,8 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any blup; blup <<= aStructC; rField = Reference< XIdlField2 > ( - xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString")) , UNO_QUERY); - xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp); + xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString"))) , UNO_QUERY); + xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp); TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 65"); return sal_False; } @@ -302,10 +302,10 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) } Any gulp; - gulp <<= OUString(OUString::createFromAscii("Test")); + gulp <<= OUString(OUString(RTL_CONSTASCII_USTRINGPARAM("Test"))); Any blup; blup <<= aStructC; - xRefl->forName(OUString::createFromAscii("ModuleA.StructC"))->getField(OUString::createFromAscii("aString"))->set(blup, gulp); + xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleA.StructC")))->getField(OUString(RTL_CONSTASCII_USTRINGPARAM("aString")))->set(blup, gulp); Reference< XInterfaceA > xAI = new OInterfaceA(); @@ -316,7 +316,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any a; a <<= xAI; - Any bla = xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceA"))->getMethod(OUString::createFromAscii("methodC"))->invoke(a, params); + Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params); TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 66"); return sal_False; } @@ -334,7 +334,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any a; a <<= xAI; - Any bla = xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceA"))->getMethod(OUString::createFromAscii("methodC"))->invoke(a, params); + Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params); } try { @@ -345,7 +345,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any a; a <<= xAI; - Any bla = xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceA"))->getMethod(OUString::createFromAscii("methodC"))->invoke(a, params); + Any bla = xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params); TEST_ENSHURE(sal_False, "test_RegCoreReflection(): error 67"); return sal_False; } @@ -360,7 +360,7 @@ static sal_Bool test_corefl( const Reference< XIdlReflection > & xRefl ) Any a; a <<= xAI; - TEST_ENSHURE(xRefl->forName(OUString::createFromAscii("ModuleC.XInterfaceA"))->getMethod(OUString::createFromAscii("methodC"))->invoke(a, params).getValueType() + TEST_ENSHURE(xRefl->forName(OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleC.XInterfaceA")))->getMethod(OUString(RTL_CONSTASCII_USTRINGPARAM("methodC")))->invoke(a, params).getValueType() == ::getCppuType( (const Sequence<StructB> *)0 ), "test_RegCoreReflection(): error 68"); return sal_True; diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index 8479a6934803..e4e9f22c5c8f 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -764,7 +764,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT ) sal_True, '@', 17, 0x1234, 0xfedc, 0x12345678, 0xfedcba98, SAL_CONST_INT64(0x123456789abcdef0), SAL_CONST_UINT64(0xfedcba9876543210), - (float)17.0815, 3.1415926359, TestEnum_LOLA, OUString::createFromAscii("dumdidum"), xI, + (float)17.0815, 3.1415926359, TestEnum_LOLA, OUString(RTL_CONSTASCII_USTRINGPARAM("dumdidum")), xI, Any( &xI, ::getCppuType( (const Reference<XInterface > *)0 ) ) ); OSL_ENSURE( aData.Any == xI, "### unexpected any!" ); @@ -867,7 +867,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC { IllegalArgumentException aExc; aExc.ArgumentPosition = 5; - aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum..."); + aExc.Message = OUString(RTL_CONSTASCII_USTRINGPARAM("dum dum dum ich tanz im kreis herum...")); aExc.Context = *this; throw aExc; } @@ -875,7 +875,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeException) { RuntimeException aExc; - aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum..."); + aExc.Message = OUString(RTL_CONSTASCII_USTRINGPARAM("dum dum dum ich tanz im kreis herum...")); aExc.Context = *this; throw aExc; } @@ -883,7 +883,7 @@ sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeE void Test_Impl::setRuntimeException( sal_Int32 /*_runtimeexception*/ ) throw(::com::sun::star::uno::RuntimeException) { RuntimeException aExc; - aExc.Message = OUString::createFromAscii("dum dum dum ich tanz im kreis herum..."); + aExc.Message = OUString(RTL_CONSTASCII_USTRINGPARAM("dum dum dum ich tanz im kreis herum...")); aExc.Context = *this; throw aExc; } @@ -952,7 +952,7 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT ) static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr ) { Reference< XInvocationAdapterFactory > xAdapFac( - xMgr->createInstance( OUString::createFromAscii("com.sun.star.script.InvocationAdapterFactory") ), UNO_QUERY ); + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.InvocationAdapterFactory")) ), UNO_QUERY ); Reference< XInvocationAdapterFactory2 > xAdapFac2( xAdapFac, UNO_QUERY_THROW ); Reference< XLanguageBindingTest > xOriginal( (XLanguageBindingTest *)new Test_Impl() ); @@ -997,9 +997,9 @@ static sal_Bool test_adapter( const Reference< XMultiServiceFactory > & xMgr ) static sal_Bool test_invocation( const Reference< XMultiServiceFactory > & xMgr ) { Reference< XInvocationAdapterFactory > xAdapFac( - xMgr->createInstance( OUString::createFromAscii("com.sun.star.script.InvocationAdapterFactory") ), UNO_QUERY ); + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.InvocationAdapterFactory")) ), UNO_QUERY ); Reference< XSingleServiceFactory > xInvocFac( - xMgr->createInstance( OUString::createFromAscii("com.sun.star.script.Invocation") ), UNO_QUERY ); + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Invocation")) ), UNO_QUERY ); Reference< XLanguageBindingTest > xOriginal( (XLanguageBindingTest *)new Test_Impl() ); Any aOriginal( &xOriginal, ::getCppuType( &xOriginal ) ); @@ -1028,23 +1028,23 @@ SAL_IMPLEMENT_MAIN() OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), OUString::createFromAscii("invocadapt.uno" SAL_DLLEXTENSION), Reference< XSimpleRegistry >() ); xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), OUString::createFromAscii("stocservices.uno" SAL_DLLEXTENSION), Reference< XSimpleRegistry >() ); xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), OUString::createFromAscii("invocation.uno" SAL_DLLEXTENSION), Reference< XSimpleRegistry >() ); xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), OUString::createFromAscii("reflection.uno" SAL_DLLEXTENSION), Reference< XSimpleRegistry >() ); xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), OUString::createFromAscii("introspection.uno" SAL_DLLEXTENSION), Reference< XSimpleRegistry >() ); diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index fdee2ab6619a..3a905c376f73 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -103,7 +103,7 @@ Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< XMultiS if( !xRefl.is() ) { xRefl = Reference< XIdlReflection >( xMgr->createInstance( - OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ), UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ), UNO_QUERY ); OSL_ENSURE( xRefl.is(), "### no corereflection!" ); } xRetClass = xRefl->forName( sOWName ); @@ -127,19 +127,19 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference< OUString aRetStr; switch( eType ) { - case TypeClass_TYPE: aRetStr = OUString::createFromAscii("TYPE TYPE"); break; - case TypeClass_INTERFACE: aRetStr = OUString::createFromAscii("TYPE INTERFACE"); break; - case TypeClass_SERVICE: aRetStr = OUString::createFromAscii("TYPE SERVICE"); break; - case TypeClass_STRUCT: aRetStr = OUString::createFromAscii("TYPE STRUCT"); break; - case TypeClass_TYPEDEF: aRetStr = OUString::createFromAscii("TYPE TYPEDEF"); break; - case TypeClass_UNION: aRetStr = OUString::createFromAscii("TYPE UNION"); break; - case TypeClass_ENUM: aRetStr = OUString::createFromAscii("TYPE ENUM"); break; - case TypeClass_EXCEPTION: aRetStr = OUString::createFromAscii("TYPE EXCEPTION"); break; - case TypeClass_ARRAY: aRetStr = OUString::createFromAscii("TYPE ARRAY"); break; - case TypeClass_SEQUENCE: aRetStr = OUString::createFromAscii("TYPE SEQUENCE"); break; - case TypeClass_VOID: aRetStr = OUString::createFromAscii("TYPE void"); break; - case TypeClass_ANY: aRetStr = OUString::createFromAscii("TYPE any"); break; - case TypeClass_UNKNOWN: aRetStr = OUString::createFromAscii("TYPE unknown"); break; + case TypeClass_TYPE: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE TYPE")); break; + case TypeClass_INTERFACE: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE INTERFACE")); break; + case TypeClass_SERVICE: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE SERVICE")); break; + case TypeClass_STRUCT: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE STRUCT")); break; + case TypeClass_TYPEDEF: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE TYPEDEF")); break; + case TypeClass_UNION: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE UNION")); break; + case TypeClass_ENUM: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE ENUM")); break; + case TypeClass_EXCEPTION: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE EXCEPTION")); break; + case TypeClass_ARRAY: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE ARRAY")); break; + case TypeClass_SEQUENCE: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE SEQUENCE")); break; + case TypeClass_VOID: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE void")); break; + case TypeClass_ANY: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE any")); break; + case TypeClass_UNKNOWN: aRetStr = OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE unknown")); break; case TypeClass_BOOLEAN: { sal_Bool b = *(sal_Bool*)aValue.getValue(); @@ -226,7 +226,7 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference< if( bIncludeType ) { Reference< XIdlClass > xIdlClass = TypeToIdlClass( aValType, xMgr ); - aRetStr = aRetStr + OUString( OUString::createFromAscii(" (Typ: ") ) + xIdlClass->getName() + OUString::createFromAscii(")"); + aRetStr = aRetStr + OUString( OUString(RTL_CONSTASCII_USTRINGPARAM(" (Typ: ")) ) + xIdlClass->getName() + OUString(RTL_CONSTASCII_USTRINGPARAM(")")); } return aRetStr; } @@ -338,21 +338,21 @@ Sequence< Property > ImplPropertySetInfo::getProperties(void) pSeq = new Sequence<Property>( 3 ); Property * pAry = pSeq->getArray(); - pAry[0].Name = OUString::createFromAscii("Factor"); + pAry[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Factor")); pAry[0].Handle = -1; pAry[0].Type = getCppuType( (double*) NULL ); //pAry[0].Type = TypeToIdlClass( getCppuType( (double*) NULL ), mxMgr ); //pAry[0].Type = Double_getReflection()->getIdlClass(); pAry[0].Attributes = BOUND | TRANSIENT; - pAry[1].Name = OUString::createFromAscii("MyCount"); + pAry[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("MyCount")); pAry[1].Handle = -1; pAry[1].Type = getCppuType( (sal_Int32*) NULL ); //pAry[1].Type = TypeToIdlClass( getCppuType( (sal_Int32*) NULL ), mxMgr ); //pAry[1].Type = INT32_getReflection()->getIdlClass(); pAry[1].Attributes = BOUND | TRANSIENT; - pAry[2].Name = OUString::createFromAscii("Info"); + pAry[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Info")); pAry[2].Handle = -1; pAry[2].Type = getCppuType( (OUString*) NULL ); //pAry[2].Type = TypeToIdlClass( getCppuType( (OUString*) NULL ), mxMgr ); @@ -512,7 +512,7 @@ public: virtual OUString SAL_CALL getFirstName() throw(RuntimeException); virtual OUString SAL_CALL getLastName() throw(RuntimeException) - { return OUString( OUString::createFromAscii("Meyer") ); } + { return OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("Meyer")) ); } virtual sal_Int16 SAL_CALL getAge() throw(RuntimeException) { return m_nMarkusAge; } virtual sal_Int16 SAL_CALL getChildrenCount() throw(RuntimeException) @@ -608,14 +608,14 @@ void ImplIntroTest::Init( void ) { // Eindeutigen Namen verpassen static sal_Int32 nObjCount = 0; - OUString aName( OUString::createFromAscii("IntroTest-Obj Nr. ") ); + OUString aName( RTL_CONSTASCII_USTRINGPARAM("IntroTest-Obj Nr. ") ); aName += OUString::valueOf( nObjCount ); setObjectName( aName ); // Properties initialisieren aAnyArray[0] <<= 3.14; aAnyArray[1] <<= (sal_Int32)42; - aAnyArray[2] <<= OUString( OUString::createFromAscii("Hallo") ); + aAnyArray[2] <<= OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")) ); // Output-Interface //m_pOutput = NULL; @@ -637,12 +637,12 @@ void ImplIntroTest::Init( void ) // String-Sequence intitialisieren aStringSeq.realloc( 3 ); OUString* pStr = aStringSeq.getArray(); - pStr[ 0 ] = OUString( OUString::createFromAscii("String 0") ); - pStr[ 1 ] = OUString( OUString::createFromAscii("String 1") ); - pStr[ 2 ] = OUString( OUString::createFromAscii("String 2") ); + pStr[ 0 ] = OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("String 0")) ); + pStr[ 1 ] = OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("String 1")) ); + pStr[ 2 ] = OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("String 2")) ); // structs initialisieren - m_aFirstStruct.Name = OUString::createFromAscii("FirstStruct-Name"); + m_aFirstStruct.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("FirstStruct-Name")); m_aFirstStruct.Handle = 77777; //XIdlClassRef Type; m_aFirstStruct.Attributes = -222; @@ -760,7 +760,7 @@ Any ImplIntroTest::getPropertyValue( const OUString& PropertyName ) OUString ImplIntroTest::getFirstName(void) throw(RuntimeException) { - return OUString( OUString::createFromAscii("Markus") ); + return OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("Markus")) ); } void ImplIntroTest::writeln( const OUString& Text ) @@ -812,7 +812,7 @@ sal_Bool ImplIntroTest::hasElements( ) sal_Int32 getIndexForName( const OUString& ItemName ) { OUString aLeftStr = ItemName.copy( 0, 4 ); - if( aLeftStr == OUString::createFromAscii("Item") ) + if( aLeftStr == OUString(RTL_CONSTASCII_USTRINGPARAM("Item")) ) { // TODO OUString aNumStr = ItemName.copy( 4 ); @@ -840,7 +840,7 @@ Any ImplIntroTest::getByName( const OUString& aName ) if( !pNameAccessTab[iIndex].is() ) { ImplIntroTest* p = new ImplIntroTest( mxMgr ); - OUString aName2( OUString::createFromAscii("IntroTest by Name-Access, Index = ") ); + OUString aName2( RTL_CONSTASCII_USTRINGPARAM("IntroTest by Name-Access, Index = ") ); aName2 += OUString::valueOf( iIndex ); //aName2 = aName2 + StringToUString( String( iIndex ), CHARSET_SYSTEM ); p->setObjectName( aName2 ); @@ -864,7 +864,7 @@ Sequence< OUString > ImplIntroTest::getElementNames( ) OUString* pStr = aStrSeq.getArray(); for( sal_Int32 i = 0 ; i < DEFAULT_NAME_ACCESS_COUNT ; i++ ) { - OUString aName( OUString::createFromAscii("Item") ); + OUString aName( RTL_CONSTASCII_USTRINGPARAM("Item") ); aName += OUString::valueOf( i ); //aName = aName + StringToUString( i, CHARSET_SYSTEM ); pStr[i] = aName; @@ -902,7 +902,7 @@ Any ImplIntroTest::getByIndex( sal_Int32 Index ) if( !pNameAccessTab[Index].is() ) { ImplIntroTest* p = new ImplIntroTest( mxMgr ); - OUString aName( OUString::createFromAscii("IntroTest by Index-Access, Index = ") ); + OUString aName( RTL_CONSTASCII_USTRINGPARAM("IntroTest by Index-Access, Index = ") ); aName += OUString::valueOf( Index ); //aName = aName + StringToUString( String( iIndex ), CHARSET_SYSTEM ); p->setObjectName( aName ); @@ -1296,7 +1296,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr, OUString aStr; aPropVal >>= aStr; //OString aStr = aPropVal.getString(); - aStr = aStr + OUString::createFromAscii(" (Modified!)"); + aStr = aStr + OUString(RTL_CONSTASCII_USTRINGPARAM(" (Modified!)")); aNewVal <<= aStr; break; } @@ -1544,35 +1544,35 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr, SAL_IMPLEMENT_MAIN() { - Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString::createFromAscii("stoctest.rdb") ) ); + Reference< XMultiServiceFactory > xMgr( createRegistryServiceFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")) ) ); sal_Bool bSucc = sal_False; try { Reference< XImplementationRegistration > xImplReg( - xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY ); + xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) ), UNO_QUERY ); OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); // Register services OUString libName( RTL_CONSTASCII_USTRINGPARAM( "reflection.uno" SAL_DLLEXTENSION) ); -// ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("corefl"), libName); +// ORealDynamicLoader::computeLibraryName( OUString(RTL_CONSTASCII_USTRINGPARAM("corefl")), libName); fprintf(stderr, "1\n" ); - xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + xImplReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), libName, Reference< XSimpleRegistry >() ); fprintf(stderr, "2\n" ); - Reference< XIdlReflection > xRefl( xMgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ), UNO_QUERY ); + Reference< XIdlReflection > xRefl( xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ), UNO_QUERY ); OSL_ENSURE( xRefl.is(), "### no corereflection!" ); // Introspection libName = OUString::createFromAscii( "introspection.uno" SAL_DLLEXTENSION); -// ORealDynamicLoader::computeLibraryName( OUString::createFromAscii("insp"), libName); +// ORealDynamicLoader::computeLibraryName( OUString(RTL_CONSTASCII_USTRINGPARAM("insp")), libName); fprintf(stderr, "3\n" ); - xImplReg->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), + xImplReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), libName, Reference< XSimpleRegistry >() ); fprintf(stderr, "4\n" ); - Reference< XIntrospection > xIntrosp( xMgr->createInstance( OUString::createFromAscii("com.sun.star.beans.Introspection") ), UNO_QUERY ); + Reference< XIntrospection > xIntrosp( xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")) ), UNO_QUERY ); OSL_ENSURE( xRefl.is(), "### no corereflection!" ); fprintf(stderr, "before test_introsp\n" ); diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx index 0a2377c53736..b5cf33c8739e 100644 --- a/stoc/test/testproxyfac.cxx +++ b/stoc/test/testproxyfac.cxx @@ -77,7 +77,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException) - { return OUString::createFromAscii( "target" ); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("target")); } virtual sal_Bool SAL_CALL supportsService( const OUString & /*rServiceName*/ ) throw (RuntimeException) { return sal_False; } @@ -141,7 +141,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException) - { return OUString::createFromAscii( "master" ); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("master")); } virtual sal_Bool SAL_CALL supportsService( const OUString & /*rServiceName*/ ) throw (RuntimeException) { return sal_False; } diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx index b3d9bb2d5316..bf1b55027482 100644 --- a/stoc/test/testregistry.cxx +++ b/stoc/test/testregistry.cxx @@ -125,7 +125,7 @@ void setStarUserRegistry() RegistryKey rootKey, rKey, rKey2; OUString userReg = getExePath(); - userReg += OUString::createFromAscii("user.rdb"); + userReg += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb")); if(myRegistry->open(userReg, REG_READWRITE)) { TEST_ENSHURE(!myRegistry->create(userReg), "setStarUserRegistry error 1"); @@ -145,7 +145,7 @@ void setLinkInDefaultRegistry(const OUString& linkName, const OUString& linkTarg RegistryKey rootKey; OUString appReg = getExePath(); - appReg += OUString::createFromAscii("stoctest.rdb"); + appReg += OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")); TEST_ENSHURE(!myRegistry->open(appReg, REG_READWRITE), "setLinkInDefaultRegistry error 1"); TEST_ENSHURE(!myRegistry->openRootKey(rootKey), "setLinkInDefaultRegistry error 2"); @@ -458,11 +458,11 @@ void test_DefaultRegistry( OUString userRdb(exePath); OUString applicatRdb(exePath); - userRdb += OUString::createFromAscii("user.rdb"); - applicatRdb += OUString::createFromAscii("stoctest.rdb"); + userRdb += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb")); + applicatRdb += OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")); Reference < XMultiServiceFactory > rSMgr = ::cppu::createRegistryServiceFactory( userRdb, applicatRdb, sal_False, OUString()); - //OUString::createFromAscii("//./e:/src596/stoc/wntmsci3/bin") ); + //OUString(RTL_CONSTASCII_USTRINGPARAM("//./e:/src596/stoc/wntmsci3/bin")) ); Reference< XPropertySet > xPropSet( rSMgr, UNO_QUERY); TEST_ENSHURE( xPropSet.is(), "test_DefaultRegistry error0"); @@ -669,8 +669,8 @@ void test_DefaultRegistry( SAL_IMPLEMENT_MAIN() { // setStarUserRegistry(); - setLinkInDefaultRegistry(OUString::createFromAscii("/Test/DefaultLink"), - OUString::createFromAscii("/Test/FifthKey/MyFirstLink")); + setLinkInDefaultRegistry(OUString(RTL_CONSTASCII_USTRINGPARAM("/Test/DefaultLink")), + OUString(RTL_CONSTASCII_USTRINGPARAM("/Test/FifthKey/MyFirstLink"))); OUString reg1( RTL_CONSTASCII_USTRINGPARAM("testreg1.rdb") ); OUString reg2( RTL_CONSTASCII_USTRINGPARAM("testreg2.rdb") ); diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx index a609632bcb55..60b8467f753a 100644 --- a/stoc/test/testsmgr.cxx +++ b/stoc/test/testsmgr.cxx @@ -80,7 +80,7 @@ void setStarUserRegistry() RegistryKey rootKey, rKey, rKey2; OUString userReg = getExePath(); - userReg += OUString::createFromAscii("user.rdb"); + userReg += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb")); if(myRegistry->open(userReg, REG_READWRITE)) { TEST_ENSHURE(!myRegistry->create(userReg), "setStarUserRegistry error 1"); diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx index 751459e004b9..e57a065a90f0 100644 --- a/stoc/test/testsmgr_cpnt.cxx +++ b/stoc/test/testsmgr_cpnt.cxx @@ -86,7 +86,7 @@ Reference<XMultiServiceFactory> getProcessServiceManager() { MutexGuard aGuard( Mutex::getGlobalMutex() ); if (! s_x.is()) - s_x = createRegistryServiceFactory( OUString::createFromAscii( "stoctest.rdb" ), sal_False ); + s_x = createRegistryServiceFactory( OUString(RTL_CONSTASCII_USTRINGPARAM("stoctest.rdb")), sal_False ); } return s_x; } @@ -181,7 +181,7 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static(void) th { Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = OUString::createFromAscii(SERVICE_NAME); - aSNS.getArray()[1] = OUString::createFromAscii("com.sun.star.bridge.Bridge"); + aSNS.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge")); return aSNS; } @@ -218,7 +218,7 @@ extern "C" void SAL_CALL test_ServiceManager() Reference<XContentEnumerationAccess> xContEnum(xSMgr, UNO_QUERY); TEST_ENSHURE( xContEnum.is() , "query on XContentEnumerationAccess failed" ); - Reference<XEnumeration > xEnum(xContEnum->createContentEnumeration(OUString::createFromAscii("com.sun.star.registry.SimpleRegistry"))); + Reference<XEnumeration > xEnum(xContEnum->createContentEnumeration(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry")))); TEST_ENSHURE( xEnum.is() , "createContentEnumeration failed" ); sal_Int32 nLen = 0; while( xEnum->hasMoreElements() ) @@ -243,33 +243,33 @@ extern "C" void SAL_CALL test_ServiceManager() TEST_ENSHURE( nLen == 8, "more than 6 factories" ); // try to get an instance for a unknown service - TEST_ENSHURE( !xSMgr->createInstance(OUString::createFromAscii("bla.blup.Q")).is(), "unknown service provider found" ); + TEST_ENSHURE( !xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("bla.blup.Q"))).is(), "unknown service provider found" ); // // First test : register service via the internal function of the component itself // { Reference< XImplementationRegistration > - xInst( xSMgr->createInstance(OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration")), UNO_QUERY ); + xInst( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))), UNO_QUERY ); TEST_ENSHURE( xInst.is(), "no ImplementationRegistration" ); try { // register the services via writeComponentRegInfo (see at end of this file) - xInst->registerImplementation(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), atUModule2, Reference< XSimpleRegistry >() ); + xInst->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), atUModule2, Reference< XSimpleRegistry >() ); } catch( CannotRegisterImplementationException e ) { TEST_ENSHURE( 0, "register implementation failed" ); } // getImplementations() check - Sequence<OUString> seqImpl = xInst->getImplementations(OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), atUModule2); + Sequence<OUString> seqImpl = xInst->getImplementations(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), atUModule2); TEST_ENSHURE( seqImpl.getLength() == 1, "count of implementantions is wrong" ); - TEST_ENSHURE( seqImpl.getConstArray()[0] == OUString::createFromAscii("com.sun.star.DummyService.V10"), "implementation name is not equal" ); + TEST_ENSHURE( seqImpl.getConstArray()[0] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.DummyService.V10")), "implementation name is not equal" ); // tests, if a service provider can be instantiated. - Reference< XInterface > xIFace(xSMgr->createInstance(OUString::createFromAscii("com.sun.star.ts.TestManagerImpl"))); + Reference< XInterface > xIFace(xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ts.TestManagerImpl")))); TEST_ENSHURE( xIFace.is(), "loadable service not found" ); // remove the service @@ -278,10 +278,10 @@ extern "C" void SAL_CALL test_ServiceManager() } -// Reference < XSimpleRegistry > xSReg( xSMgr->createInstance(OUString::createFromAscii("com::sun::star.uno.repos.SimpleRegistry")), UNO_QUERY ); +// Reference < XSimpleRegistry > xSReg( xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star.uno.repos.SimpleRegistry"))), UNO_QUERY ); // TEST_ENSHURE( xSReg.is() , "Simple registry couldn't be instantiated" ); -// xSReg->open(OUString::createFromAscii("dummy.reg"), sal_False, sal_True); +// xSReg->open(OUString(RTL_CONSTASCII_USTRINGPARAM("dummy.reg")), sal_False, sal_True); // xSReg->close(); // laut dbo : C-API muss nicht mehr unterstuezt werden @@ -305,23 +305,23 @@ extern "C" void SAL_CALL test_ServiceManager() // if (!UNO_isNull((UNO_Ifc*)&xUnoSMgr)) // xUnoSMgr.m_pVmt->release(xUnoSMgr.m_pCtx); -// xSReg->open(OUString::createFromAscii("dummy.reg"), sal_True, sal_False); -// TEST_ENSHURE(!xSReg->getRootKey()->openKey(OUString::createFromAscii("/SERVICES/com::sun::star/ts/TestManagerImpl/URL")).is(), +// xSReg->open(OUString(RTL_CONSTASCII_USTRINGPARAM("dummy.reg")), sal_True, sal_False); +// TEST_ENSHURE(!xSReg->getRootKey()->openKey(OUString(RTL_CONSTASCII_USTRINGPARAM("/SERVICES/com::sun::star/ts/TestManagerImpl/URL"))).is(), // "deinstall failed" ); // xSReg->close(); -// xSReg->open(OUString::createFromAscii("dummy.reg"), sal_False, sal_False); +// xSReg->open(OUString(RTL_CONSTASCII_USTRINGPARAM("dummy.reg")), sal_False, sal_False); // xSReg->destroy(); -// xSReg->open(OUString::createFromAscii("dummy2.reg"), sal_False, sal_False); +// xSReg->open(OUString(RTL_CONSTASCII_USTRINGPARAM("dummy2.reg")), sal_False, sal_False); // xSReg->destroy(); // Test initialisieren /* - XServiceProviderRef xSiSP1 = createSimpleServiceProvider( OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl1"), Test_Manager_Impl_getReflection ); - XServiceProviderRef xSiSP11 = createSimpleServiceProvider( OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl1"), Test_Manager_Impl_getReflection ); - XServiceProviderRef xSiSP2 = createSimpleServiceProvider( OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl2"), Test_Manager_Impl_getReflection ); + XServiceProviderRef xSiSP1 = createSimpleServiceProvider( OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star.usr.Test_Manager_Impl1")), Test_Manager_Impl_getReflection ); + XServiceProviderRef xSiSP11 = createSimpleServiceProvider( OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star.usr.Test_Manager_Impl1")), Test_Manager_Impl_getReflection ); + XServiceProviderRef xSiSP2 = createSimpleServiceProvider( OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star.usr.Test_Manager_Impl2")), Test_Manager_Impl_getReflection ); */ /* // second test @@ -335,7 +335,7 @@ extern "C" void SAL_CALL test_ServiceManager() Test_Manager_Impl::getSupportedServiceNames_Static() ), UNO_QUERY); Reference< XServiceProvider > xSiSP11(createSingleFactory( xSMgr, - OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl1"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star.usr.Test_Manager_Impl1")), Test_Manager_Impl_CreateInstance, Test_Manager_Impl::getSupportedServiceNames_Static() ),UNO_QUERY); Reference< XServiceProvider > xSiSP2(createSingleFactory( diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index a835a37f6b69..41b29bba1105 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -253,7 +253,7 @@ void Test::testParse() { data[i].pathSegmentCount, uriRef->getPathSegmentCount()); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(""), uriRef->getPathSegment(-1)); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), uriRef->getPathSegment(-1)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, rtl::OUString::createFromAscii(data[i].pathSegment0), @@ -276,7 +276,7 @@ void Test::testParse() { uriRef->getPathSegment(4)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, - rtl::OUString::createFromAscii(""), uriRef->getPathSegment(5)); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), uriRef->getPathSegment(5)); TEST_ASSERT_EQUAL( "testParse", i, data[i].uriReference, data[i].query != 0, uriRef->hasQuery()); @@ -850,7 +850,7 @@ void Test::testVndSunStarScript() { "testVndSunStarScript", static_cast< double >(i) + static_cast< double >(j) / 10.0, - ::rtl::OUString::createFromAscii("setParameter"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setParameter")), originalReference, uriRef->getUriReference()); } @@ -862,7 +862,7 @@ void Test::testVndSunStarScript() { TEST_ASSERT_EQUAL( "testVndSunStarScript", i, - ::rtl::OUString::createFromAscii("setName"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setName")), originalReference, uriRef->getUriReference()); } @@ -904,8 +904,8 @@ void Test::testVndSunStarScript() { } TEST_ASSERT_EQUAL( "testVndSunStarScript", - ::rtl::OUString::createFromAscii("illegal arguments"), - ::rtl::OUString::createFromAscii("name"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("illegal arguments")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")), caughtExpected, true); @@ -913,15 +913,15 @@ void Test::testVndSunStarScript() { try { scriptUrl->setParameter( ::rtl::OUString(), - ::rtl::OUString::createFromAscii("non-empty")); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("non-empty"))); } catch( const css::lang::IllegalArgumentException& ) { caughtExpected = true; } TEST_ASSERT_EQUAL( "testVndSunStarScript", - ::rtl::OUString::createFromAscii("illegal arguments"), - ::rtl::OUString::createFromAscii("parameter"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("illegal arguments")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("parameter")), caughtExpected, true); } diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx index 9f4e83931e52..39c2f6ed9750 100644 --- a/store/workben/t_store.cxx +++ b/store/workben/t_store.cxx @@ -174,7 +174,7 @@ DirectoryTraveller::DirectoryTraveller ( m_nCount (0) { m_aPath += rName; - m_aPath += OUString::createFromAscii("/"); + m_aPath += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); } /* @@ -458,7 +458,7 @@ int SAL_CALL main (int argc, char **argv) { // Create symlink to (root) directory. eErrCode = aFile.symlink ( - aPath, OUString::createFromAscii("000000/"), + aPath, OUString(RTL_CONSTASCII_USTRINGPARAM("000000/")), OUString(), aPath); OSL_POSTCOND( ((eErrCode == store_E_None ) || @@ -470,7 +470,7 @@ int SAL_CALL main (int argc, char **argv) eErrCode = aFile.symlink ( aPath, aLinkName, - aPath, OUString::createFromAscii("demostor-1.dat")); + aPath, OUString(RTL_CONSTASCII_USTRINGPARAM("demostor-1.dat"))); OSL_POSTCOND( ((eErrCode == store_E_None ) || (eErrCode == store_E_AlreadyExists) ), @@ -517,7 +517,7 @@ int SAL_CALL main (int argc, char **argv) { // Open symlink entry. eErrCode = aRootDir.create ( - aFile, aPath, OUString::createFromAscii("000000"), + aFile, aPath, OUString(RTL_CONSTASCII_USTRINGPARAM("000000")), store_AccessReadOnly); } else |