From ded1f1b445f5bb6d65509638047787cef20d382b Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Thu, 25 Nov 2010 21:51:15 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in libs-gui 19 --- ucbhelper/source/client/content.cxx | 48 ++++++++++++------------- ucbhelper/source/client/contentbroker.cxx | 8 ++--- ucbhelper/source/client/proxydecider.cxx | 34 +++++++++--------- ucbhelper/source/provider/propertyvalueset.cxx | 4 +-- ucbhelper/source/provider/provconf.cxx | 4 +-- ucbhelper/source/provider/providerhelper.cxx | 4 +-- ucbhelper/source/provider/resultset.cxx | 2 +- ucbhelper/source/provider/resultsethelper.cxx | 12 +++---- ucbhelper/source/provider/resultsetmetadata.cxx | 4 +-- ucbhelper/workben/myucp/myucp_content.cxx | 24 ++++++------- ucbhelper/workben/myucp/myucp_provider.cxx | 10 +++--- ucbhelper/workben/ucbexplorer/ucbexplorer.cxx | 20 +++++------ 12 files changed, 87 insertions(+), 87 deletions(-) (limited to 'ucbhelper') diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 60868c4fd973..3592049c95f4 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -227,9 +227,9 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker, if ( !xMgr.is() ) { throw RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UCB does not implement mandatory interface " - "XContentProviderManager!" ), + "XContentProviderManager!" )), Reference< XInterface >() ); } else @@ -239,8 +239,8 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker, if ( !xProv.is() ) { throw ContentCreationException( - rtl::OUString::createFromAscii( - "No Content Provider available for given URL!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "No Content Provider available for given URL!" )), Reference< XInterface >(), ContentCreationError_NO_CONTENT_PROVIDER ); } @@ -269,9 +269,9 @@ static ContentBroker* getContentBroker( bool bThrow ) { if ( bThrow ) throw RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UCB does not implement mandatory interface " - "XContentProviderManager!" ), + "XContentProviderManager!" )), Reference< XInterface >() ); } else @@ -307,8 +307,8 @@ static Reference< XContentIdentifier > getContentIdentifier( ensureContentProviderForURL( rBroker, rURL ); throw ContentCreationException( - rtl::OUString::createFromAscii( - "Unable to create Content Identifier!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to create Content Identifier!" )), Reference< XInterface >(), ContentCreationError_IDENTIFIER_CREATION_FAILED ); } @@ -317,9 +317,9 @@ static Reference< XContentIdentifier > getContentIdentifier( { if ( bThrow ) throw RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UCB does not implement mandatory interface " - "XContentIdentifierFactory!" ), + "XContentIdentifierFactory!" )), Reference< XInterface >() ); } @@ -357,8 +357,8 @@ static Reference< XContent > getContent( ensureContentProviderForURL( rBroker, xId->getContentIdentifier() ); throw ContentCreationException( - rtl::OUString::createFromAscii( - "Unable to create Content! " ) + msg, + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to create Content! " )) + msg, Reference< XInterface >(), ContentCreationError_CONTENT_CREATION_FAILED ); } @@ -367,9 +367,9 @@ static Reference< XContent > getContent( { if ( bThrow ) throw RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UCB does not implement mandatory interface " - "XContentProvider!" ), + "XContentProvider!" )), Reference< XInterface >() ); } @@ -732,9 +732,9 @@ Sequence< Any > Content::setPropertyValues( { ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Length of property names sequence and value " - "sequence are unequal!" ), + "sequence are unequal!" )), get(), -1 ) ), m_xImpl->getEnvironment() ); @@ -780,9 +780,9 @@ Sequence< Any > Content::setPropertyValues( { ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Length of property handles sequence and value " - "sequence are unequal!" ), + "sequence are unequal!" )), get(), -1 ) ), m_xImpl->getEnvironment() ); @@ -1567,8 +1567,8 @@ sal_Bool Content::transferContent( const Content& rSourceContent, default: ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString::createFromAscii( - "Unknown transfer operation!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unknown transfer operation!" )), get(), -1 ) ), m_xImpl->getEnvironment() ); @@ -1601,8 +1601,8 @@ sal_Bool Content::isFolder() ucbhelper::cancelCommandExecution( makeAny( UnknownPropertyException( - rtl::OUString::createFromAscii( - "Unable to retreive value of property 'IsFolder'!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to retreive value of property 'IsFolder'!" )), get() ) ), m_xImpl->getEnvironment() ); @@ -1622,8 +1622,8 @@ sal_Bool Content::isDocument() ucbhelper::cancelCommandExecution( makeAny( UnknownPropertyException( - rtl::OUString::createFromAscii( - "Unable to retreive value of property 'IsDocument'!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to retreive value of property 'IsDocument'!" )), get() ) ), m_xImpl->getEnvironment() ); diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx index cc5f6f8280e0..4eef68226b06 100644 --- a/ucbhelper/source/client/contentbroker.cxx +++ b/ucbhelper/source/client/contentbroker.cxx @@ -285,8 +285,8 @@ bool ContentBroker_Impl::initialize() try { xIfc = m_xSMgr->createInstance( - OUString::createFromAscii( - "com.sun.star.ucb.UniversalContentBroker" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.UniversalContentBroker" )) ); } catch ( Exception const & ) { @@ -319,8 +319,8 @@ bool ContentBroker_Impl::initialize() try { xIfc = m_xSMgr->createInstanceWithArguments( - OUString::createFromAscii( - "com.sun.star.ucb.UniversalContentBroker" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.UniversalContentBroker" )), m_aArguments ); } catch ( Exception const & ) diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index e805f2afcd74..b336e74afd94 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -267,17 +267,17 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( uno::Reference< lang::XMultiServiceFactory > xConfigProv( rxSMgr->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.configuration.ConfigurationProvider" ) ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.configuration.ConfigurationProvider" )) ), uno::UNO_QUERY ); uno::Sequence< uno::Any > aArguments( 1 ); - aArguments[ 0 ] <<= rtl::OUString::createFromAscii( CONFIG_ROOT_KEY ); + aArguments[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONFIG_ROOT_KEY )); uno::Reference< uno::XInterface > xInterface( xConfigProv->createInstanceWithArguments( - rtl::OUString::createFromAscii( - "com.sun.star.configuration.ConfigurationAccess" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.configuration.ConfigurationAccess" )), aArguments ) ); OSL_ENSURE( xInterface.is(), @@ -295,8 +295,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( try { if ( !( xNameAccess->getByName( - rtl::OUString::createFromAscii( - PROXY_TYPE_KEY ) ) >>= m_nProxyType ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + PROXY_TYPE_KEY )) ) >>= m_nProxyType ) ) { OSL_ENSURE( sal_False, "InternetProxyDecider - " @@ -314,8 +314,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( try { if ( !( xNameAccess->getByName( - rtl::OUString::createFromAscii( - NO_PROXY_LIST_KEY ) ) >>= aNoProxyList ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + NO_PROXY_LIST_KEY )) ) >>= aNoProxyList ) ) { OSL_ENSURE( sal_False, "InternetProxyDecider - " @@ -334,8 +334,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( try { if ( !( xNameAccess->getByName( - rtl::OUString::createFromAscii( - HTTP_PROXY_NAME_KEY ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + HTTP_PROXY_NAME_KEY )) ) >>= m_aHttpProxy.aName ) ) { OSL_ENSURE( sal_False, @@ -354,8 +354,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( try { uno::Any aValue = xNameAccess->getByName( - rtl::OUString::createFromAscii( - HTTP_PROXY_PORT_KEY ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + HTTP_PROXY_PORT_KEY )) ); if ( aValue.hasValue() && !( aValue >>= m_aHttpProxy.nPort ) ) { @@ -377,8 +377,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( try { if ( !( xNameAccess->getByName( - rtl::OUString::createFromAscii( - FTP_PROXY_NAME_KEY ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + FTP_PROXY_NAME_KEY )) ) >>= m_aFtpProxy.aName ) ) { OSL_ENSURE( sal_False, @@ -397,8 +397,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( try { uno::Any aValue = xNameAccess->getByName( - rtl::OUString::createFromAscii( - FTP_PROXY_PORT_KEY ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + FTP_PROXY_PORT_KEY )) ); if ( aValue.hasValue() && !( aValue >>= m_aFtpProxy.nPort ) ) { diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index ab479372dc9f..c0d5f5ce1cb3 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -666,8 +666,8 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter() m_bTriedToGetTypeConverter = sal_True; m_xTypeConverter = Reference< XTypeConverter >( m_xSMgr->createInstance( - OUString::createFromAscii( - "com.sun.star.script.Converter" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.script.Converter" )) ), UNO_QUERY ); OSL_ENSURE( m_xTypeConverter.is(), diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx index 9e58ba5006e1..542ddf9351ae 100644 --- a/ucbhelper/source/provider/provconf.cxx +++ b/ucbhelper/source/provider/provconf.cxx @@ -108,8 +108,8 @@ bool getContentProviderData( { uno::Reference< lang::XMultiServiceFactory > xConfigProv( rServiceMgr->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.configuration.ConfigurationProvider" ) ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.configuration.ConfigurationProvider" )) ), uno::UNO_QUERY ); if ( !xConfigProv.is() ) diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index 359e5c952463..9a70249c33da 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -326,8 +326,8 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry() uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory > xRegFac( m_xSMgr->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.ucb.Store" ) ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.Store" )) ), uno::UNO_QUERY ); OSL_ENSURE( xRegFac.is(), diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index d2c8296e0b2e..b39d6aa886a6 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -310,7 +310,7 @@ XTYPEPROVIDER_IMPL_9( ResultSet, XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResultSet")), - rtl::OUString::createFromAscii( RESULTSET_SERVICE_NAME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( RESULTSET_SERVICE_NAME )) ); //========================================================================= // diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index a508b47818c9..ac6798e7450e 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -117,10 +117,10 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper, //========================================================================= XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper, - rtl::OUString::createFromAscii( - "ResultSetImplHelper" ), - rtl::OUString::createFromAscii( - DYNAMICRESULTSET_SERVICE_NAME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "ResultSetImplHelper" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + DYNAMICRESULTSET_SERVICE_NAME )) ); //========================================================================= // @@ -273,8 +273,8 @@ void SAL_CALL ResultSetImplHelper::connectToCache( = uno::Reference< com::sun::star::ucb::XCachedDynamicResultSetStubFactory >( m_xSMgr->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ), uno::UNO_QUERY ); } catch ( uno::Exception const & ) diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index d7697fb92533..ceb73a994412 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -412,8 +412,8 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) { Reference< XPropertySetInfo > xInfo( m_xSMgr->createInstance( - OUString::createFromAscii( - "com.sun.star.ucb.PropertiesManager" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.PropertiesManager" )) ), UNO_QUERY ); if ( xInfo.is() ) { diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx index 23f885de94a7..35219355d071 100644 --- a/ucbhelper/workben/myucp/myucp_content.cxx +++ b/ucbhelper/workben/myucp/myucp_content.cxx @@ -190,7 +190,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() // @@@ Adjust macro name. uno::Sequence< rtl::OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString::createFromAscii( MYUCP_CONTENT_SERVICE_NAME ); + = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_SERVICE_NAME )); return aSNS; } @@ -205,7 +205,7 @@ rtl::OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { // @@@ Adjust macro name ( def in myucp_provider.hxx ). - return rtl::OUString::createFromAscii( MYUCP_CONTENT_TYPE ); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_TYPE )); } //========================================================================= @@ -667,8 +667,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name.equalsAsciiL( @@ -676,8 +676,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name.equalsAsciiL( @@ -685,8 +685,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( - "Property is read-only!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property is read-only!" )), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rValue.Name.equalsAsciiL( @@ -714,8 +714,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString::createFromAscii( - "Property value has wrong type!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Property value has wrong type!" )), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -780,8 +780,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString::createFromAscii( - "No property set for storing the value!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "No property set for storing the value!" )), static_cast< cppu::OWeakObject * >( this ) ); } } diff --git a/ucbhelper/workben/myucp/myucp_provider.cxx b/ucbhelper/workben/myucp/myucp_provider.cxx index f51ec34e261c..7a82de0152f9 100644 --- a/ucbhelper/workben/myucp/myucp_provider.cxx +++ b/ucbhelper/workben/myucp/myucp_provider.cxx @@ -101,10 +101,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, // @@@ Adjust implementation name. Keep the prefix "com.sun.star.comp."! // @@@ Adjust service name. XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString::createFromAscii( - "com.sun.star.comp.myucp.ContentProvider" ), - rtl::OUString::createFromAscii( - MYUCP_CONTENT_PROVIDER_SERVICE_NAME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.myucp.ContentProvider" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + MYUCP_CONTENT_PROVIDER_SERVICE_NAME )) ); //========================================================================= // @@ -127,7 +127,7 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( { // Check URL scheme... - rtl::OUString aScheme( rtl::OUString::createFromAscii( MYUCP_URL_SCHEME ) ); + rtl::OUString aScheme( RTL_CONSTASCII_USTRINGPARAM( MYUCP_URL_SCHEME ) ); if ( !Identifier->getContentProviderScheme().equalsIgnoreAsciiCase( aScheme ) ) throw ucb::IllegalIdentifierException(); diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx index f647feb959fd..f1db1f4deca3 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx @@ -445,8 +445,8 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo, ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) ); StringInputDialog* pDlg = new StringInputDialog( *xManager.get(), - OUString::createFromAscii( - "Document Data Source URL" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "Document Data Source URL" )), OUString() ); USHORT nRet = pDlg->Execute(); if ( nRet == RET_OK ) @@ -470,8 +470,8 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo, { uno::Reference< XInteractionHandler > xInteractionHandler( pBroker->getServiceManager()->createInstance( - OUString::createFromAscii( - "com.sun.star.task.InteractionHandler" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.task.InteractionHandler" )) ), UNO_QUERY ); uno::Reference< XProgressHandler > xProgressHandler @@ -719,8 +719,8 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt ) pMenu->EnableItem( MENU_DELETE, pEntry->m_aContent .getCommands()->hasCommandByName( - OUString::createFromAscii( - "delete" ) ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "delete" )) ) ); } catch ( CommandAbortedException const & ) { @@ -1007,8 +1007,8 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry( { uno::Reference< XInteractionHandler > xInteractionHandler( pBroker->getServiceManager()->createInstance( - OUString::createFromAscii( - "com.sun.star.task.InteractionHandler" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.task.InteractionHandler" )) ), UNO_QUERY ); uno::Reference< XProgressHandler > xProgressHandler @@ -1114,8 +1114,8 @@ void MyApp::Main() #if 1 // Init UCB (Read configuration from registry) Sequence< Any > aArgs( 2 ); - aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); + aArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )); + aArgs[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )); sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aArgs ); #else // Init UCB (Use provided configuration data) -- cgit