[Libreoffice-commits] .: io/test registry/test registry/tools registry/workben remotebridges/examples remotebridges/source sal/osl sal/qa sal/workben stoc/source stoc/test store/workben
Gert Faller
gfaller at kemper.freedesktop.org
Fri Dec 10 09:32:59 PST 2010
io/test/stm/datatest.cxx | 30
io/test/stm/marktest.cxx | 4
io/test/stm/pumptest.cxx | 6
io/test/testcomponent.cxx | 10
io/test/testconnection.cxx | 22
registry/test/testmerge.cxx | 228 +++----
registry/test/testregcpp.cxx | 468 +++++++--------
registry/tools/checksingleton.cxx | 2
registry/tools/regcompare.cxx | 4
registry/workben/regspeed.cxx | 12
registry/workben/regtest.cxx | 64 +-
remotebridges/examples/officeclient.cxx | 12
remotebridges/source/bridge/remote_bridge.cxx | 12
remotebridges/source/dynamicloader/dynamicloader.cxx | 12
remotebridges/source/factory/bridgefactory.cxx | 2
sal/osl/os2/file.cxx | 2
sal/osl/os2/file_path_helper.cxx | 6
sal/osl/os2/file_url.cxx | 2
sal/osl/os2/path_helper.cxx | 4
sal/osl/w32/path_helper.cxx | 4
sal/osl/w32/procimpl.cxx | 2
sal/qa/osl/file/osl_File.cxx | 80 +-
sal/qa/osl/file/test_cpy_wrt_file.cxx | 2
sal/qa/osl/module/osl_Module.cxx | 20
sal/qa/osl/pipe/osl_Pipe.cxx | 6
sal/qa/osl/process/osl_process.cxx | 18
sal/qa/osl/socket/osl_AcceptorSocket.cxx | 10
sal/qa/osl/socket/osl_ConnectorSocket.cxx | 18
sal/qa/osl/socket/osl_DatagramSocket.cxx | 16
sal/qa/osl/socket/osl_Socket.cxx | 32 -
sal/qa/osl/socket/osl_Socket2.cxx | 60 -
sal/qa/osl/socket/osl_SocketAddr.cxx | 114 +--
sal/qa/osl/socket/osl_StreamSocket.cxx | 34 -
sal/qa/osl/socket/sockethelper.cxx | 6
sal/qa/rtl/bootstrap/bootstrap_process.cxx | 2
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 124 +--
sal/qa/rtl/locale/rtl_locale.cxx | 26
sal/qa/rtl/logfile/rtl_logfile.cxx | 12
sal/qa/rtl/ostring/rtl_string.cxx | 2
sal/qa/rtl/oustring/rtl_OUString2.cxx | 88 +-
sal/qa/rtl/oustring/rtl_ustr.cxx | 170 ++---
sal/qa/rtl/process/rtl_Process.cxx | 14
sal/qa/rtl/uri/rtl_Uri.cxx | 4
sal/qa/rtl_strings/rtl_old_testowstring.cxx | 152 ++--
sal/qa/rtl_strings/rtl_old_teststrbuf.cxx | 40 -
sal/qa/testHelperFunctions/testHelperFunctions.cxx | 2
sal/qa/testHelperFunctions/testHelperFunctions2.cxx | 2
sal/workben/getlocaleinfotest.cxx | 4
sal/workben/measure_oustrings.cxx | 8
sal/workben/testfile.cxx | 30
stoc/source/defaultregistry/defaultregistry.cxx | 2
stoc/test/excomp/excomp.cxx | 14
stoc/test/excomp/excomp1.cxx | 2
stoc/test/excomp/excomp2.cxx | 2
stoc/test/registry_tdprovider/testregistrytdprovider.cxx | 6
stoc/test/tdmanager/testtdmanager.cxx | 6
stoc/test/testconv.cxx | 104 +--
stoc/test/testcorefl.cxx | 106 +--
stoc/test/testiadapter.cxx | 24
stoc/test/testintrosp.cxx | 78 +-
stoc/test/testproxyfac.cxx | 4
stoc/test/testregistry.cxx | 14
stoc/test/testsmgr.cxx | 2
stoc/test/testsmgr_cpnt.cxx | 38 -
stoc/test/uriproc/test_uriproc.cxx | 18
store/workben/t_store.cxx | 8
66 files changed, 1216 insertions(+), 1216 deletions(-)
New commits:
commit 8b9849322b31f40e05e39475b39af616c71b1086
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Fri Dec 10 18:31:39 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in ure 1
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 85179f1..f9fc2f6 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 > &r
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 > &r
// 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 > &r
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 488f802..d863f9c 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 64975d4..122e332 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 a4ed668..5786d17 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 49ab3fb..400f339 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 b4a1036..2ea6d73 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 9601194..4fcc4bd 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");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list