Skip to content

C
core
Kaydet (Commit) f8ff0def authored tarafından Chr. Rossmanith's avatar Chr. Rossmanith
Dosyalara gözat
Seçenekler

RTL_CONSTASCII_(U)STRINGPARAM removed in desktop/source/deployment/misc 

Removed OUSTR() as well and replaced .equals() with ==

Change-Id: I99e8fcd936f0b2ec1d17d4d0a0be5832108c0f3b
üst e67cea92
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 131 deletions
desktop/source/deployment/misc/dp_misc.cxx
Dosyayı görüntüle @ f8ff0def
...@@ -69,8 +69,7 @@ namespace { ...@@ -69,8 +69,7 @@ namespace {
struct UnoRc : public rtl::StaticWithInit< struct UnoRc : public rtl::StaticWithInit<
boost::shared_ptr<rtl::Bootstrap>, UnoRc> { boost::shared_ptr<rtl::Bootstrap>, UnoRc> {
const boost::shared_ptr<rtl::Bootstrap> operator () () { const boost::shared_ptr<rtl::Bootstrap> operator () () {
OUString unorc( RTL_CONSTASCII_USTRINGPARAM( OUString unorc( "$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno") );
"$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno")) );
::rtl::Bootstrap::expandMacros( unorc ); ::rtl::Bootstrap::expandMacros( unorc );
::boost::shared_ptr< ::rtl::Bootstrap > ret( ::boost::shared_ptr< ::rtl::Bootstrap > ret(
new ::rtl::Bootstrap( unorc ) ); new ::rtl::Bootstrap( unorc ) );
...@@ -91,13 +90,12 @@ const OUString OfficePipeId::operator () () ...@@ -91,13 +90,12 @@ const OUString OfficePipeId::operator () ()
if (!(aLocateResult == ::utl::Bootstrap::PATH_EXISTS || if (!(aLocateResult == ::utl::Bootstrap::PATH_EXISTS ||
aLocateResult == ::utl::Bootstrap::PATH_VALID)) 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 ); rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
if (!digest) { if (!digest) {
throw RuntimeException( throw RuntimeException("cannot get digest rtl_Digest_AlgorithmMD5!", 0 );
OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
} }
sal_uInt8 const * data = sal_uInt8 const * data =
...@@ -114,7 +112,7 @@ const OUString OfficePipeId::operator () () ...@@ -114,7 +112,7 @@ const OUString OfficePipeId::operator () ()
// create hex-value string from the MD5 value to keep // create hex-value string from the MD5 value to keep
// the string size minimal // the string size minimal
::rtl::OUStringBuffer buf; ::rtl::OUStringBuffer buf;
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("SingleOfficeIPC_") ); buf.appendAscii( "SingleOfficeIPC_" );
for ( sal_uInt32 i = 0; i < md5_key_len; ++i ) { for ( sal_uInt32 i = 0; i < md5_key_len; ++i ) {
buf.append( static_cast<sal_Int32>(md5_buf[ i ]), 0x10 ); buf.append( static_cast<sal_Int32>(md5_buf[ i ]), 0x10 );
} }
...@@ -211,20 +209,13 @@ bool needToSyncRepository(OUString const & name) ...@@ -211,20 +209,13 @@ bool needToSyncRepository(OUString const & name)
OUString file; OUString file;
if ( name == "bundled" ) if ( name == "bundled" )
{ {
folder = OUString( folder = OUString("$BUNDLED_EXTENSIONS");
RTL_CONSTASCII_USTRINGPARAM("$BUNDLED_EXTENSIONS")); file = OUString ("$BUNDLED_EXTENSIONS_USER/lastsynchronized");
file = OUString (
RTL_CONSTASCII_USTRINGPARAM(
"$BUNDLED_EXTENSIONS_USER/lastsynchronized"));
} }
else if ( name == "shared" ) else if ( name == "shared" )
{ {
folder = OUString( folder = OUString("$UNO_SHARED_PACKAGES_CACHE/uno_packages");
RTL_CONSTASCII_USTRINGPARAM( file = OUString("$SHARED_EXTENSIONS_USER/lastsynchronized");
"$UNO_SHARED_PACKAGES_CACHE/uno_packages"));
file = OUString (
RTL_CONSTASCII_USTRINGPARAM(
"$SHARED_EXTENSIONS_USER/lastsynchronized"));
} }
else else
{ {
...@@ -279,8 +270,7 @@ OUString makeURL( OUString const & baseURL, OUString const & relPath_ ) ...@@ -279,8 +270,7 @@ OUString makeURL( OUString const & baseURL, OUString const & relPath_ )
if (!relPath.isEmpty()) if (!relPath.isEmpty())
{ {
buf.append( static_cast<sal_Unicode>('/') ); buf.append( static_cast<sal_Unicode>('/') );
if (baseURL.matchAsciiL( if (baseURL.match( "vnd.sun.star.expand:" )) {
RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:") )) {
// encode for macro expansion: relPath is supposed to have no // encode for macro expansion: relPath is supposed to have no
// macros, so encode $, {} \ (bootstrap mimic) // macros, so encode $, {} \ (bootstrap mimic)
relPath = encodeForRcFile(relPath); relPath = encodeForRcFile(relPath);
...@@ -320,9 +310,8 @@ OUString expandUnoRcTerm( OUString const & term_ ) ...@@ -320,9 +310,8 @@ OUString expandUnoRcTerm( OUString const & term_ )
OUString makeRcTerm( OUString const & url ) OUString makeRcTerm( OUString const & url )
{ {
OSL_ASSERT( url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( OSL_ASSERT( url.match( "vnd.sun.star.expand:" ));
"vnd.sun.star.expand:") ) ); if (url.match( "vnd.sun.star.expand:" )) {
if (url.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:") )) {
// cut protocol: // cut protocol:
OUString rcterm( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) ); OUString rcterm( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) );
// decode uric class chars: // decode uric class chars:
...@@ -337,7 +326,7 @@ OUString makeRcTerm( OUString const & url ) ...@@ -337,7 +326,7 @@ OUString makeRcTerm( OUString const & url )
//============================================================================== //==============================================================================
OUString expandUnoRcUrl( 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: // cut protocol:
OUString rcurl( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) ); OUString rcurl( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) );
// decode uric class chars: // decode uric class chars:
...@@ -411,16 +400,16 @@ oslProcess raiseProcess( ...@@ -411,16 +400,16 @@ oslProcess raiseProcess(
case osl_Process_E_None: case osl_Process_E_None:
break; break;
case osl_Process_E_NotFound: case osl_Process_E_NotFound:
throw RuntimeException( OUSTR("image not found!"), 0 ); throw RuntimeException( "image not found!", 0 );
case osl_Process_E_TimedOut: case osl_Process_E_TimedOut:
throw RuntimeException( OUSTR("timout occurred!"), 0 ); throw RuntimeException( "timout occurred!", 0 );
case osl_Process_E_NoPermission: case osl_Process_E_NoPermission:
throw RuntimeException( OUSTR("permission denied!"), 0 ); throw RuntimeException( "permission denied!", 0 );
case osl_Process_E_Unknown: case osl_Process_E_Unknown:
throw RuntimeException( OUSTR("unknown error!"), 0 ); throw RuntimeException( "unknown error!", 0 );
case osl_Process_E_InvalidError: case osl_Process_E_InvalidError:
default: default:
throw RuntimeException( OUSTR("unmapped error!"), 0 ); throw RuntimeException( "unmapped error!", 0 );
} }
return hProcess; return hProcess;
...@@ -432,11 +421,11 @@ OUString generateRandomPipeId() ...@@ -432,11 +421,11 @@ OUString generateRandomPipeId()
// compute some good pipe id: // compute some good pipe id:
static rtlRandomPool s_hPool = rtl_random_createPool(); static rtlRandomPool s_hPool = rtl_random_createPool();
if (s_hPool == 0) if (s_hPool == 0)
throw RuntimeException( OUSTR("cannot create random pool!?"), 0 ); throw RuntimeException( "cannot create random pool!?", 0 );
sal_uInt8 bytes[ 32 ]; sal_uInt8 bytes[ 32 ];
if (rtl_random_getBytes( if (rtl_random_getBytes(
s_hPool, bytes, ARLEN(bytes) ) != rtl_Random_E_None) { 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; ::rtl::OUStringBuffer buf;
for ( sal_uInt32 i = 0; i < ARLEN(bytes); ++i ) { for ( sal_uInt32 i = 0; i < ARLEN(bytes); ++i ) {
...@@ -458,7 +447,7 @@ Reference<XInterface> resolveUnoURL( ...@@ -458,7 +447,7 @@ Reference<XInterface> resolveUnoURL(
{ {
if (abortChannel != 0 && abortChannel->isAborted()) { if (abortChannel != 0 && abortChannel->isAborted()) {
throw ucb::CommandAbortedException( throw ucb::CommandAbortedException(
OUSTR("abort!"), Reference<XInterface>() ); "abort!", Reference<XInterface>() );
} }
try { try {
return xUnoUrlResolver->resolve( connectString ); return xUnoUrlResolver->resolve( connectString );
...@@ -541,7 +530,7 @@ void syncRepositories( ...@@ -541,7 +530,7 @@ void syncRepositories(
bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv) bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv)
{ {
OUString sDisable; OUString sDisable;
::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() ); ::rtl::Bootstrap::get( "DISABLE_EXTENSION_SYNCHRONIZATION", sDisable, OUString() );
if (!sDisable.isEmpty()) if (!sDisable.isEmpty())
return; return;
...@@ -549,9 +538,7 @@ void syncRepositories( ...@@ -549,9 +538,7 @@ void syncRepositories(
//synchronize shared before bundled otherewise there are //synchronize shared before bundled otherewise there are
//more revoke and registration calls. //more revoke and registration calls.
sal_Bool bModified = false; sal_Bool bModified = false;
if (force if (force || needToSyncRepository("shared") || needToSyncRepository("bundled"))
|| needToSyncRepository(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
|| needToSyncRepository(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"))))
{ {
xExtensionManager = xExtensionManager =
deployment::ExtensionManager::get( deployment::ExtensionManager::get(
......
desktop/source/deployment/misc/dp_platform.cxx
Dosyayı görüntüle @ f8ff0def
...@@ -65,13 +65,6 @@ ...@@ -65,13 +65,6 @@
#define PLATFORM_AIX_POWERPC "aix_powerpc" #define PLATFORM_AIX_POWERPC "aix_powerpc"
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
using ::rtl::OUString; using ::rtl::OUString;
namespace dp_misc namespace dp_misc
...@@ -81,7 +74,7 @@ namespace ...@@ -81,7 +74,7 @@ namespace
struct StrOperatingSystem : struct StrOperatingSystem :
public rtl::StaticWithInit<OUString, StrOperatingSystem> { public rtl::StaticWithInit<OUString, StrOperatingSystem> {
const OUString operator () () { const OUString operator () () {
OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") ); OUString os( "$_OS" );
::rtl::Bootstrap::expandMacros( os ); ::rtl::Bootstrap::expandMacros( os );
return os; return os;
} }
...@@ -90,7 +83,7 @@ namespace ...@@ -90,7 +83,7 @@ namespace
struct StrCPU : struct StrCPU :
public rtl::StaticWithInit<OUString, StrCPU> { public rtl::StaticWithInit<OUString, StrCPU> {
const OUString operator () () { const OUString operator () () {
OUString arch( RTL_CONSTASCII_USTRINGPARAM("$_ARCH") ); OUString arch( "$_ARCH" );
::rtl::Bootstrap::expandMacros( arch ); ::rtl::Bootstrap::expandMacros( arch );
return arch; return arch;
} }
...@@ -110,81 +103,81 @@ namespace ...@@ -110,81 +103,81 @@ namespace
bool checkOSandCPU(OUString const & os, OUString const & cpu) bool checkOSandCPU(OUString const & os, OUString const & cpu)
{ {
return os.equals(StrOperatingSystem::get()) return (os == StrOperatingSystem::get())
&& cpu.equals(StrCPU::get()); && (cpu == StrCPU::get());
} }
bool isValidPlatform(OUString const & token ) bool isValidPlatform(OUString const & token )
{ {
bool ret = false; bool ret = false;
if (token.equals(OUSTR(PLATFORM_ALL))) if (token == PLATFORM_ALL)
ret = true; ret = true;
else if (token.equals(OUSTR(PLATFORM_WIN_X86))) else if (token == PLATFORM_WIN_X86)
ret = checkOSandCPU(OUSTR("Windows"), OUSTR("x86")); ret = checkOSandCPU("Windows", "x86");
else if (token.equals(OUSTR(PLATFORM_WIN_X86_64))) else if (token == PLATFORM_WIN_X86_64)
ret = checkOSandCPU(OUSTR("Windows"), OUSTR("x86_64")); ret = checkOSandCPU("Windows", "x86_64");
else if (token.equals(OUSTR(PLATFORM_LINUX_X86))) else if (token == PLATFORM_LINUX_X86)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("x86")); ret = checkOSandCPU("Linux", "x86");
else if (token.equals(OUSTR(PLATFORM_LINUX_X86_64))) else if (token == PLATFORM_LINUX_X86_64)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("X86_64")); ret = checkOSandCPU("Linux", "X86_64");
else if (token.equals(OUSTR(PLATFORM_KFREEBSD_X86))) else if (token == PLATFORM_KFREEBSD_X86)
ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("x86")); ret = checkOSandCPU("kFreeBSD", "x86");
else if (token.equals(OUSTR(PLATFORM_KFREEBSD_X86_64))) else if (token == PLATFORM_KFREEBSD_X86_64)
ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("X86_64")); ret = checkOSandCPU("kFreeBSD", "X86_64");
else if (token.equals(OUSTR(PLATFORM_LINUX_SPARC))) else if (token == PLATFORM_LINUX_SPARC)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("SPARC")); ret = checkOSandCPU("Linux", "SPARC");
else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC))) else if (token == PLATFORM_LINUX_POWERPC)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC")); ret = checkOSandCPU("Linux", "PowerPC");
else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC64))) else if (token == PLATFORM_LINUX_POWERPC64)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC_64")); ret = checkOSandCPU("Linux", "PowerPC_64");
else if (token.equals(OUSTR(PLATFORM_LINUX_ARM_EABI))) else if (token == PLATFORM_LINUX_ARM_EABI)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ARM_EABI")); ret = checkOSandCPU("Linux", "ARM_EABI");
else if (token.equals(OUSTR(PLATFORM_LINUX_ARM_OABI))) else if (token == PLATFORM_LINUX_ARM_OABI)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ARM_OABI")); ret = checkOSandCPU("Linux", "ARM_OABI");
else if (token.equals(OUSTR(PLATFORM_LINUX_MIPS_EL))) else if (token == PLATFORM_LINUX_MIPS_EL)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EL")); ret = checkOSandCPU("Linux", "MIPS_EL");
else if (token.equals(OUSTR(PLATFORM_LINUX_MIPS_EB))) else if (token == PLATFORM_LINUX_MIPS_EB)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EB")); ret = checkOSandCPU("Linux", "MIPS_EB");
else if (token.equals(OUSTR(PLATFORM_LINUX_IA64))) else if (token == PLATFORM_LINUX_IA64)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("IA64")); ret = checkOSandCPU("Linux", "IA64");
else if (token.equals(OUSTR(PLATFORM_LINUX_M68K))) else if (token == PLATFORM_LINUX_M68K)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("M68K")); ret = checkOSandCPU("Linux", "M68K");
else if (token.equals(OUSTR(PLATFORM_LINUX_S390))) else if (token == PLATFORM_LINUX_S390)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390")); ret = checkOSandCPU("Linux", "S390");
else if (token.equals(OUSTR(PLATFORM_LINUX_S390x))) else if (token == PLATFORM_LINUX_S390x)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x")); ret = checkOSandCPU("Linux", "S390x");
else if (token.equals(OUSTR(PLATFORM_LINUX_HPPA))) else if (token == PLATFORM_LINUX_HPPA)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("HPPA")); ret = checkOSandCPU("Linux", "HPPA");
else if (token.equals(OUSTR(PLATFORM_LINUX_ALPHA))) else if (token == PLATFORM_LINUX_ALPHA)
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ALPHA")); ret = checkOSandCPU("Linux", "ALPHA");
else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC))) else if (token == PLATFORM_SOLARIS_SPARC)
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC")); ret = checkOSandCPU("Solaris", "SPARC");
else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC64))) else if (token == PLATFORM_SOLARIS_SPARC64)
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC64")); ret = checkOSandCPU("Solaris", "SPARC64");
else if (token.equals(OUSTR(PLATFORM_SOLARIS_X86))) else if (token == PLATFORM_SOLARIS_X86)
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("x86")); ret = checkOSandCPU("Solaris", "x86");
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86))) else if (token == PLATFORM_FREEBSD_X86)
ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86")); ret = checkOSandCPU("FreeBSD", "x86");
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64))) else if (token == PLATFORM_FREEBSD_X86_64)
ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("X86_64")); ret = checkOSandCPU("FreeBSD", "X86_64");
else if (token.equals(OUSTR(PLATFORM_NETBSD_X86))) else if (token == PLATFORM_NETBSD_X86)
ret = checkOSandCPU(OUSTR("NetBSD"), OUSTR("x86")); ret = checkOSandCPU("NetBSD", "x86");
else if (token.equals(OUSTR(PLATFORM_NETBSD_X86_64))) else if (token == PLATFORM_NETBSD_X86_64)
ret = checkOSandCPU(OUSTR("NetBSD"), OUSTR("X86_64")); ret = checkOSandCPU("NetBSD", "X86_64");
else if (token.equals(OUSTR(PLATFORM_MACOSX_X86))) else if (token == PLATFORM_MACOSX_X86)
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86")); ret = checkOSandCPU("MacOSX", "x86");
else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC))) else if (token == PLATFORM_MACOSX_PPC)
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC")); ret = checkOSandCPU("MacOSX", "PowerPC");
else if (token.equals(OUSTR(PLATFORM_AIX_POWERPC))) else if (token == PLATFORM_AIX_POWERPC)
ret = checkOSandCPU(OUSTR("AIX"), OUSTR("PowerPC")); ret = checkOSandCPU("AIX", "PowerPC");
else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86))) else if (token == PLATFORM_OPENBSD_X86)
ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("x86")); ret = checkOSandCPU("OpenBSD", "x86");
else if (token.equals(OUSTR(PLATFORM_OPENBSD_X86_64))) else if (token == PLATFORM_OPENBSD_X86_64)
ret = checkOSandCPU(OUSTR("OpenBSD"), OUSTR("X86_64")); ret = checkOSandCPU("OpenBSD", "X86_64");
else if (token.equals(OUSTR(PLATFORM_DRAGONFLY_X86))) else if (token == PLATFORM_DRAGONFLY_X86)
ret = checkOSandCPU(OUSTR("DragonFly"), OUSTR("x86")); ret = checkOSandCPU("DragonFly", "x86");
else if (token.equals(OUSTR(PLATFORM_DRAGONFLY_X86_64))) else if (token == PLATFORM_DRAGONFLY_X86_64)
ret = checkOSandCPU(OUSTR("DragonFly"), OUSTR("X86_64")); ret = checkOSandCPU("DragonFly", "X86_64");
else else
{ {
OSL_FAIL("Extension Manager: The extension supports an unknown platform. " OSL_FAIL("Extension Manager: The extension supports an unknown platform. "
......
desktop/source/deployment/misc/dp_resource.cxx
Dosyayı görüntüle @ f8ff0def
...@@ -42,7 +42,7 @@ struct OfficeLocale : ...@@ -42,7 +42,7 @@ struct OfficeLocale :
//fallback, the locale is currently only set when the user starts the //fallback, the locale is currently only set when the user starts the
//office for the first time. //office for the first time.
if (slang.isEmpty()) if (slang.isEmpty())
slang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")); slang = "en-US";
return slang; return slang;
} }
}; };
...@@ -82,11 +82,11 @@ void checkPrimarySubtag(::rtl::OUString const & tag) ...@@ -82,11 +82,11 @@ void checkPrimarySubtag(::rtl::OUString const & tag)
sal_Int32 len = tag.getLength(); sal_Int32 len = tag.getLength();
sal_Unicode const * arLang = tag.getStr(); sal_Unicode const * arLang = tag.getStr();
if (len < 1 || len > 3) if (len < 1 || len > 3)
throw Exception(OUSTR("Invalid language string."), 0); throw Exception("Invalid language string.", 0);
if (len == 1 if (len == 1
&& (arLang[0] != 'i' && arLang[0] != 'x')) && (arLang[0] != 'i' && arLang[0] != 'x'))
throw Exception(OUSTR("Invalid language string."), 0); throw Exception("Invalid language string.", 0);
if (len == 2 || len == 3) if (len == 2 || len == 3)
{ {
...@@ -95,7 +95,7 @@ void checkPrimarySubtag(::rtl::OUString const & tag) ...@@ -95,7 +95,7 @@ void checkPrimarySubtag(::rtl::OUString const & tag)
if ( !((arLang[i] >= 'A' && arLang[i] <= 'Z') if ( !((arLang[i] >= 'A' && arLang[i] <= 'Z')
|| (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) ...@@ -108,7 +108,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry)
sal_Int32 len = tag.getLength(); sal_Int32 len = tag.getLength();
sal_Unicode const * arLang = tag.getStr(); sal_Unicode const * arLang = tag.getStr();
if (len < 2 || len > 8) if (len < 2 || len > 8)
throw Exception(OUSTR("Invalid language string."), 0); throw Exception("Invalid language string.", 0);
//country code //country code
bIsCountry = false; bIsCountry = false;
if (len == 2) if (len == 2)
...@@ -118,7 +118,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry) ...@@ -118,7 +118,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry)
if (!( (arLang[i] >= 'A' && arLang[i] <= 'Z') if (!( (arLang[i] >= 'A' && arLang[i] <= 'Z')
|| (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; bIsCountry = true;
...@@ -132,7 +132,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry) ...@@ -132,7 +132,7 @@ void checkSecondSubtag(::rtl::OUString const & tag, bool & bIsCountry)
|| (arLang[i] >= 'a' && arLang[i] <= 'z') || (arLang[i] >= 'a' && arLang[i] <= 'z')
|| (arLang[i] >= '0' && arLang[i] <= '9') )) || (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) ...@@ -143,7 +143,7 @@ void checkThirdSubtag(::rtl::OUString const & tag)
sal_Int32 len = tag.getLength(); sal_Int32 len = tag.getLength();
sal_Unicode const * arLang = tag.getStr(); sal_Unicode const * arLang = tag.getStr();
if (len < 1 || len > 8) 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++) for (sal_Int32 i = 0; i < len; i++)
{ {
...@@ -151,7 +151,7 @@ void checkThirdSubtag(::rtl::OUString const & tag) ...@@ -151,7 +151,7 @@ void checkThirdSubtag(::rtl::OUString const & tag)
|| (arLang[i] >= 'a' && arLang[i] <= 'z') || (arLang[i] >= 'a' && arLang[i] <= 'z')
|| (arLang[i] >= '0' && arLang[i] <= '9') )) || (arLang[i] >= '0' && arLang[i] <= '9') ))
{ {
throw Exception(OUSTR("Invalid language string."), 0); throw Exception("Invalid language string.", 0);
} }
} }
} }
......
desktop/source/deployment/misc/dp_ucb.cxx
Dosyayı görüntüle @ f8ff0def
...@@ -104,7 +104,7 @@ bool create_folder( ...@@ -104,7 +104,7 @@ bool create_folder(
// invalid: has to be at least "auth:/..." // invalid: has to be at least "auth:/..."
if (throw_exc) if (throw_exc)
throw ContentCreationException( throw ContentCreationException(
OUSTR("Cannot create folder (invalid path): ") + url, "Cannot create folder (invalid path): " + url,
Reference<XInterface>(), ContentCreationError_UNKNOWN ); Reference<XInterface>(), ContentCreationError_UNKNOWN );
return false; return false;
} }
...@@ -155,7 +155,7 @@ bool create_folder( ...@@ -155,7 +155,7 @@ bool create_folder(
} }
if (throw_exc) if (throw_exc)
throw ContentCreationException( throw ContentCreationException(
OUSTR("Cannot create folder: ") + url, "Cannot create folder: " + url,
Reference<XInterface>(), ContentCreationError_UNKNOWN ); Reference<XInterface>(), ContentCreationError_UNKNOWN );
return false; return false;
} }
...@@ -170,7 +170,7 @@ bool erase_path( OUString const & url, ...@@ -170,7 +170,7 @@ bool erase_path( OUString const & url,
{ {
try { try {
ucb_content.executeCommand( ucb_content.executeCommand(
OUSTR("delete"), Any( true /* delete physically */ ) ); "delete", Any( true /* delete physically */ ) );
} }
catch (const RuntimeException &) { catch (const RuntimeException &) {
throw; throw;
...@@ -192,8 +192,7 @@ bool erase_path( OUString const & url, ...@@ -192,8 +192,7 @@ bool erase_path( OUString const & url,
::xmlscript::createOutputStream( &bytes ) ); ::xmlscript::createOutputStream( &bytes ) );
if (! ucb_content.openStream( xStream )) if (! ucb_content.openStream( xStream ))
throw RuntimeException( throw RuntimeException(
OUSTR( "::ucbhelper::Content::openStream( XOutputStream ) failed!",
"::ucbhelper::Content::openStream( XOutputStream ) failed!"),
0 ); 0 );
return bytes; return bytes;
} }
......
desktop/source/deployment/misc/dp_update.cxx
Dosyayı görüntüle @ f8ff0def
...@@ -217,9 +217,8 @@ bool onlyBundledExtensions( ...@@ -217,9 +217,8 @@ bool onlyBundledExtensions(
OUString getExtensionDefaultUpdateURL() OUString getExtensionDefaultUpdateURL()
{ {
::rtl::OUString sUrl( ::rtl::OUString sUrl(
RTL_CONSTASCII_USTRINGPARAM(
"${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
":Version:ExtensionUpdateURL}")); ":Version:ExtensionUpdateURL}");
::rtl::Bootstrap::expandMacros(sUrl); ::rtl::Bootstrap::expandMacros(sUrl);
return sUrl; return sUrl;
} }
......
dictionaries @ 1595bf11
Subproject commit f0c914a43e7e6540300da25c935a77aebb672094 Subproject commit 1595bf11e295d96123fcb327ba9919307aa5b127
helpcontent2 @ 1909df07
Subproject commit d5d84f0ec4584e32147eeab355d0ab73e7dd9172 Subproject commit 1909df07cbd54bf753514cc6dc4137b7b69af63c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment