[Libreoffice-commits] core.git: tools/inc tools/source
Chr. Rossmanith
ChrRossmanith at gmx.de
Sat Mar 16 10:12:46 PDT 2013
tools/inc/tools/diagnose_ex.h | 16 ++--
tools/source/fsys/dirent.cxx | 36 +++++-----
tools/source/fsys/urlobj.cxx | 73 ++++++++-------------
tools/source/fsys/wntmsc.cxx | 14 +---
tools/source/generic/config.cxx | 41 +++++------
tools/source/inet/inetmsg.cxx | 64 ++++++++----------
tools/source/inet/inetstrm.cxx | 20 ++---
tools/source/misc/appendunixshellword.cxx | 4 -
tools/source/misc/extendapplicationenvironment.cxx | 8 --
tools/source/misc/getprocessworkingdir.cxx | 2
tools/source/rc/resmgr.cxx | 40 +++++------
tools/source/ref/errinf.cxx | 21 ++----
tools/source/ref/pstm.cxx | 15 +---
tools/source/stream/strmunx.cxx | 16 +---
tools/source/string/strucvt.cxx | 4 -
15 files changed, 168 insertions(+), 206 deletions(-)
New commits:
commit 37d2588844889da97dcbd5b1a5141797f5c33d4f
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Fri Mar 15 21:59:24 2013 +0100
Remove RTL_CONSTASCII_(U)STRINGPARAM in tools
Change-Id: Id97070321ad6b20f349896d3b4e1ae51cc82ece7
Reviewed-on: https://gerrit.libreoffice.org/2769
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index 11afdd2..84afc7b 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -95,15 +95,15 @@
#define ENSURE_ARG_OR_THROW(c, m) if( !(c) ) { \
OSL_ENSURE(c, m); \
throw ::com::sun::star::lang::IllegalArgumentException( \
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BOOST_CURRENT_FUNCTION)) + \
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n" m )), \
+ OUString(BOOST_CURRENT_FUNCTION) + \
+ OUString( ",\n" m ), \
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \
0 ); }
#define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
OSL_ENSURE(c, m); \
throw ::com::sun::star::lang::IllegalArgumentException( \
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BOOST_CURRENT_FUNCTION)) + \
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n" m )), \
+ OUString(BOOST_CURRENT_FUNCTION) + \
+ OUString( ",\n" m ), \
ifc, \
arg ); }
@@ -114,16 +114,16 @@
if( !(c) ){ \
OSL_ENSURE(c, m); \
throw ::com::sun::star::uno::RuntimeException( \
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BOOST_CURRENT_FUNCTION)) + \
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n" m )), \
+ OUString(BOOST_CURRENT_FUNCTION) + \
+ OUString( ",\n" m ), \
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }
#define ENSURE_OR_THROW2(c, m, ifc) \
if( !(c) ) { \
OSL_ENSURE(c, m); \
throw ::com::sun::star::uno::RuntimeException( \
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BOOST_CURRENT_FUNCTION)) + \
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n" m )), \
+ OUString(BOOST_CURRENT_FUNCTION) + \
+ OUString( ",\n" m ), \
ifc ); }
/** This macro asserts the given condition (in debug mode), and
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index e0231d4..624cac0 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -221,7 +221,7 @@ rtl::OString ImplCutPath( const rtl::OString& rStr, sal_Int32 nMax, char cAccDel
if (!comphelper::string::isalnumAscii(aCutPath[n]))
{
comphelper::string::truncateToLength(aCutPath, n);
- aCutPath.append(RTL_CONSTASCII_STRINGPARAM("..."));
+ aCutPath.append("...");
break;
}
}
@@ -230,7 +230,7 @@ rtl::OString ImplCutPath( const rtl::OString& rStr, sal_Int32 nMax, char cAccDel
if ( bInsertPrefix )
{
rtl::OStringBuffer aIns;
- aIns.append(cAccDel).append(RTL_CONSTASCII_STRINGPARAM("..."));
+ aIns.append(cAccDel).append("...");
aCutPath.insert(nBegin, aIns.makeStringAndClear());
}
@@ -596,7 +596,7 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle ) :
}
rtl::OString aTmpName(rtl::OUStringToOString(rInitName, osl_getThreadTextEncoding()));
- if (aTmpName.matchIgnoreAsciiCase(rtl::OString(RTL_CONSTASCII_STRINGPARAM("file:"))))
+ if (aTmpName.matchIgnoreAsciiCase(rtl::OString("file:")))
{
DBG_WARNING( "File URLs are not permitted but accepted" );
aTmpName = rtl::OUStringToOString(INetURLObject( rInitName ).PathToFileName(), osl_getThreadTextEncoding());
@@ -617,7 +617,7 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle ) :
#ifdef DBG_UTIL
if (eStyle == FSYS_STYLE_HOST && aTmpName.indexOf( "://" ) != -1)
{
- rtl::OStringBuffer aErr(RTL_CONSTASCII_STRINGPARAM("DirEntries akzeptieren nur File URLS: "));
+ rtl::OStringBuffer aErr("DirEntries akzeptieren nur File URLS: ");
aErr.append(aTmpName);
DBG_WARNING(aErr.getStr());
}
@@ -648,7 +648,7 @@ DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle ) :
}
rtl::OString aTmpName( rInitName );
- if (aTmpName.matchIgnoreAsciiCase(rtl::OString(RTL_CONSTASCII_STRINGPARAM("file:"))))
+ if (aTmpName.matchIgnoreAsciiCase(rtl::OString("file:")))
{
DBG_WARNING( "File URLs are not permitted but accepted" );
aTmpName = rtl::OUStringToOString(INetURLObject( rInitName ).PathToFileName(), osl_getThreadTextEncoding());
@@ -661,7 +661,7 @@ DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle ) :
{
if( eStyle == FSYS_STYLE_HOST && rInitName.indexOf("://") != -1 )
{
- rtl::OStringBuffer aErr(RTL_CONSTASCII_STRINGPARAM("DirEntries akzeptieren nur File URLS: "));
+ rtl::OStringBuffer aErr("DirEntries akzeptieren nur File URLS: ");
aErr.append(rInitName);
DBG_WARNING(aErr.getStr());
}
@@ -741,18 +741,18 @@ sal_Bool DirEntry::Exists( FSysAccess nAccess ) const
#if defined WNT
// get special file names from system
- if ( aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("CLOCK$")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("CON")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("AUX")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("COM1")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("COM2")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("COM3")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("COM4")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("LPT1")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("LPT2")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("LPT3")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("NUL")) ||
- aName.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("PRN")) )
+ if ( aName.equalsIgnoreAsciiCase("CLOCK$") ||
+ aName.equalsIgnoreAsciiCase("CON") ||
+ aName.equalsIgnoreAsciiCase("AUX") ||
+ aName.equalsIgnoreAsciiCase("COM1") ||
+ aName.equalsIgnoreAsciiCase("COM2") ||
+ aName.equalsIgnoreAsciiCase("COM3") ||
+ aName.equalsIgnoreAsciiCase("COM4") ||
+ aName.equalsIgnoreAsciiCase("LPT1") ||
+ aName.equalsIgnoreAsciiCase("LPT2") ||
+ aName.equalsIgnoreAsciiCase("LPT3") ||
+ aName.equalsIgnoreAsciiCase("NUL") ||
+ aName.equalsIgnoreAsciiCase("PRN") )
return sal_True;
#endif
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 066f4aa..b839e6d 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -849,7 +849,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
setInvalid();
return false;
}
- aSynAbsURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
rtl::OUStringBuffer aSynAuthority;
while (pPos < pEnd
&& *pPos != '/' && *pPos != '?'
@@ -875,8 +875,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
if (pEnd - pPos >= 2 && pPos[0] == '/' && pPos[1] == '/')
{
pPos += 2;
- aSynAbsURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
rtl::OUStringBuffer aSynAuthority;
while (pPos < pEnd
&& *pPos != '/' && *pPos != '?'
@@ -920,7 +919,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
setInvalid();
return false;
}
- aSynAbsURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
rtl::OUStringBuffer aSynUser;
bool bHasUser = false;
@@ -949,7 +948,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
m_aUser.set(aSynAbsURIRef,
aSynUser.makeStringAndClear(),
aSynAbsURIRef.getLength());
- aSynAbsURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("@"));
+ aSynAbsURIRef.append("@");
++pPos;
while (pPos < pEnd
@@ -1015,8 +1014,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
pPos + 2, p1, bOctets, ENCODE_ALL,
RTL_TEXTENCODING_DONTKNOW, true, NULL))
{
- aSynAbsURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
pHostPortBegin = pPos + 2;
pHostPortEnd = p1;
pPos = p1;
@@ -1040,8 +1038,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
// "file:///" *path ["#" *UCS4]
if (pEnd - pPos >= 2 && pPos[0] == '/' && pPos[1] == '/')
{
- aSynAbsURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
pPos += 2;
bSkippedInitialSlash = true;
if ((eStyle & FSYS_DOS) != 0
@@ -1060,8 +1057,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
// "file:///" *path ["#" *UCS4]
if (pPos < pEnd && *pPos == '/')
{
- aSynAbsURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
break;
}
@@ -1089,8 +1085,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
(scanDomain(p1, pe) > 0 && p1 == pe)
)
{
- aSynAbsURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
pHostPortBegin = pPos + 2;
pHostPortEnd = pe;
pPos = pe;
@@ -1117,8 +1112,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
|| pPos[2] == '/'
|| pPos[2] == '\\'))
{
- aSynAbsURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
nAltSegmentDelimiter = '\\';
bSkippedInitialSlash = true;
break;
@@ -1141,8 +1135,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
// character is not copied.
if (eStyle & (FSYS_UNX | FSYS_DOS | FSYS_MAC))
{
- aSynAbsURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.appendAscii("//");
switch (guessFSysStyleByCounting(pPos, pEnd, eStyle))
{
case FSYS_UNX:
@@ -1183,7 +1176,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
setInvalid();
return false;
}
- aSynAbsURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
sal_Unicode const * pAuthority = pPos;
sal_uInt32 c = getSchemeInfo().m_bQuery ? '?' : 0x80000000;
@@ -1293,8 +1286,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
}
else
{
- aSynAbsURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM(";AUTH="));
+ aSynAbsURIRef.append(";AUTH=");
rtl::OUStringBuffer aSynAuth;
while (p1 < pUserInfoEnd)
{
@@ -1653,7 +1645,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef,
{
if (pEnd - p >= 2 && p[0] == '/' && p[1] == '/')
{
- aSynAbsURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynAbsURIRef.append("//");
p += 2;
eState = STATE_ABS_PATH;
bSameDoc = false;
@@ -1986,7 +1978,7 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef,
++p)
{
if (*p == '/')
- aSynRelURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("../"));
+ aSynRelURIRef.append("../");
}
// If the new relative URL would start with "//" (i.e., it would be
@@ -2000,7 +1992,7 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef,
&& pSubjectPathBegin[nMatch] == '/'
&& pSubjectPathBegin[nMatch + 1] == '/')
{
- aSynRelURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("./"));
+ aSynRelURIRef.append("./");
}
else
{
@@ -2009,8 +2001,7 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef,
{
if (mustEncode(*p, PART_REL_SEGMENT_EXTRA))
{
- aSynRelURIRef.
- appendAscii(RTL_CONSTASCII_STRINGPARAM("./"));
+ aSynRelURIRef.append("./");
break;
}
}
@@ -2354,7 +2345,7 @@ bool INetURLObject::setPassword(rtl::OUString const & rThePassword,
else if (m_aHost.isPresent())
{
m_aAbsURIRef.insert(m_aHost.getBegin(),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ":@" )));
+ rtl::OUString( ":@" ));
m_aUser.set(m_aAbsURIRef, rtl::OUString(), m_aHost.getBegin());
nDelta
= m_aAuth.set(m_aAbsURIRef, aNewAuth, m_aHost.getBegin() + 1) + 2;
@@ -2527,7 +2518,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
case STATE_IP6_COLON:
if (*p == ':')
{
- aTheCanonic.appendAscii(RTL_CONSTASCII_STRINGPARAM("::"));
+ aTheCanonic.append("::");
eState = STATE_IP6_2COLON;
}
else
@@ -2886,8 +2877,7 @@ bool INetURLObject::setHost(rtl::OUString const & rTheHost, bool bOctets,
case INET_PROT_FILE:
{
rtl::OUString sTemp(aSynHost.toString());
- if (sTemp.equalsIgnoreAsciiCaseAsciiL(
- RTL_CONSTASCII_STRINGPARAM("localhost")))
+ if (sTemp.equalsIgnoreAsciiCase("localhost"))
{
aSynHost.setLength(0);
}
@@ -3176,7 +3166,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_OUT:
if (pEnd - pPos < 2 || *pPos++ != '/' || *pPos++ != '~')
return false;
- aTheSynPath.appendAscii(RTL_CONSTASCII_STRINGPARAM("/~"));
+ aTheSynPath.append("/~");
while (pPos < pEnd && *pPos != nFragmentDelimiter)
{
EscapeType eEscapeType;
@@ -3766,9 +3756,9 @@ INetURLObject::getAbbreviated(
{
rtl::OUString aRest;
if (m_aQuery.isPresent())
- aRest = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?..."));
+ aRest = "?...";
else if (m_aFragment.isPresent())
- aRest = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#..."));
+ aRest = "#...";
rtl::OUStringBuffer aTrailer;
sal_Unicode const * pBegin = pCoreBegin;
sal_Unicode const * pEnd = pCoreEnd;
@@ -3797,7 +3787,7 @@ INetURLObject::getAbbreviated(
pSuffixEnd = p;
rtl::OUStringBuffer aResult(aBuffer);
if (pSuffixEnd != pBegin)
- aResult.appendAscii(RTL_CONSTASCII_STRINGPARAM("..."));
+ aResult.append("...");
aResult.append(aSegment);
aResult.append(aTrailer.toString());
aResult.append(aRest);
@@ -3839,7 +3829,7 @@ INetURLObject::getAbbreviated(
rtl::OUStringBuffer aResult(aBuffer);
aResult.append(aSegment);
if (pPrefixBegin != pEnd)
- aResult.appendAscii(RTL_CONSTASCII_STRINGPARAM("..."));
+ aResult.append("...");
aResult.append(aTrailer.toString());
aResult.append(aRest);
if (rStringWidth->
@@ -3862,7 +3852,7 @@ INetURLObject::getAbbreviated(
if (bSegment)
{
if (pPrefixBegin != pBegin || pSuffixEnd != pEnd)
- aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("..."));
+ aBuffer.append("...");
aBuffer.append(aTrailer.toString());
}
}
@@ -3899,7 +3889,7 @@ INetURLObject::getAbbreviated(
else
{
aBuffer.setLength(--i);
- aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("..."));
+ aBuffer.append("...");
}
aResult = aBuffer;
if (rStringWidth->
@@ -4028,7 +4018,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
m_aAbsURIRef.append(sal_Unicode(':'));
if (getSchemeInfo().m_bAuthority)
{
- m_aAbsURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ m_aAbsURIRef.append("//");
bool bUserInfo = false;
if (getSchemeInfo().m_bUser)
{
@@ -4088,8 +4078,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme,
case INET_PROT_FILE:
{
rtl::OUString sTemp(aSynHost.toString());
- if (sTemp.equalsIgnoreAsciiCaseAsciiL(
- RTL_CONSTASCII_STRINGPARAM("localhost")))
+ if (sTemp.equalsIgnoreAsciiCase( "localhost" ))
{
aSynHost.setLength(0);
}
@@ -4657,7 +4646,7 @@ bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath,
break;
}
- rtl::OUStringBuffer aSynAbsURIRef(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://")));
+ rtl::OUStringBuffer aSynAbsURIRef(rtl::OUString("file://"));
switch (eStyle)
{
@@ -4812,7 +4801,7 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle,
*pDelimiter = '/';
rtl::OUStringBuffer aSynFSysPath;
- aSynFSysPath.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
+ aSynFSysPath.append("//");
if (m_aHost.isPresent() && m_aHost.getLength() > 0)
aSynFSysPath.append(decode(m_aHost, '%', DECODE_WITH_CHARSET,
RTL_TEXTENCODING_UTF8));
@@ -4843,7 +4832,7 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle,
rtl::OUStringBuffer aSynFSysPath;
if (m_aHost.isPresent() && m_aHost.getLength() > 0)
{
- aSynFSysPath.appendAscii(RTL_CONSTASCII_STRINGPARAM("\\\\"));
+ aSynFSysPath.append("\\\\");
aSynFSysPath.append(decode(m_aHost, '%', DECODE_WITH_CHARSET,
RTL_TEXTENCODING_UTF8));
aSynFSysPath.append(sal_Unicode('\\'));
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index b1c416c..c6cf063 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -132,8 +132,8 @@ String DirEntry::GetVolume() const
if ( ( pTop->eFlag == FSYS_FLAG_ABSROOT ||
pTop->eFlag == FSYS_FLAG_RELROOT ||
pTop->eFlag == FSYS_FLAG_VOLUME )
- && !aTopName.equalsL(RTL_CONSTASCII_STRINGPARAM("a:"))
- && !aTopName.equalsL(RTL_CONSTASCII_STRINGPARAM("b:")) && Exists() )
+ && aTopName != "a:"
+ && aTopName != "b:" && Exists() )
{
char sFileSysName[256];
char sVolumeName[256];
@@ -151,7 +151,7 @@ String DirEntry::GetVolume() const
// Append volume name for local drives
if ( aRet.Len() == 0 )
{
- aRootDir += rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\"));
+ aRootDir += "\\";
if ( GetVolumeInformation( aRootDir.getStr(),
sVolumeName, 256,
(LPDWORD) &nSerial, (LPDWORD) &nMaxCompLen,
@@ -604,14 +604,12 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bForceAccess )
pTop->eFlag == FSYS_FLAG_RELROOT ||
pTop->eFlag == FSYS_FLAG_VOLUME ) )
{
- if ( aName.equalsL(RTL_CONSTASCII_STRINGPARAM("a:")) ||
- aName.equalsL(RTL_CONSTASCII_STRINGPARAM("b:")) )
+ if ( aName == "a:" || aName == "b:" )
bAccess = sal_False;
else
OSL_TRACE( "FSys: will access removable device!" );
}
- if ( bAccess && ( aName.equalsL(RTL_CONSTASCII_STRINGPARAM("a:")) ||
- aName.equalsL(RTL_CONSTASCII_STRINGPARAM("b:")) ) )
+ if ( bAccess && ( aName == "a:" || aName == "b:" ) )
{
DBG_WARNING( "floppy will clatter" );
}
@@ -637,7 +635,7 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry, sal_Bool bForceAccess )
}
rtl::OString aRootDir = aDirEntry.aName;
- aRootDir += rtl::OString(RTL_CONSTASCII_STRINGPARAM("\\"));
+ aRootDir += "\\";
UINT nType = GetDriveType( aRootDir.getStr() ); //TPF: 2i
if ( nType == 1 || nType == 0 )
{
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index f2c49ee..9d2d284 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -672,10 +672,9 @@ Config::Config( const rtl::OUString& rFileName )
mbPersistence = sal_True;
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(
- RTL_CONSTASCII_STRINGPARAM("Config::Config( "));
+ rtl::OStringBuffer aTraceStr("Config::Config( ");
aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8));
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" )"));
+ aTraceStr.append(" )");
OSL_TRACE("%s", aTraceStr.getStr());
#endif
}
@@ -831,12 +830,11 @@ rtl::OUString Config::ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncodi
rtl::OString Config::ReadKey(const rtl::OString& rKey, const rtl::OString& rDefault) const
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(
- RTL_CONSTASCII_STRINGPARAM("Config::ReadKey( "));
+ rtl::OStringBuffer aTraceStr("Config::ReadKey( ");
aTraceStr.append(rKey);
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" ) from "));
+ aTraceStr.append(" ) from ");
aTraceStr.append(GetGroup());
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" in "));
+ aTraceStr.append(" in ");
aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8));
OSL_TRACE("%s", aTraceStr.getStr());
#endif
@@ -865,13 +863,13 @@ rtl::OString Config::ReadKey(const rtl::OString& rKey, const rtl::OString& rDefa
void Config::WriteKey(const rtl::OString& rKey, const rtl::OString& rStr)
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(RTL_CONSTASCII_STRINGPARAM("Config::WriteKey( "));
+ rtl::OStringBuffer aTraceStr("Config::WriteKey( ");
aTraceStr.append(rKey);
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aTraceStr.append(", ");
aTraceStr.append(rStr);
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" ) to "));
+ aTraceStr.append(" ) to ");
aTraceStr.append(GetGroup());
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" in "));
+ aTraceStr.append(" in ");
aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8));
OSL_TRACE("%s", aTraceStr.getStr());
#endif
@@ -975,11 +973,10 @@ void Config::DeleteKey(const rtl::OString& rKey)
sal_uInt16 Config::GetKeyCount() const
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(
- RTL_CONSTASCII_STRINGPARAM("Config::GetKeyCount()"));
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" from "));
+ rtl::OStringBuffer aTraceStr("Config::GetKeyCount()");
+ aTraceStr.append(" from ");
aTraceStr.append(GetGroup());
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" in "));
+ aTraceStr.append(" in ");
aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8));
OSL_TRACE("%s", aTraceStr.getStr());
#endif
@@ -1009,12 +1006,11 @@ sal_uInt16 Config::GetKeyCount() const
rtl::OString Config::GetKeyName(sal_uInt16 nKey) const
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(
- RTL_CONSTASCII_STRINGPARAM("Config::GetKeyName( "));
+ rtl::OStringBuffer aTraceStr("Config::GetKeyName( ");
aTraceStr.append(static_cast<sal_Int32>(nKey));
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" ) from "));
+ aTraceStr.append(" ) from ");
aTraceStr.append(GetGroup());
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" in "));
+ aTraceStr.append(" in ");
aTraceStr.append(rtl::OUStringToOString(
maFileName, RTL_TEXTENCODING_UTF8));
OSL_TRACE("%s", aTraceStr.getStr());
@@ -1044,12 +1040,11 @@ rtl::OString Config::GetKeyName(sal_uInt16 nKey) const
rtl::OString Config::ReadKey(sal_uInt16 nKey) const
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(
- RTL_CONSTASCII_STRINGPARAM("Config::ReadKey( "));
+ rtl::OStringBuffer aTraceStr("Config::ReadKey( ");
aTraceStr.append(static_cast<sal_Int32>(nKey));
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" ) from "));
+ aTraceStr.append(" ) from ");
aTraceStr.append(GetGroup());
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" in "));
+ aTraceStr.append(" in ");
aTraceStr.append(rtl::OUStringToOString(maFileName,
RTL_TEXTENCODING_UTF8));
OSL_TRACE("%s", aTraceStr.getStr());
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 35bd176..914d59c 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -47,8 +47,6 @@ inline sal_Unicode ascii_toLowerCase( sal_Unicode ch )
return ch;
}
-#define CONSTASCII_STRINGPARAM(a) (a), RTL_TEXTENCODING_ASCII_US
-
INetMessage::~INetMessage()
{
ListCleanup_Impl();
@@ -152,22 +150,22 @@ namespace
{
static const OString _ImplINetRFC822MessageHeaderData[] =
{
- OString(RTL_CONSTASCII_STRINGPARAM("BCC")),
- OString(RTL_CONSTASCII_STRINGPARAM("CC")),
- OString(RTL_CONSTASCII_STRINGPARAM("Comments")),
- OString(RTL_CONSTASCII_STRINGPARAM("Date")),
- OString(RTL_CONSTASCII_STRINGPARAM("From")),
- OString(RTL_CONSTASCII_STRINGPARAM("In-Reply-To")),
- OString(RTL_CONSTASCII_STRINGPARAM("Keywords")),
- OString(RTL_CONSTASCII_STRINGPARAM("Message-ID")),
- OString(RTL_CONSTASCII_STRINGPARAM("References")),
- OString(RTL_CONSTASCII_STRINGPARAM("Reply-To")),
- OString(RTL_CONSTASCII_STRINGPARAM("Return-Path")),
- OString(RTL_CONSTASCII_STRINGPARAM("Subject")),
- OString(RTL_CONSTASCII_STRINGPARAM("Sender")),
- OString(RTL_CONSTASCII_STRINGPARAM("To")),
- OString(RTL_CONSTASCII_STRINGPARAM("X-Mailer")),
- OString(RTL_CONSTASCII_STRINGPARAM("Return-Receipt-To"))
+ OString("BCC"),
+ OString("CC"),
+ OString("Comments"),
+ OString("Date"),
+ OString("From"),
+ OString("In-Reply-To"),
+ OString("Keywords"),
+ OString("Message-ID"),
+ OString("References"),
+ OString("Reply-To"),
+ OString("Return-Path"),
+ OString("Subject"),
+ OString("Sender"),
+ OString("To"),
+ OString("X-Mailer"),
+ OString("Return-Receipt-To")
};
return &_ImplINetRFC822MessageHeaderData[0];
}
@@ -639,12 +637,12 @@ namespace
{
static const OString _ImplINetMIMEMessageHeaderData[] =
{
- OString(RTL_CONSTASCII_STRINGPARAM("MIME-Version")),
- OString(RTL_CONSTASCII_STRINGPARAM("Content-Description")),
- OString(RTL_CONSTASCII_STRINGPARAM("Content-Disposition")),
- OString(RTL_CONSTASCII_STRINGPARAM("Content-ID")),
- OString(RTL_CONSTASCII_STRINGPARAM("Content-Type")),
- OString(RTL_CONSTASCII_STRINGPARAM("Content-Transfer-Encoding"))
+ OString("MIME-Version"),
+ OString("Content-Description"),
+ OString("Content-Disposition"),
+ OString("Content-ID"),
+ OString("Content-Type"),
+ OString("Content-Transfer-Encoding")
};
return &_ImplINetMIMEMessageHeaderData[0];
}
@@ -944,36 +942,36 @@ bool INetMIMEMessage::EnableAttachChild (INetMessageContainerType eType)
switch (eType)
{
case INETMSG_MESSAGE_RFC822:
- aContentType.append(RTL_CONSTASCII_STRINGPARAM("message/rfc822"));
+ aContentType.append("message/rfc822");
break;
case INETMSG_MULTIPART_ALTERNATIVE:
- aContentType.append(RTL_CONSTASCII_STRINGPARAM("multipart/alternative"));
+ aContentType.append("multipart/alternative");
break;
case INETMSG_MULTIPART_DIGEST:
- aContentType.append(RTL_CONSTASCII_STRINGPARAM("multipart/digest"));
+ aContentType.append("multipart/digest");
break;
case INETMSG_MULTIPART_PARALLEL:
- aContentType.append(RTL_CONSTASCII_STRINGPARAM("multipart/parallel"));
+ aContentType.append("multipart/parallel");
break;
case INETMSG_MULTIPART_RELATED:
- aContentType.append(RTL_CONSTASCII_STRINGPARAM("multipart/related"));
+ aContentType.append("multipart/related");
break;
case INETMSG_MULTIPART_FORM_DATA:
- aContentType.append(RTL_CONSTASCII_STRINGPARAM("multipart/form-data"));
+ aContentType.append("multipart/form-data");
break;
default:
- aContentType.append(RTL_CONSTASCII_STRINGPARAM("multipart/mixed"));
+ aContentType.append("multipart/mixed");
break;
}
// Setup boundary for multipart types.
- if (aContentType.toString().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("multipart/")))
+ if (aContentType.toString().equalsIgnoreAsciiCase("multipart/"))
{
// Generate a unique boundary from current time.
sal_Char sTail[16 + 1];
@@ -987,7 +985,7 @@ bool INetMIMEMessage::EnableAttachChild (INetMessageContainerType eType)
m_aBoundary += sTail;
// Append boundary as ContentType parameter.
- aContentType.append(RTL_CONSTASCII_STRINGPARAM("; boundary="));
+ aContentType.append("; boundary=");
aContentType.append(m_aBoundary);
}
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index 3b7d348..009c905 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -1277,10 +1277,9 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize)
if (pMsg->IsMultipart())
{
// Insert multipart delimiter.
- rtl::OStringBuffer aDelim(
- RTL_CONSTASCII_STRINGPARAM("--"));
+ rtl::OStringBuffer aDelim("--");
aDelim.append(pMsg->GetMultipartBoundary());
- aDelim.append(RTL_CONSTASCII_STRINGPARAM("\r\n"));
+ aDelim.append("\r\n");
memcpy(pData, aDelim.getStr(),
aDelim.getLength());
@@ -1296,10 +1295,9 @@ int INetMIMEMessageStream::GetMsgLine (sal_Char *pData, sal_uIntPtr nSize)
if (pMsg->IsMultipart())
{
// Insert close delimiter.
- rtl::OStringBuffer aDelim(
- RTL_CONSTASCII_STRINGPARAM("--"));
+ rtl::OStringBuffer aDelim("--");
aDelim.append(pMsg->GetMultipartBoundary());
- aDelim.append(RTL_CONSTASCII_STRINGPARAM("--\r\n"));
+ aDelim.append("--\r\n");
memcpy (pData, aDelim.getStr(),
aDelim.getLength());
@@ -1448,8 +1446,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize)
pMsg->GetContentType(), RTL_TEXTENCODING_ASCII_US));
rtl::OString aLowerType(aType.toAsciiLowerCase());
- sal_Int32 nPos = aLowerType.indexOfL(
- RTL_CONSTASCII_STRINGPARAM("boundary="));
+ sal_Int32 nPos = aLowerType.indexOf("boundary=");
rtl::OString aBoundary(aType.copy(nPos + 9));
aBoundary = comphelper::string::strip(aBoundary, ' ');
@@ -1460,17 +1457,16 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize)
}
rtl::OString aPlainDelim (pMsg->GetMultipartBoundary());
- rtl::OString aDelim = rtl::OStringBuffer(
- RTL_CONSTASCII_STRINGPARAM("--")).
+ rtl::OString aDelim = rtl::OStringBuffer("--").
append(aPlainDelim).
makeStringAndClear();
rtl::OString aPlainClose = rtl::OStringBuffer(
aPlainDelim).
- append(RTL_CONSTASCII_STRINGPARAM("--")).
+ append("--").
makeStringAndClear();
rtl::OString aClose = rtl::OStringBuffer(
aDelim).
- append(RTL_CONSTASCII_STRINGPARAM("--")).
+ append("--").
makeStringAndClear();
if (pMsgBuffer == NULL) pMsgBuffer = new SvMemoryStream;
diff --git a/tools/source/misc/appendunixshellword.cxx b/tools/source/misc/appendunixshellword.cxx
index 4657301..6a15a1f 100644
--- a/tools/source/misc/appendunixshellword.cxx
+++ b/tools/source/misc/appendunixshellword.cxx
@@ -37,7 +37,7 @@ void appendUnixShellWord(
{
OSL_ASSERT(accumulator != NULL);
if (text.isEmpty()) {
- accumulator->append(RTL_CONSTASCII_STRINGPARAM("''"));
+ accumulator->append("''");
} else {
bool quoted = false;
for (sal_Int32 i = 0; i < text.getLength(); ++i) {
@@ -47,7 +47,7 @@ void appendUnixShellWord(
accumulator->append('\'');
quoted = false;
}
- accumulator->append(RTL_CONSTASCII_STRINGPARAM("\\'"));
+ accumulator->append("\\'");
} else {
if (!quoted) {
accumulator->append('\'');
diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx
index 5fc44a2..68181ad 100644
--- a/tools/source/misc/extendapplicationenvironment.cxx
+++ b/tools/source/misc/extendapplicationenvironment.cxx
@@ -52,12 +52,11 @@ void extendApplicationEnvironment() {
// Make sure URE_BOOTSTRAP environment variable is set (failure is fatal):
rtl::OUStringBuffer env;
- rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("URE_BOOTSTRAP"));
+ rtl::OUString envVar("URE_BOOTSTRAP");
rtl::OUString uri;
if (rtl::Bootstrap::get(envVar, uri))
{
- if (!uri.matchIgnoreAsciiCaseAsciiL(
- RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pathname:")))
+ if (!uri.matchIgnoreAsciiCase("vnd.sun.star.pathname:"))
{
uri = rtl::Bootstrap::encode(uri);
}
@@ -71,8 +70,7 @@ void extendApplicationEnvironment() {
uri = uri.copy(0, i + 1);
}
env.append(rtl::Bootstrap::encode(uri));
- env.appendAscii(
- RTL_CONSTASCII_STRINGPARAM(SAL_CONFIGFILE("fundamental")));
+ env.append(SAL_CONFIGFILE("fundamental"));
}
rtl::OUString envValue(env.makeStringAndClear());
if (osl_setEnvironment(envVar.pData, envValue.pData) != osl_Process_E_None) {
diff --git a/tools/source/misc/getprocessworkingdir.cxx b/tools/source/misc/getprocessworkingdir.cxx
index 916915a..115e5c8 100644
--- a/tools/source/misc/getprocessworkingdir.cxx
+++ b/tools/source/misc/getprocessworkingdir.cxx
@@ -34,7 +34,7 @@ namespace tools {
bool getProcessWorkingDir(rtl::OUString &rUrl)
{
rUrl = rtl::OUString();
- rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("$OOO_CWD"));
+ rtl::OUString s("$OOO_CWD");
rtl::Bootstrap::expandMacros(s);
if (s.isEmpty())
{
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index e8c9db7..7ef6523 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -183,8 +183,7 @@ void ResMgrContainer::init()
assert( m_aResFiles.empty() );
// get resource path
- rtl::OUString uri(
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/resource/"));
+ rtl::OUString uri("$BRAND_BASE_DIR/program/resource/");
rtl::Bootstrap::expandMacros(uri); //TODO: detect failure
// collect all possible resource files
@@ -284,9 +283,9 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
// locale fallback failed
// fallback to en-US locale
nTries = 2;
- aLocale.Language = OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) );
- aLocale.Country = OUString( RTL_CONSTASCII_USTRINGPARAM( "US" ) );
- aLocale.Variant = OUString();
+ aLocale.Language = "en";
+ aLocale.Country = "US";
+ aLocale.Variant = "";
}
}
// try if there is anything with this prefix at all
@@ -343,8 +342,7 @@ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
sKey.append( sal_Unicode('-') );
sKey.append( rLocale.Variant );
} // if( !aLocale.Variant.isEmpty() )
- ::rtl::OUString sURL = sKey.makeStringAndClear();
- sURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".res"));
+ OUString sURL = sKey.makeStringAndClear() + ".res";
if ( m_aResFiles.find(sURL) == m_aResFiles.end() )
{
m_aResFiles[ sURL ].aFileURL = sURL;
@@ -400,8 +398,8 @@ InternalResMgr* ResMgrContainer::getNextFallback( InternalResMgr* pMgr )
aLocale.Country = OUString();
else if( !isAlreadyPureenUS(aLocale) )
{
- aLocale.Language = OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) );
- aLocale.Country = OUString( RTL_CONSTASCII_USTRINGPARAM( "US" ) );
+ aLocale.Language = "en";
+ aLocale.Country = "US";
}
InternalResMgr* pNext = getResMgr( pMgr->aPrefix, aLocale, pMgr->bSingular );
// prevent recursion
@@ -490,7 +488,7 @@ InternalResMgr::~InternalResMgr()
{
SvFileStream aStm( OUString::createFromAscii( pLogFile ), STREAM_WRITE );
aStm.Seek( STREAM_SEEK_TO_END );
- rtl::OStringBuffer aLine(RTL_CONSTASCII_STRINGPARAM("FileName: "));
+ rtl::OStringBuffer aLine("FileName: ");
aLine.append(rtl::OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8));
aStm.WriteLine(aLine.makeStringAndClear());
@@ -499,7 +497,7 @@ InternalResMgr::~InternalResMgr()
it != pResUseDump->end(); ++it )
{
sal_uInt64 nKeyId = it->first;
- aLine.append(RTL_CONSTASCII_STRINGPARAM("Type/Id: "));
+ aLine.append("Type/Id: ");
aLine.append(sal::static_int_cast< sal_Int32 >((nKeyId >> 32) & 0xFFFFFFFF));
aLine.append('/');
aLine.append(sal::static_int_cast< sal_Int32 >(nKeyId & 0xFFFFFFFF));
@@ -713,22 +711,22 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
if (aStr.getLength())
aStr.append('\n');
- aStr.append(RTL_CONSTASCII_STRINGPARAM("Class: "));
+ aStr.append("Class: ");
aStr.append(rtl::OUStringToOString(GetTypeRes_Impl(ResId(nRT, *pNewResMgr)),
RTL_TEXTENCODING_UTF8));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(", Id: "));
+ aStr.append(", Id: ");
aStr.append(static_cast<sal_Int32>(nId));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(". "));
+ aStr.append(". ");
aStr.append(pMessage);
- aStr.append(RTL_CONSTASCII_STRINGPARAM("\nResource Stack\n"));
+ aStr.append("\nResource Stack\n");
while( nDepth > 0 )
{
- aStr.append(RTL_CONSTASCII_STRINGPARAM("Class: "));
+ aStr.append("Class: ");
aStr.append(rtl::OUStringToOString(GetTypeRes_Impl(
ResId(rResStack[nDepth].pResource->GetRT(), *pNewResMgr)),
RTL_TEXTENCODING_UTF8));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(", Id: "));
+ aStr.append(", Id: ");
aStr.append(static_cast<sal_Int32>(
rResStack[nDepth].pResource->GetId()));
nDepth--;
@@ -842,8 +840,7 @@ void ResMgr::Init( const OUString& rFileName )
if ( !pImpRes )
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aStr(
- RTL_CONSTASCII_STRINGPARAM("Resourcefile not found:\n"));
+ rtl::OStringBuffer aStr("Resourcefile not found:\n");
aStr.append(OUStringToOString(rFileName, RTL_TEXTENCODING_UTF8));
OSL_FAIL(aStr.getStr());
#endif
@@ -1090,10 +1087,9 @@ sal_Bool ResMgr::GetResource( const ResId& rId, const Resource* pResObj )
{
pTop->Flags |= RC_FALLBACK_DOWN;
#ifdef DBG_UTIL
- rtl::OStringBuffer aMess(
- RTL_CONSTASCII_STRINGPARAM("found resource "));
+ rtl::OStringBuffer aMess("found resource ");
aMess.append(static_cast<sal_Int32>(nId));
- aMess.append(RTL_CONSTASCII_STRINGPARAM(" in fallback "));
+ aMess.append(" in fallback ");
aMess.append(rtl::OUStringToOString(
pFallbackResMgr->GetFileName(),
osl_getThreadTextEncoding()));
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 0038c86..5631d46 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -177,9 +177,9 @@ public:
static void aDspFunc(const OUString &rErr, const OUString &rAction)
{
- rtl::OStringBuffer aErr(RTL_CONSTASCII_STRINGPARAM("Aktion: "));
+ rtl::OStringBuffer aErr("Aktion: ");
aErr.append(rtl::OUStringToOString(rAction, RTL_TEXTENCODING_ASCII_US));
- aErr.append(RTL_CONSTASCII_STRINGPARAM(" Fehler: "));
+ aErr.append(" Fehler: ");
aErr.append(rtl::OUStringToOString(rErr, RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aErr.getStr());
}
@@ -307,9 +307,9 @@ sal_uInt16 ErrorHandler::HandleError_Impl(
{
if(!pData->pDsp)
{
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Action: "));
+ rtl::OStringBuffer aStr("Action: ");
aStr.append(rtl::OUStringToOString(aAction, RTL_TEXTENCODING_ASCII_US));
- aStr.append(RTL_CONSTASCII_STRINGPARAM("\nFehler: "));
+ aStr.append("\nFehler: ");
aStr.append(rtl::OUStringToOString(aErr, RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aStr.getStr());
}
@@ -377,23 +377,22 @@ sal_Bool SimpleErrorHandler::CreateString(
const ErrorInfo *pInfo, OUString &rStr, sal_uInt16 &) const
{
sal_uIntPtr nId = pInfo->GetErrorCode();
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Id "));
+ rtl::OStringBuffer aStr("Id ");
aStr.append(static_cast<sal_Int32>(nId));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(
- " only handled by SimpleErrorHandler"));
- aStr.append(RTL_CONSTASCII_STRINGPARAM("\nErrorCode: "));
+ aStr.append(" only handled by SimpleErrorHandler");
+ aStr.append("\nErrorCode: ");
aStr.append(static_cast<sal_Int32>(
nId & ((1L << ERRCODE_CLASS_SHIFT) - 1 )));
- aStr.append(RTL_CONSTASCII_STRINGPARAM("\nErrorClass: "));
+ aStr.append("\nErrorClass: ");
aStr.append(static_cast<sal_Int32>(
(nId & ERRCODE_CLASS_MASK) >> ERRCODE_CLASS_SHIFT));
- aStr.append(RTL_CONSTASCII_STRINGPARAM("\nErrorArea: "));
+ aStr.append("\nErrorArea: ");
aStr.append(static_cast<sal_Int32>((nId & ERRCODE_ERROR_MASK &
~((1 << ERRCODE_AREA_SHIFT ) -1 ) ) >> ERRCODE_AREA_SHIFT));
DynamicErrorInfo *pDyn=PTR_CAST(DynamicErrorInfo,pInfo);
if(pDyn)
{
- aStr.append(RTL_CONSTASCII_STRINGPARAM("\nDId "));
+ aStr.append("\nDId ");
aStr.append(static_cast<sal_Int32>(*pDyn));
}
rStr = rtl::OStringToOUString(aStr.makeStringAndClear(),
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index ee5870c..ffe8d34 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -110,10 +110,9 @@ void TOOLS_DLLPUBLIC ReadObjects( SvPersistListReadable& rLst, SvPersistStream &
#ifdef DBG_UTIL
if( nObjLen + nObjPos != rStm.Tell() )
{
- rtl::OStringBuffer aStr(
- RTL_CONSTASCII_STRINGPARAM("false list len: read = "));
+ rtl::OStringBuffer aStr("false list len: read = ");
aStr.append(static_cast<sal_Int64>(rStm.Tell() - nObjPos));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(", should = "));
+ aStr.append(", should = ");
aStr.append(static_cast<sal_Int64>(nObjLen));
OSL_FAIL(aStr.getStr());
}
@@ -587,10 +586,9 @@ sal_uInt32 SvPersistStream::ReadObj
if( !pFunc )
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aStr(
- RTL_CONSTASCII_STRINGPARAM("no class with id: " ));
+ rtl::OStringBuffer aStr("no class with id: " );
aStr.append(static_cast<sal_Int32>(nClassId));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(" registered"));
+ aStr.append(" registered");
DBG_WARNING(aStr.getStr());
#else
(void)nObjLen;
@@ -615,10 +613,9 @@ sal_uInt32 SvPersistStream::ReadObj
#ifdef DBG_UTIL
if( nObjLen + nObjPos != Tell() )
{
- rtl::OStringBuffer aStr(
- RTL_CONSTASCII_STRINGPARAM("false object len: read = "));
+ rtl::OStringBuffer aStr("false object len: read = ");
aStr.append(static_cast<sal_Int64>((long)(Tell() - nObjPos)));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(", should = "));
+ aStr.append(", should = ");
aStr.append(static_cast<sal_Int32>(nObjLen));
OSL_FAIL(aStr.getStr());
}
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index ec3c871..b36d636 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -349,10 +349,9 @@ sal_uInt16 SvFileStream::IsA() const
sal_Size SvFileStream::GetData( void* pData, sal_Size nSize )
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(
- RTL_CONSTASCII_STRINGPARAM("SvFileStream::GetData(): "));
+ rtl::OStringBuffer aTraceStr("SvFileStream::GetData(): ");
aTraceStr.append(static_cast<sal_Int64>(nSize));
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" Bytes from "));
+ aTraceStr.append(" Bytes from ");
aTraceStr.append(rtl::OUStringToOString(aFilename,
osl_getThreadTextEncoding()));
OSL_TRACE("%s", aTraceStr.getStr());
@@ -374,10 +373,9 @@ sal_Size SvFileStream::GetData( void* pData, sal_Size nSize )
sal_Size SvFileStream::PutData( const void* pData, sal_Size nSize )
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(
- RTL_CONSTASCII_STRINGPARAM("SvFileStream::PutData(): "));
+ rtl::OStringBuffer aTraceStr("SvFileStream::PutData(): ");
aTraceStr.append(static_cast<sal_Int64>(nSize));
- aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" Bytes to "));
+ aTraceStr.append(" Bytes to ");
aTraceStr.append(rtl::OUStringToOString(aFilename,
osl_getThreadTextEncoding()));
OSL_TRACE("%s", aTraceStr.getStr());
@@ -512,8 +510,7 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
rtl::OString aLocalFilename(rtl::OUStringToOString(aFilename, osl_getThreadTextEncoding()));
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(RTL_CONSTASCII_STRINGPARAM(
- "SvFileStream::Open(): "));
+ rtl::OStringBuffer aTraceStr("SvFileStream::Open(): ");
aTraceStr.append(aLocalFilename);
OSL_TRACE( "%s", aTraceStr.getStr() );
#endif
@@ -611,8 +608,7 @@ void SvFileStream::Close()
if ( IsOpen() )
{
#ifdef DBG_UTIL
- rtl::OStringBuffer aTraceStr(
- RTL_CONSTASCII_STRINGPARAM("SvFileStream::Close(): "));
+ rtl::OStringBuffer aTraceStr("SvFileStream::Close(): ");
aTraceStr.append(rtl::OUStringToOString(aFilename,
osl_getThreadTextEncoding()));
OSL_TRACE("%s", aTraceStr.getStr());
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index b01e3e2..e771740 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -122,9 +122,9 @@ rtl::OUString ResId::toString() const
#if OSL_DEBUG_LEVEL > 0
sRet = rtl::OUStringBuffer().
- appendAscii(RTL_CONSTASCII_STRINGPARAM("<resource id ")).
+ append("<resource id ").
append(static_cast<sal_Int32>(GetId())).
- appendAscii(RTL_CONSTASCII_STRINGPARAM(" not found>")).
+ append(" not found>").
makeStringAndClear();
#endif
More information about the Libreoffice-commits
mailing list