summaryrefslogtreecommitdiff
path: root/dtrans/source/test/test_dtrans.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'dtrans/source/test/test_dtrans.cxx')
-rw-r--r--dtrans/source/test/test_dtrans.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 430c63071228..3bb0966e286d 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -236,7 +236,7 @@ private:
StringTransferable::StringTransferable( ) :
m_seqDFlv( 1 ),
m_receivedLostOwnership( sal_False ),
- m_Data( OUString::createFromAscii("clipboard test content") )
+ m_Data( OUString(RTL_CONSTASCII_USTRINGPARAM("clipboard test content")) )
{
DataFlavor df;
@@ -248,7 +248,7 @@ StringTransferable::StringTransferable( ) :
*/
//df.MimeType = L"text/plain; charset=windows1252";
- df.MimeType = OUString::createFromAscii( "text/html" );
+ df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/html"));
df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
m_seqDFlv[0] = df;
@@ -359,10 +359,10 @@ int SAL_CALL main( int argc, const char* argv[] )
//--------------------------------------------------------------
Sequence< Any > arguments(1);
- arguments[0] = makeAny( OUString::createFromAscii( "generic" ) );
+ arguments[0] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) );
Reference< XClipboard > xClipboard( xServiceManager->createInstanceWithArguments(
- OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboard")),
arguments ), UNO_QUERY );
ENSURE( xClipboard.is(), "*** ERROR *** generic clipboard service could not be created." );
@@ -442,7 +442,7 @@ int SAL_CALL main( int argc, const char* argv[] )
//--------------------------------------------------------------
Reference< XClipboardManager > xClipboardManager( xServiceManager->createInstance(
- OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.ClipboardManager" ) ), UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.ClipboardManager")) ), UNO_QUERY );
ENSURE( xClipboardManager.is(), "*** ERROR *** clipboard manager service could not be created." );
@@ -455,14 +455,14 @@ int SAL_CALL main( int argc, const char* argv[] )
TEST( "initial number of clipboards (0): ", xClipboardManager->listClipboardNames().getLength() == 0 );
PERFORM( "insertion of generic clipboard: ", xClipboardManager->addClipboard( xClipboard ) );
TEST( "number of inserted clipboards (1): ", xClipboardManager->listClipboardNames().getLength() == 1 );
- TEST( "name of inserted clipboard (generic): ", xClipboardManager->listClipboardNames()[0] == OUString::createFromAscii( "generic" ) );
- TEST( "inserted clipboard instance: ", xClipboardManager->getClipboard( OUString::createFromAscii( "generic" ) ) == xClipboard );
- PERFORM( "removal of generic clipboard: ", xClipboardManager->removeClipboard( OUString::createFromAscii( "generic" ) ) );
+ TEST( "name of inserted clipboard (generic): ", xClipboardManager->listClipboardNames()[0] == OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) );
+ TEST( "inserted clipboard instance: ", xClipboardManager->getClipboard( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) ) == xClipboard );
+ PERFORM( "removal of generic clipboard: ", xClipboardManager->removeClipboard( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) ) );
TEST( "number of inserted clipboards (0): ", xClipboardManager->listClipboardNames().getLength() == 0 );
TRACE( "Testing inserted clipboard instance (none): " );
try
{
- xClipboardManager->getClipboard( OUString::createFromAscii( "generic" ) );
+ xClipboardManager->getClipboard( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) );
TRACE( "FAILED\n" );
}
catch( NoSuchElementException e )