summaryrefslogtreecommitdiff
path: root/svx/source/gengal
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-06-01 15:29:51 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-06-01 15:36:25 -0500
commit6d8cd969391c79dfbcff4a85c4c9869ba8a2bfab (patch)
treeb3ffeb73175499e84ce014dc4dfb4786de1ab979 /svx/source/gengal
parentd9e22d35c3746957f8db84151ef047fd462654ef (diff)
targeted string re-work
Change-Id: I91a8a1410fc9a3a48b77f980c01b51bdacf6b02b
Diffstat (limited to 'svx/source/gengal')
-rw-r--r--svx/source/gengal/gengal.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index f91b42e64187..acbe3d986a14 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -203,9 +203,9 @@ void GalApp::Init()
lastSlash = fileName.lastIndexOf( '\\' );
#endif
rtl::OUString baseBinDir = fileName.copy( 0, lastSlash );
- rtl::OUString installPrefix = baseBinDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/../.."));
+ rtl::OUString installPrefix = baseBinDir + rtl::OUString("/../..");
- rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("OOO_INSTALL_PREFIX"));
+ rtl::OUString envVar("OOO_INSTALL_PREFIX");
osl_setEnvironment(envVar.pData, installPrefix.pData);
}
OSL_TRACE( "OOO_INSTALL_PREFIX=%s", getenv( "OOO_INSTALL_PREFIX" ) );
@@ -225,9 +225,9 @@ void GalApp::InitUCB()
{
Sequence< Any > aArgs(2);
aArgs[0]
- <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL));
+ <<= rtl::OUString(UCB_CONFIGURATION_KEY1_LOCAL);
aArgs[1]
- <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
+ <<= rtl::OUString(UCB_CONFIGURATION_KEY2_OFFICE);
if (! ::ucbhelper::ContentBroker::initialize( xMSF, aArgs ) )
fprintf( stderr, "Failed to init content broker\n" );
@@ -237,7 +237,7 @@ int GalApp::Main()
{
bool bHelp = false;
rtl::OUString aPath, aDestDir;
- rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name"));
+ rtl::OUString aName("Default name");
sal_uInt32 nNumFrom = 0;
FileNameList aFiles;