summaryrefslogtreecommitdiff
path: root/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-06-01 16:17:42 +0200
committerThorsten Behrens <tbehrens@suse.com>2012-06-01 16:18:09 +0200
commitc9337a8bfcd904d723c76525e2473578d5af4e77 (patch)
tree2fd4774c0b26744449d791833db89937e1191737 /xmlhelp/source/cxxhelp/provider/urlparameter.cxx
parent721bb0f92da4245acb00c08d645ea395965738a3 (diff)
Targeted string re-work xmlhelp/xmlscript
Diffstat (limited to 'xmlhelp/source/cxxhelp/provider/urlparameter.cxx')
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 6cc30b7e59d1..e4f483d24d26 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -179,7 +179,7 @@ rtl::OUString URLParameter::get_title()
m_aTitle = inf->get_title();
}
else // This must be the root
- m_aTitle = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("root"));
+ m_aTitle = rtl::OUString("root");
return m_aTitle;
}
@@ -274,7 +274,7 @@ rtl::OUString URLParameter::get_the_jar()
return m_aJar;
}
else
- return get_module() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".jar"));
+ return get_module() + rtl::OUString(".jar");
}
@@ -282,7 +282,7 @@ rtl::OUString URLParameter::get_the_jar()
void URLParameter::readBerkeley()
{
- static rtl::OUString aQuestionMark(RTL_CONSTASCII_USTRINGPARAM("?"));
+ static rtl::OUString aQuestionMark("?");
if( get_id().compareToAscii("") == 0 )
return;
@@ -444,7 +444,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{
Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA =
- m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )),
+ m_pDatabases->jarFile( rtl::OUString( "picture.jar" ),
get_language() );
rtl::OUString path = get_path();
@@ -514,7 +514,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{
Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA =
- m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )),
+ m_pDatabases->jarFile( rtl::OUString( "picture.jar" ),
get_language() );
rtl::OUString path = get_path();
@@ -568,7 +568,7 @@ bool URLParameter::scheme()
if( aLastStr.compareToAscii( "DbPAR=" ) == 0 )
{
rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 );
- rtl::OUString aSharedStr(RTL_CONSTASCII_USTRINGPARAM("shared"));
+ rtl::OUString aSharedStr("shared");
aNewExpr += aSharedStr;
aNewExpr += m_aExpr.copy( 20 );
aNewExpr += aSharedStr;
@@ -681,7 +681,7 @@ bool URLParameter::query()
if( m_aQuery.isEmpty() )
m_aQuery = value;
else
- m_aQuery += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + value );
+ m_aQuery += ( rtl::OUString( " " ) + value );
}
else if( parameter.compareToAscii( "Scope" ) == 0 )
m_aScope = value;
@@ -1006,12 +1006,12 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
if (xProps.is())
{
xProps->getPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext;
+ ::rtl::OUString( "DefaultContext" ) ) >>= xContext;
}
if( !xContext.is() )
{
throw RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" )),
+ ::rtl::OUString( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ),
Reference< XInterface >() );
}