summaryrefslogtreecommitdiff
path: root/xmlhelp/source/cxxhelp/provider/provider.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'xmlhelp/source/cxxhelp/provider/provider.cxx')
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx40
1 files changed, 20 insertions, 20 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 0aa3d26005b7..713e2596ac58 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -69,7 +69,7 @@ ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr ),
isInitialized( false ),
- m_aScheme( rtl::OUString::createFromAscii( MYUCP_URL_SCHEME ) ),
+ m_aScheme(RTL_CONSTASCII_USTRINGPARAM(MYUCP_URL_SCHEME)),
m_pDatabases( 0 )
{
}
@@ -122,7 +122,7 @@ rtl::OUString SAL_CALL ContentProvider::getImplementationName()
rtl::OUString ContentProvider::getImplementationName_Static()
{
- return rtl::OUString::createFromAscii("CHelpContentProvider" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHelpContentProvider" ));
}
sal_Bool SAL_CALL
@@ -162,11 +162,11 @@ ContentProvider::getSupportedServiceNames_Static()
{
uno::Sequence< rtl::OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] =
- rtl::OUString::createFromAscii(
- MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 ));
aSNS.getArray()[ 1 ] =
- rtl::OUString::createFromAscii(
- MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 ));
return aSNS;
}
@@ -277,7 +277,7 @@ void ContentProvider::init()
rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( ! instPath.getLength() )
// try to determine path from default
- instPath = rtl::OUString::createFromAscii( "$(instpath)/help" );
+ instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" ));
// replace anything like $(instpath);
subst( instPath );
@@ -290,7 +290,7 @@ void ContentProvider::init()
if( xAccess.is() )
{
uno::Any aAny =
- xAccess->getByName( rtl::OUString::createFromAscii( "Help" ) );
+ xAccess->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Help" )) );
aAny >>= m_xContainer;
if( m_xContainer.is() )
m_xContainer->addContainerListener( this );
@@ -317,21 +317,21 @@ void ContentProvider::init()
try
{
uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
- m_xSMgr ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
+ m_xSMgr ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), uno::UNO_QUERY_THROW);
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
- aParam.Name = ::rtl::OUString::createFromAscii("nodepath");
- aParam.Value <<= ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Product");
+ aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+ aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product"));
lParams[0] = uno::makeAny(aParam);
// open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
- ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
lParams) );
uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
- uno::Any aRet = xDirectAccess->getByName(::rtl::OUString::createFromAscii("ooSetupExtension"));
+ uno::Any aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension")));
aRet >>= setupextension;
}
@@ -341,7 +341,7 @@ void ContentProvider::init()
rtl::OUString productversion(
setupversion +
- rtl::OUString::createFromAscii( " " ) +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) +
setupextension );
uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );
@@ -384,8 +384,8 @@ ContentProvider::getConfiguration() const
try
{
rtl::OUString sProviderService =
- rtl::OUString::createFromAscii(
- "com.sun.star.configuration.ConfigurationProvider" );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.configuration.ConfigurationProvider" ));
sProvider =
uno::Reference< lang::XMultiServiceFactory >(
m_xSMgr->createInstance( sProviderService ),
@@ -411,8 +411,8 @@ ContentProvider::getHierAccess(
{
uno::Sequence< uno::Any > seq( 1 );
rtl::OUString sReaderService(
- rtl::OUString::createFromAscii(
- "com.sun.star.configuration.ConfigurationAccess" ) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.configuration.ConfigurationAccess" )) );
seq[ 0 ] <<= rtl::OUString::createFromAscii( file );
@@ -489,8 +489,8 @@ void ContentProvider::subst( rtl::OUString& instpath ) const
xCfgMgr =
uno::Reference< frame::XConfigManager >(
m_xSMgr->createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.config.SpecialConfigManager" ) ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.config.SpecialConfigManager" )) ),
uno::UNO_QUERY );
}
catch( const uno::Exception&)