[Libreoffice-commits] .: desktop/source dictionaries helpcontent2
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 30 00:29:29 PST 2012
desktop/source/deployment/misc/dp_misc.cxx | 57 +++------
desktop/source/deployment/misc/dp_platform.cxx | 149 +++++++++++--------------
desktop/source/deployment/misc/dp_resource.cxx | 18 +--
desktop/source/deployment/misc/dp_ucb.cxx | 9 -
desktop/source/deployment/misc/dp_update.cxx | 3
dictionaries | 2
helpcontent2 | 2
7 files changed, 109 insertions(+), 131 deletions(-)
New commits:
commit f8ff0def93aedaffe8a15b84cba476757bf1691d
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sun Dec 30 09:28:27 2012 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in desktop/source/deployment/misc
Removed OUSTR() as well and replaced .equals() with ==
Change-Id: I99e8fcd936f0b2ec1d17d4d0a0be5832108c0f3b
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index dcd8b53..f954666 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -69,8 +69,7 @@ namespace {
struct UnoRc : public rtl::StaticWithInit<
boost::shared_ptr<rtl::Bootstrap>, UnoRc> {
const boost::shared_ptr<rtl::Bootstrap> operator () () {
- OUString unorc( RTL_CONSTASCII_USTRINGPARAM(
- "$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno")) );
+ OUString unorc( "$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno") );
::rtl::Bootstrap::expandMacros( unorc );
::boost::shared_ptr< ::rtl::Bootstrap > ret(
new ::rtl::Bootstrap( unorc ) );
@@ -91,13 +90,12 @@ const OUString OfficePipeId::operator () ()
if (!(aLocateResult == ::utl::Bootstrap::PATH_EXISTS ||
aLocateResult == ::utl::Bootstrap::PATH_VALID))
{
- throw Exception(OUSTR("Extension Manager: Could not obtain path for UserInstallation."), 0);
+ throw Exception("Extension Manager: Could not obtain path for UserInstallation.", 0);
}
rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
if (!digest) {
- throw RuntimeException(
- OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
+ throw RuntimeException("cannot get digest rtl_Digest_AlgorithmMD5!", 0 );
}
sal_uInt8 const * data =
@@ -114,7 +112,7 @@ const OUString OfficePipeId::operator () ()
// create hex-value string from the MD5 value to keep
// the string size minimal
::rtl::OUStringBuffer buf;
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("SingleOfficeIPC_") );
+ buf.appendAscii( "SingleOfficeIPC_" );
for ( sal_uInt32 i = 0; i < md5_key_len; ++i ) {
buf.append( static_cast<sal_Int32>(md5_buf[ i ]), 0x10 );
}
@@ -211,20 +209,13 @@ bool needToSyncRepository(OUString const & name)
OUString file;
if ( name == "bundled" )
{
- folder = OUString(
- RTL_CONSTASCII_USTRINGPARAM("$BUNDLED_EXTENSIONS"));
- file = OUString (
- RTL_CONSTASCII_USTRINGPARAM(
- "$BUNDLED_EXTENSIONS_USER/lastsynchronized"));
+ folder = OUString("$BUNDLED_EXTENSIONS");
+ file = OUString ("$BUNDLED_EXTENSIONS_USER/lastsynchronized");
}
else if ( name == "shared" )
{
- folder = OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "$UNO_SHARED_PACKAGES_CACHE/uno_packages"));
- file = OUString (
- RTL_CONSTASCII_USTRINGPARAM(
- "$SHARED_EXTENSIONS_USER/lastsynchronized"));
+ folder = OUString("$UNO_SHARED_PACKAGES_CACHE/uno_packages");
+ file = OUString("$SHARED_EXTENSIONS_USER/lastsynchronized");
}
else
{
@@ -279,8 +270,7 @@ OUString makeURL( OUString const & baseURL, OUString const & relPath_ )
if (!relPath.isEmpty())
{
buf.append( static_cast<sal_Unicode>('/') );
- if (baseURL.matchAsciiL(
- RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:") )) {
+ if (baseURL.match( "vnd.sun.star.expand:" )) {
// encode for macro expansion: relPath is supposed to have no
// macros, so encode $, {} \ (bootstrap mimic)
relPath = encodeForRcFile(relPath);
@@ -320,9 +310,8 @@ OUString expandUnoRcTerm( OUString const & term_ )
OUString makeRcTerm( OUString const & url )
{
- OSL_ASSERT( url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(
- "vnd.sun.star.expand:") ) );
- if (url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:") )) {
+ OSL_ASSERT( url.match( "vnd.sun.star.expand:" ));
+ if (url.match( "vnd.sun.star.expand:" )) {
// cut protocol:
OUString rcterm( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) );
// decode uric class chars:
@@ -337,7 +326,7 @@ OUString makeRcTerm( OUString const & url )
//==============================================================================
OUString expandUnoRcUrl( OUString const & url )
{
- if (url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:") )) {
+ if (url.match( "vnd.sun.star.expand:" )) {
// cut protocol:
OUString rcurl( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) );
// decode uric class chars:
@@ -411,16 +400,16 @@ oslProcess raiseProcess(
case osl_Process_E_None:
break;
case osl_Process_E_NotFound:
- throw RuntimeException( OUSTR("image not found!"), 0 );
+ throw RuntimeException( "image not found!", 0 );
case osl_Process_E_TimedOut:
- throw RuntimeException( OUSTR("timout occurred!"), 0 );
+ throw RuntimeException( "timout occurred!", 0 );
case osl_Process_E_NoPermission:
- throw RuntimeException( OUSTR("permission denied!"), 0 );
+ throw RuntimeException( "permission denied!", 0 );
case osl_Process_E_Unknown:
- throw RuntimeException( OUSTR("unknown error!"), 0 );
+ throw RuntimeException( "unknown error!", 0 );
case osl_Process_E_InvalidError:
default:
- throw RuntimeException( OUSTR("unmapped error!"), 0 );
+ throw RuntimeException( "unmapped error!", 0 );
}
return hProcess;
@@ -432,11 +421,11 @@ OUString generateRandomPipeId()
// compute some good pipe id:
static rtlRandomPool s_hPool = rtl_random_createPool();
if (s_hPool == 0)
- throw RuntimeException( OUSTR("cannot create random pool!?"), 0 );
+ throw RuntimeException( "cannot create random pool!?", 0 );
sal_uInt8 bytes[ 32 ];
if (rtl_random_getBytes(
s_hPool, bytes, ARLEN(bytes) ) != rtl_Random_E_None) {
- throw RuntimeException( OUSTR("random pool error!?"), 0 );
+ throw RuntimeException( "random pool error!?", 0 );
}
::rtl::OUStringBuffer buf;
for ( sal_uInt32 i = 0; i < ARLEN(bytes); ++i ) {
@@ -458,7 +447,7 @@ Reference<XInterface> resolveUnoURL(
{
if (abortChannel != 0 && abortChannel->isAborted()) {
throw ucb::CommandAbortedException(
- OUSTR("abort!"), Reference<XInterface>() );
+ "abort!", Reference<XInterface>() );
}
try {
return xUnoUrlResolver->resolve( connectString );
@@ -541,7 +530,7 @@ void syncRepositories(
bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv)
{
OUString sDisable;
- ::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() );
+ ::rtl::Bootstrap::get( "DISABLE_EXTENSION_SYNCHRONIZATION", sDisable, OUString() );
if (!sDisable.isEmpty())
return;
@@ -549,9 +538,7 @@ void syncRepositories(
//synchronize shared before bundled otherewise there are
//more revoke and registration calls.
sal_Bool bModified = false;
- if (force
- || needToSyncRepository(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
- || needToSyncRepository(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"))))
+ if (force || needToSyncRepository("shared") || needToSyncRepository("bundled"))
{
xExtensionManager =
deployment::ExtensionManager::get(
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 4a39d8d..1c5b89f 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -65,13 +65,6 @@
#define PLATFORM_AIX_POWERPC "aix_powerpc"
-
-
-
-
-
-
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
using ::rtl::OUString;
namespace dp_misc
@@ -81,7 +74,7 @@ namespace
struct StrOperatingSystem :
public rtl::StaticWithInit<OUString, StrOperatingSystem> {
const OUString operator () () {
- OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") );
+ OUString os( "$_OS" );
::rtl::Bootstrap::expandMacros( os );
return os;
}
@@ -90,7 +83,7 @@ namespace
struct StrCPU :
public rtl::StaticWithInit<OUString, StrCPU> {
const OUString operator () () {
- OUString arch( RTL_CONSTASCII_USTRINGPARAM("$_ARCH") );
+ OUString arch( "$_ARCH" );
::rtl::Bootstrap::expandMacros( arch );
return arch;
}
@@ -110,81 +103,81 @@ namespace
bool checkOSandCPU(OUString const & os, OUString const & cpu)
{
- return os.equals(StrOperatingSystem::get())
- && cpu.equals(StrCPU::get());
+ return (os == StrOperatingSystem::get())
+ && (cpu == StrCPU::get());
}
bool isValidPlatform(OUString const & token )
{
bool ret = false;
- if (token.equals(OUSTR(PLATFORM_ALL)))
+ if (token == PLATFORM_ALL)
ret = true;
- else if (token.equals(OUSTR(PLATFORM_WIN_X86)))
- ret = checkOSandCPU(OUSTR("Windows"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_WIN_X86_64)))
- ret = checkOSandCPU(OUSTR("Windows"), OUSTR("x86_64"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_X86)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_X86_64)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("X86_64"));
- else if (token.equals(OUSTR(PLATFORM_KFREEBSD_X86)))
- ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_KFREEBSD_X86_64)))
- ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("X86_64"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_SPARC)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("SPARC"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC64)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC_64"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_ARM_EABI)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ARM_EABI"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_ARM_OABI)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ARM_OABI"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_MIPS_EL)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EL"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_MIPS_EB)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EB"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_IA64)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("IA64"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_M68K)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("M68K"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_S390)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_S390x)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_HPPA)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("HPPA"));
- else if (token.equals(OUSTR(PLATFORM_LINUX_ALPHA)))
- ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ALPHA"));
- else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC)))
- ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC"));
- else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC64)))
- ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC64"));
- else if (token.equals(OUSTR(PLATFORM_SOLARIS_X86)))
- ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86)))
- ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64)))
- ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("X86_64"));
- else if (token.equals(OUSTR(PLATFORM_NETBSD_X86)))
- ret = checkOSandCPU(OUSTR("NetBSD"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_NETBSD_X86_64)))
- ret = checkOSandCPU(OUSTR("NetBSD"), OUSTR("X86_64"));
- else if (token.equals(OUSTR(PLATFORM_MACOSX_X86)))
- ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC)))
- ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
- else if (token.equals(OUSTR(PLATFORM_AIX_POWERPC)))
- ret = checkOSandCPU(OUSTR("AIX"), OUSTR("PowerPC"));
- else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86)))
- ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86_64)))
- ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("X86_64"));
- else if (token.equals(OUSTR(PLATFORM_DRAGONFLY_X86)))
- ret = checkOSandCPU(OUSTR("DragonFly"), OUSTR("x86"));
- else if (token.equals(OUSTR(PLATFORM_DRAGONFLY_X86_64)))
- ret = checkOSandCPU(OUSTR("DragonFly"), OUSTR("X86_64"));
+ else if (token == PLATFORM_WIN_X86)
+ ret = checkOSandCPU("Windows", "x86");
+ else if (token == PLATFORM_WIN_X86_64)
+ ret = checkOSandCPU("Windows", "x86_64");
+ else if (token == PLATFORM_LINUX_X86)
+ ret = checkOSandCPU("Linux", "x86");
+ else if (token == PLATFORM_LINUX_X86_64)
+ ret = checkOSandCPU("Linux", "X86_64");
+ else if (token == PLATFORM_KFREEBSD_X86)
+ ret = checkOSandCPU("kFreeBSD", "x86");
+ else if (token == PLATFORM_KFREEBSD_X86_64)
+ ret = checkOSandCPU("kFreeBSD", "X86_64");
+ else if (token == PLATFORM_LINUX_SPARC)
+ ret = checkOSandCPU("Linux", "SPARC");
+ else if (token == PLATFORM_LINUX_POWERPC)
+ ret = checkOSandCPU("Linux", "PowerPC");
+ else if (token == PLATFORM_LINUX_POWERPC64)
+ ret = checkOSandCPU("Linux", "PowerPC_64");
+ else if (token == PLATFORM_LINUX_ARM_EABI)
+ ret = checkOSandCPU("Linux", "ARM_EABI");
+ else if (token == PLATFORM_LINUX_ARM_OABI)
+ ret = checkOSandCPU("Linux", "ARM_OABI");
+ else if (token == PLATFORM_LINUX_MIPS_EL)
+ ret = checkOSandCPU("Linux", "MIPS_EL");
+ else if (token == PLATFORM_LINUX_MIPS_EB)
+ ret = checkOSandCPU("Linux", "MIPS_EB");
+ else if (token == PLATFORM_LINUX_IA64)
+ ret = checkOSandCPU("Linux", "IA64");
+ else if (token == PLATFORM_LINUX_M68K)
+ ret = checkOSandCPU("Linux", "M68K");
+ else if (token == PLATFORM_LINUX_S390)
+ ret = checkOSandCPU("Linux", "S390");
+ else if (token == PLATFORM_LINUX_S390x)
+ ret = checkOSandCPU("Linux", "S390x");
+ else if (token == PLATFORM_LINUX_HPPA)
+ ret = checkOSandCPU("Linux", "HPPA");
+ else if (token == PLATFORM_LINUX_ALPHA)
+ ret = checkOSandCPU("Linux", "ALPHA");
+ else if (token == PLATFORM_SOLARIS_SPARC)
+ ret = checkOSandCPU("Solaris", "SPARC");
+ else if (token == PLATFORM_SOLARIS_SPARC64)
+ ret = checkOSandCPU("Solaris", "SPARC64");
+ else if (token == PLATFORM_SOLARIS_X86)
+ ret = checkOSandCPU("Solaris", "x86");
+ else if (token == PLATFORM_FREEBSD_X86)
+ ret = checkOSandCPU("FreeBSD", "x86");
+ else if (token == PLATFORM_FREEBSD_X86_64)
+ ret = checkOSandCPU("FreeBSD", "X86_64");
+ else if (token == PLATFORM_NETBSD_X86)
+ ret = checkOSandCPU("NetBSD", "x86");
+ else if (token == PLATFORM_NETBSD_X86_64)
+ ret = checkOSandCPU("NetBSD", "X86_64");
+ else if (token == PLATFORM_MACOSX_X86)
+ ret = checkOSandCPU("MacOSX", "x86");
+ else if (token == PLATFORM_MACOSX_PPC)
+ ret = checkOSandCPU("MacOSX", "PowerPC");
+ else if (token == PLATFORM_AIX_POWERPC)
+ ret = checkOSandCPU("AIX", "PowerPC");
+ else if (token == PLATFORM_OPENBSD_X86)
+ ret = checkOSandCPU("OpenBSD", "x86");
+ else if (token == PLATFORM_OPENBSD_X86_64)
+ ret = checkOSandCPU("OpenBSD", "X86_64");
+ else if (token == PLATFORM_DRAGONFLY_X86)
+ ret = checkOSandCPU("DragonFly", "x86");
+ else if (token == PLATFORM_DRAGONFLY_X86_64)
+ ret = checkOSandCPU("DragonFly", "X86_64");
else
{
OSL_FAIL("Extension Manager: The extension supports an unknown platform. "
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index e8bbf1e..f20941e 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -42,7 +42,7 @@ struct OfficeLocale :
//fallback, the locale is currently only set when the user starts the
//office for the first time.
if (slang.isEmpty())
- slang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));
+ slang = "en-US";
return slang;
}
};
@@ -82,11 +82,11 @@ void checkPrimarySubtag(::rtl::OUString const & tag)
sal_Int32 len = tag.getLength();
sal_Unicode const * arLang = tag.getStr();
if (len < 1 || len > 3)
- throw Exception(OUSTR("Invalid language string."), 0);
+ throw Exception("Invalid language string.", 0);
if (len == 1
&& (arLang[0] != 'i' && arLang[0] != 'x'))
- throw Exception(OUSTR("Invalid language string."), 0);
+ throw Exception("Invalid language string.", 0);
if (len == 2 || len == 3)
{
@@ -95,7 +95,7 @@ void checkPrimarySubtag(::rtl::OUString const & tag)
if ( !((arLang[i] >= 'A' && arLang[i] <= 'Z')
|| (arLang[i] >= 'a' && arLang[i] <= 'z')))
{
- throw Exception(OUSTR("Invalid language string."), 0);
+ throw Exception("Invalid language string.", 0);
}
}
}
@@ -108,7 +108,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry)
sal_Int32 len = tag.getLength();
sal_Unicode const * arLang = tag.getStr();
if (len < 2 || len > 8)
- throw Exception(OUSTR("Invalid language string."), 0);
+ throw Exception("Invalid language string.", 0);
//country code
bIsCountry = false;
if (len == 2)
@@ -118,7 +118,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry)
if (!( (arLang[i] >= 'A' && arLang[i] <= 'Z')
|| (arLang[i] >= 'a' && arLang[i] <= 'z')))
{
- throw Exception(OUSTR("Invalid language string."), 0);
+ throw Exception("Invalid language string.", 0);
}
}
bIsCountry = true;
@@ -132,7 +132,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry)
|| (arLang[i] >= 'a' && arLang[i] <= 'z')
|| (arLang[i] >= '0' && arLang[i] <= '9') ))
{
- throw Exception(OUSTR("Invalid language string."), 0);
+ throw Exception("Invalid language string.", 0);
}
}
}
@@ -143,7 +143,7 @@ void checkThirdSubtag(::rtl::OUString const & tag)
sal_Int32 len = tag.getLength();
sal_Unicode const * arLang = tag.getStr();
if (len < 1 || len > 8)
- throw Exception(OUSTR("Invalid language string."), 0);
+ throw Exception("Invalid language string.", 0);
for (sal_Int32 i = 0; i < len; i++)
{
@@ -151,7 +151,7 @@ void checkThirdSubtag(::rtl::OUString const & tag)
|| (arLang[i] >= 'a' && arLang[i] <= 'z')
|| (arLang[i] >= '0' && arLang[i] <= '9') ))
{
- throw Exception(OUSTR("Invalid language string."), 0);
+ throw Exception("Invalid language string.", 0);
}
}
}
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index decbb44..96db856 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -104,7 +104,7 @@ bool create_folder(
// invalid: has to be at least "auth:/..."
if (throw_exc)
throw ContentCreationException(
- OUSTR("Cannot create folder (invalid path): ") + url,
+ "Cannot create folder (invalid path): " + url,
Reference<XInterface>(), ContentCreationError_UNKNOWN );
return false;
}
@@ -155,7 +155,7 @@ bool create_folder(
}
if (throw_exc)
throw ContentCreationException(
- OUSTR("Cannot create folder: ") + url,
+ "Cannot create folder: " + url,
Reference<XInterface>(), ContentCreationError_UNKNOWN );
return false;
}
@@ -170,7 +170,7 @@ bool erase_path( OUString const & url,
{
try {
ucb_content.executeCommand(
- OUSTR("delete"), Any( true /* delete physically */ ) );
+ "delete", Any( true /* delete physically */ ) );
}
catch (const RuntimeException &) {
throw;
@@ -192,8 +192,7 @@ bool erase_path( OUString const & url,
::xmlscript::createOutputStream( &bytes ) );
if (! ucb_content.openStream( xStream ))
throw RuntimeException(
- OUSTR(
- "::ucbhelper::Content::openStream( XOutputStream ) failed!"),
+ "::ucbhelper::Content::openStream( XOutputStream ) failed!",
0 );
return bytes;
}
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 814b585..f92b3c0 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -217,9 +217,8 @@ bool onlyBundledExtensions(
OUString getExtensionDefaultUpdateURL()
{
::rtl::OUString sUrl(
- RTL_CONSTASCII_USTRINGPARAM(
"${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
- ":Version:ExtensionUpdateURL}"));
+ ":Version:ExtensionUpdateURL}");
::rtl::Bootstrap::expandMacros(sUrl);
return sUrl;
}
diff --git a/dictionaries b/dictionaries
index f0c914a..1595bf1 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit f0c914a43e7e6540300da25c935a77aebb672094
+Subproject commit 1595bf11e295d96123fcb327ba9919307aa5b127
diff --git a/helpcontent2 b/helpcontent2
index d5d84f0..1909df0 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d5d84f0ec4584e32147eeab355d0ab73e7dd9172
+Subproject commit 1909df07cbd54bf753514cc6dc4137b7b69af63c
More information about the Libreoffice-commits
mailing list