diff options
| author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-09-01 12:44:39 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-09-05 22:13:17 +0000 |
| commit | c75af8578d921040e1baf8414edd7239969bcd45 (patch) | |
| tree | 2c9310a3da94d1859fd80f03a7217bbfec938b67 /xmlscript/test | |
| parent | 72fa23ba0e13e6cf8a7ffb0476863d4399af0da1 (diff) | |
kill RTL_CONSTASCII_USTRINGPARAM in xmlscript
Plus rtl::OUString cleanup
Only on rebased files
Change-Id: Icddaa20742cc45f08e5a48790447fcf8865f4bd6
Reviewed-on: https://gerrit.libreoffice.org/527
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Diffstat (limited to 'xmlscript/test')
| -rw-r--r-- | xmlscript/test/imexp.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx index a5e4eb13022f..0b1c90c9deca 100644 --- a/xmlscript/test/imexp.cxx +++ b/xmlscript/test/imexp.cxx @@ -73,8 +73,7 @@ Reference< XComponentContext > createInitialComponentContext( inst_dir.pData, &file_url.pData ); OSL_ASSERT( osl_File_E_None == rc ); - ::rtl::OUString unorc = file_url + OUString( - RTL_CONSTASCII_USTRINGPARAM("/program/" SAL_CONFIGFILE("uno")) ); + OUString unorc = file_url + OUString("/program/" SAL_CONFIGFILE("uno") ); return defaultBootstrap_InitialComponentContext( unorc ); } @@ -108,15 +107,14 @@ Reference< container::XNameContainer > importFile( ::fclose( f ); Reference< container::XNameContainer > xModel( xContext->getServiceManager()->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ), xContext ), UNO_QUERY ); + "com.sun.star.awt.UnoControlDialogModel", xContext ), UNO_QUERY ); ::xmlscript::importDialogModel( ::xmlscript::createInputStream( bytes ), xModel, xContext ); return xModel; } else { - throw Exception( OUString( RTL_CONSTASCII_USTRINGPARAM("### Cannot read file!") ), - Reference< XInterface >() ); + throw Exception( "### Cannot read file!", Reference< XInterface >() ); } } @@ -178,8 +176,7 @@ void MyApp::Main() { ::comphelper::setProcessServiceFactory( xMSF ); - Reference< awt::XToolkit> xToolkit( xMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.ExtToolkit" ) ) ), UNO_QUERY ); + Reference< awt::XToolkit> xToolkit( xMSF->createInstance( "com.sun.star.awt.ExtToolkit" ), UNO_QUERY ); // import dialogs OString aParam1( OUStringToOString( @@ -189,8 +186,7 @@ void MyApp::Main() importFile( aParam1.getStr(), xContext ) ); OSL_ASSERT( xModel.is() ); - Reference< awt::XControl > xDlg( xMSF->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialog" ) ) ), UNO_QUERY ); + Reference< awt::XControl > xDlg( xMSF->createInstance( "com.sun.star.awt.UnoControlDialog" ), UNO_QUERY ); xDlg->setModel( Reference< awt::XControlModel >::query( xModel ) ); xDlg->createPeer( xToolkit, 0 ); Reference< awt::XDialog > xD( xDlg, UNO_QUERY ); |