summaryrefslogtreecommitdiff
path: root/tools/inc/tools
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /tools/inc/tools
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'tools/inc/tools')
-rw-r--r--tools/inc/tools/StringListResource.hxx2
-rw-r--r--tools/inc/tools/appendunixshellword.hxx2
-rw-r--r--tools/inc/tools/bigint.hxx4
-rw-r--r--tools/inc/tools/config.hxx32
-rw-r--r--tools/inc/tools/diagnose_ex.h10
-rw-r--r--tools/inc/tools/getprocessworkingdir.hxx2
-rw-r--r--tools/inc/tools/inetmime.hxx34
-rw-r--r--tools/inc/tools/lineend.hxx4
-rw-r--r--tools/inc/tools/multisel.hxx6
-rw-r--r--tools/inc/tools/rc.hxx4
-rw-r--r--tools/inc/tools/resary.hxx8
-rw-r--r--tools/inc/tools/resid.hxx4
-rw-r--r--tools/inc/tools/resmgr.hxx12
-rw-r--r--tools/inc/tools/simplerm.hxx2
-rw-r--r--tools/inc/tools/stream.hxx70
-rw-r--r--tools/inc/tools/string.hxx40
-rw-r--r--tools/inc/tools/urlobj.hxx360
-rw-r--r--tools/inc/tools/wldcrd.hxx14
18 files changed, 305 insertions, 305 deletions
diff --git a/tools/inc/tools/StringListResource.hxx b/tools/inc/tools/StringListResource.hxx
index 3497d07f29e4..52f22e48a8ef 100644
--- a/tools/inc/tools/StringListResource.hxx
+++ b/tools/inc/tools/StringListResource.hxx
@@ -29,7 +29,7 @@ namespace tools
class StringListResource : public Resource
{
public:
- StringListResource(const ResId& _aResId,::std::vector< ::rtl::OUString>& _rToFill ) : Resource(_aResId)
+ StringListResource(const ResId& _aResId,::std::vector< OUString>& _rToFill ) : Resource(_aResId)
{
sal_uInt16 i = 1;
while( IsAvailableRes(ResId(i,*m_pResMgr).SetRT(RSC_STRING)) )
diff --git a/tools/inc/tools/appendunixshellword.hxx b/tools/inc/tools/appendunixshellword.hxx
index 6461fdb020f4..e5099bdc20c8 100644
--- a/tools/inc/tools/appendunixshellword.hxx
+++ b/tools/inc/tools/appendunixshellword.hxx
@@ -41,7 +41,7 @@ namespace tools {
the text to add
*/
TOOLS_DLLPUBLIC void appendUnixShellWord(
- rtl::OStringBuffer * accumulator, rtl::OString const & text);
+ OStringBuffer * accumulator, OString const & text);
}
#endif
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index ffbc542cd172..d3a2c2f2cff5 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.hxx
@@ -66,7 +66,7 @@ public:
BigInt( sal_uInt16 nVal );
BigInt( sal_uInt32 nVal );
BigInt( const BigInt& rBigInt );
- BigInt( const rtl::OUString& rString );
+ BigInt( const OUString& rString );
#ifdef _TLBIGINT_INT64
BigInt( const SbxINT64 &r );
BigInt( const SbxUINT64 &r );
@@ -80,7 +80,7 @@ public:
operator sal_uIntPtr() const;
void Set( sal_Bool bSet ) { bIsSet = bSet; }
- rtl::OUString GetString() const;
+ OUString GetString() const;
sal_Bool IsSet() const { return bIsSet; }
sal_Bool IsNeg() const;
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index 5c64f49b3d46..1e73d32b5a33 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -28,8 +28,8 @@ struct ImplGroupData;
class TOOLS_DLLPUBLIC Config
{
private:
- rtl::OUString maFileName;
- rtl::OString maGroupName;
+ OUString maFileName;
+ OString maGroupName;
ImplConfigData* mpData;
ImplGroupData* mpActGroup;
sal_uIntPtr mnDataUpdateId;
@@ -43,25 +43,25 @@ private:
#endif
public:
- Config( const rtl::OUString& rFileName );
+ Config( const OUString& rFileName );
~Config();
- const rtl::OUString& GetPathName() const { return maFileName; }
+ const OUString& GetPathName() const { return maFileName; }
- void SetGroup(const rtl::OString& rGroup);
- const rtl::OString& GetGroup() const { return maGroupName; }
- void DeleteGroup(const rtl::OString& rGroup);
- rtl::OString GetGroupName(sal_uInt16 nGroup) const;
+ void SetGroup(const OString& rGroup);
+ const OString& GetGroup() const { return maGroupName; }
+ void DeleteGroup(const OString& rGroup);
+ OString GetGroupName(sal_uInt16 nGroup) const;
sal_uInt16 GetGroupCount() const;
- sal_Bool HasGroup(const rtl::OString& rGroup) const;
+ sal_Bool HasGroup(const OString& rGroup) const;
- rtl::OString ReadKey(const rtl::OString& rKey) const;
- rtl::OUString ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const;
- rtl::OString ReadKey(const rtl::OString& rKey, const rtl::OString& rDefault) const;
- void WriteKey(const rtl::OString& rKey, const rtl::OString& rValue);
- void DeleteKey(const rtl::OString& rKey);
- rtl::OString GetKeyName(sal_uInt16 nKey) const;
- rtl::OString ReadKey(sal_uInt16 nKey) const;
+ OString ReadKey(const OString& rKey) const;
+ OUString ReadKey(const OString& rKey, rtl_TextEncoding eEncoding) const;
+ OString ReadKey(const OString& rKey, const OString& rDefault) const;
+ void WriteKey(const OString& rKey, const OString& rValue);
+ void DeleteKey(const OString& rKey);
+ OString GetKeyName(sal_uInt16 nKey) const;
+ OString ReadKey(sal_uInt16 nKey) const;
sal_uInt16 GetKeyCount() const;
sal_Bool IsLocked() const { return (mnLockCount != 0); }
diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index 84afc7bf3fe6..261c0aecaf6d 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -46,17 +46,17 @@
*/
#define DBG_UNHANDLED_EXCEPTION() \
::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); \
- ::rtl::OString sMessage( "caught an exception!" ); \
+ OString sMessage( "caught an exception!" ); \
sMessage += "\nin function:"; \
sMessage += BOOST_CURRENT_FUNCTION; \
sMessage += "\ntype: "; \
- sMessage += ::rtl::OUStringToOString( caught.getValueTypeName(), osl_getThreadTextEncoding() ); \
+ sMessage += OUStringToOString( caught.getValueTypeName(), osl_getThreadTextEncoding() ); \
::com::sun::star::uno::Exception exception; \
caught >>= exception; \
if ( !exception.Message.isEmpty() ) \
{ \
sMessage += "\nmessage: "; \
- sMessage += ::rtl::OUStringToOString( exception.Message, osl_getThreadTextEncoding() ); \
+ sMessage += OUStringToOString( exception.Message, osl_getThreadTextEncoding() ); \
} \
if ( exception.Context.is() ) \
{ \
@@ -70,7 +70,7 @@
if ( caught >>= specialized ) \
{ \
sMessage += "\ndetails: "; \
- sMessage += ::rtl::OUStringToOString( \
+ sMessage += OUStringToOString( \
specialized.Details, osl_getThreadTextEncoding() ); \
} \
} \
@@ -79,7 +79,7 @@
if ( caught >>= specialized ) \
{ \
sMessage += "\ndetails: "; \
- sMessage += ::rtl::OString::valueOf( specialized.ErrCode ); \
+ sMessage += OString::valueOf( specialized.ErrCode ); \
} \
} \
sMessage += "\n"; \
diff --git a/tools/inc/tools/getprocessworkingdir.hxx b/tools/inc/tools/getprocessworkingdir.hxx
index 16eedfe1b8cd..af529b8edda2 100644
--- a/tools/inc/tools/getprocessworkingdir.hxx
+++ b/tools/inc/tools/getprocessworkingdir.hxx
@@ -32,7 +32,7 @@ namespace tools {
// @param rUrl
// Receives the directory URL (with or without a final slash) upon successful
// return, and the empty string upon unsuccessful return
-TOOLS_DLLPUBLIC bool getProcessWorkingDir(rtl::OUString& rUrl);
+TOOLS_DLLPUBLIC bool getProcessWorkingDir(OUString& rUrl);
}
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 53f097f60c6e..ad04f9e12445 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -488,7 +488,7 @@ public:
static void writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
- const rtl::OUString& rBody,
+ const OUString& rBody,
rtl_TextEncoding ePreferredEncoding,
bool bInitialSpace = true);
@@ -497,8 +497,8 @@ public:
rtl_TextEncoding eEncoding,
sal_uInt32 & rCharacter);
- static rtl::OUString decodeHeaderFieldBody(HeaderFieldType eType,
- const rtl::OString& rBody);
+ static OUString decodeHeaderFieldBody(HeaderFieldType eType,
+ const OString& rBody);
// #i70651#: Prevent warnings on Mac OS X.
#ifdef MACOSX
@@ -926,13 +926,13 @@ public:
/** Write a sequence of octets.
- @param rOctets A rtl::OString, interpreted as a sequence of octets.
+ @param rOctets A OString, interpreted as a sequence of octets.
@param nBegin The offset of the first character to write.
@param nEnd The offset past the last character to write.
*/
- void write(const rtl::OString& rOctets, xub_StrLen nBegin,
+ void write(const OString& rOctets, xub_StrLen nBegin,
xub_StrLen nEnd)
{
writeSequence(rOctets.getStr() + nBegin, rOctets.getStr() + nEnd);
@@ -959,11 +959,11 @@ public:
/** Write a sequence of octets.
- @param rOctets A rtl::OString, interpreted as a sequence of octets.
+ @param rOctets A OString, interpreted as a sequence of octets.
@return This instance.
*/
- INetMIMEOutputSink & operator <<(const rtl::OString& rOctets)
+ INetMIMEOutputSink & operator <<(const OString& rOctets)
{
writeSequence(rOctets.getStr(), rOctets.getStr() + rOctets.getLength());
m_nColumn += rOctets.getLength();
@@ -1047,7 +1047,7 @@ inline void INetMIME::writeEscapeSequence(INetMIMEOutputSink & rSink,
class INetMIMEStringOutputSink: public INetMIMEOutputSink
{
- rtl::OStringBuffer m_aBuffer;
+ OStringBuffer m_aBuffer;
using INetMIMEOutputSink::writeSequence;
@@ -1062,7 +1062,7 @@ public:
virtual ErrCode getError() const;
- rtl::OString takeBuffer()
+ OString takeBuffer()
{
return m_aBuffer.makeStringAndClear();
}
@@ -1178,17 +1178,17 @@ struct INetContentTypeParameter
will only be one item for the complete parameter, with the attribute
name lacking any section suffix.
*/
- const rtl::OString m_sAttribute;
+ const OString m_sAttribute;
/** The optional character set specification (see RFC 2231), in US-ASCII
encoding and converted to lower case.
*/
- const rtl::OString m_sCharset;
+ const OString m_sCharset;
/** The optional language specification (see RFC 2231), in US-ASCII
encoding and converted to lower case.
*/
- const rtl::OString m_sLanguage;
+ const OString m_sLanguage;
/** The attribute value. If the value is a quoted-string, it is
'unpacked.' If a character set is specified, and the value can be
@@ -1207,7 +1207,7 @@ struct INetContentTypeParameter
within Unicode's Private Use Area (effectively adding 0xF800 to the
character's numeric value).
*/
- const rtl::OUString m_sValue;
+ const OUString m_sValue;
/** This is true if the value is successfuly converted to Unicode, and
false if the value is a special mixture of ISO-LATIN-1 characters and
@@ -1215,9 +1215,9 @@ struct INetContentTypeParameter
*/
const bool m_bConverted;
- INetContentTypeParameter(const rtl::OString& rTheAttribute,
- const rtl::OString& rTheCharset, const rtl::OString& rTheLanguage,
- const rtl::OUString& rTheValue, bool bTheConverted)
+ INetContentTypeParameter(const OString& rTheAttribute,
+ const OString& rTheCharset, const OString& rTheLanguage,
+ const OUString& rTheValue, bool bTheConverted)
: m_sAttribute(rTheAttribute)
, m_sCharset(rTheCharset)
, m_sLanguage(rTheLanguage)
@@ -1248,7 +1248,7 @@ public:
return &(maEntries[nIndex]);
}
- const INetContentTypeParameter * find(const rtl::OString& rAttribute) const;
+ const INetContentTypeParameter * find(const OString& rAttribute) const;
private:
diff --git a/tools/inc/tools/lineend.hxx b/tools/inc/tools/lineend.hxx
index b9ee807ffa30..d4c75af92049 100644
--- a/tools/inc/tools/lineend.hxx
+++ b/tools/inc/tools/lineend.hxx
@@ -45,8 +45,8 @@ inline LineEnd GetSystemLineEnd()
#endif
}
-TOOLS_DLLPUBLIC rtl::OString convertLineEnd(const rtl::OString &rIn, LineEnd eLineEnd);
-TOOLS_DLLPUBLIC rtl::OUString convertLineEnd(const rtl::OUString &rIn, LineEnd eLineEnd);
+TOOLS_DLLPUBLIC OString convertLineEnd(const OString &rIn, LineEnd eLineEnd);
+TOOLS_DLLPUBLIC OUString convertLineEnd(const OUString &rIn, LineEnd eLineEnd);
#endif
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index b0ae1e3fcdac..678fc94a998a 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -104,7 +104,7 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator
sal_Int32 mnOffset;
bool mbValidInput;
- bool setRange( const rtl::OUString& i_rNewRange, bool i_bStrict = false );
+ bool setRange( const OUString& i_rNewRange, bool i_bStrict = false );
bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence, bool bMayAdjust );
bool insertJoinedRanges( const std::vector< sal_Int32 >& rNumbers, bool i_bStrict );
bool checkValue( sal_Int32, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
@@ -135,7 +135,7 @@ public:
friend class StringRangeEnumerator::Iterator;
- StringRangeEnumerator( const rtl::OUString& i_rInput,
+ StringRangeEnumerator( const OUString& i_rInput,
sal_Int32 i_nMinNumber,
sal_Int32 i_nMaxNumber,
sal_Int32 i_nLogicalOffset = -1
@@ -172,7 +172,7 @@ public:
- single number that doesn't fit in [i_nMinNumber,i_nMaxNumber] will be ignored
- range that doesn't fit in [i_nMinNumber,i_nMaxNumber] will be adjusted
*/
- static bool getRangesFromString( const rtl::OUString& i_rPageRange,
+ static bool getRangesFromString( const OUString& i_rPageRange,
std::vector< sal_Int32 >& o_rPageVector,
sal_Int32 i_nMinNumber,
sal_Int32 i_nMaxNumber,
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index 8ee386474214..a043db47d4d5 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -69,10 +69,10 @@ protected:
sal_Int16 ReadShortRes()
{ return m_pResMgr->ReadShort(); }
// read a string from resource data and increment pointer
- rtl::OUString ReadStringRes()
+ OUString ReadStringRes()
{ return m_pResMgr->ReadString(); }
// read a byte string from resource data and increment pointer
- rtl::OString ReadByteStringRes()
+ OString ReadByteStringRes()
{ return m_pResMgr->ReadByteString(); }
// free the resource from m_pResMgr's stack (pass this ptr for validation)
diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx
index df40eb9df236..515dd779120b 100644
--- a/tools/inc/tools/resary.hxx
+++ b/tools/inc/tools/resary.hxx
@@ -32,10 +32,10 @@ class TOOLS_DLLPUBLIC ResStringArray : private boost::noncopyable
private:
struct ImplResStringItem
{
- rtl::OUString m_aStr;
+ OUString m_aStr;
long m_nValue;
- ImplResStringItem( const rtl::OUString& rStr, long nValue = 0 ) :
+ ImplResStringItem( const OUString& rStr, long nValue = 0 ) :
m_aStr( rStr ),
m_nValue( nValue )
{}
@@ -47,8 +47,8 @@ public:
ResStringArray( const ResId& rResId );
~ResStringArray();
- const rtl::OUString GetString( sal_uInt32 nIndex ) const
- { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_aStr : rtl::OUString(); }
+ const OUString GetString( sal_uInt32 nIndex ) const
+ { return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_aStr : OUString(); }
long GetValue( sal_uInt32 nIndex ) const
{ return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].m_nValue : -1; }
sal_uInt32 Count() const { return sal_uInt32(m_aStrings.size()); }
diff --git a/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx
index 1319bfed523e..14c0a11915f7 100644
--- a/tools/inc/tools/resid.hxx
+++ b/tools/inc/tools/resid.hxx
@@ -147,8 +147,8 @@ public:
sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; }
RSHEADER_TYPE* GetpResource() const { return m_pResource; }
- TOOLS_DLLPUBLIC rtl::OUString toString() const;
- TOOLS_DLLPUBLIC operator rtl::OUString() const { return toString(); }
+ TOOLS_DLLPUBLIC OUString toString() const;
+ TOOLS_DLLPUBLIC operator OUString() const { return toString(); }
};
#endif
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index 3b500b9163ed..603a2c7a2eb5 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -45,7 +45,7 @@ public:
inline sal_uInt32 GetLocalOff(); ///< Local offset
};
-typedef rtl::OUString (*ResHookProc)( const rtl::OUString& rStr );
+typedef OUString (*ResHookProc)( const OUString& rStr );
// Initialization
#define RC_NOTYPE 0x00
@@ -92,7 +92,7 @@ private:
{
return (((int)nOff >= nCurStack) ? NULL : &aStack[nCurStack-nOff]);
}
- TOOLS_DLLPRIVATE void Init( const rtl::OUString& rFileName );
+ TOOLS_DLLPRIVATE void Init( const OUString& rFileName );
TOOLS_DLLPRIVATE ResMgr( InternalResMgr * pImp );
@@ -162,7 +162,7 @@ public:
/// Return a string and its length out of the resource
static sal_uInt32 GetString( OUString& rStr, const sal_uInt8* pStr );
/// Return a byte string and its length out of the resource
- static sal_uInt32 GetByteString( rtl::OString& rStr, const sal_uInt8* pStr );
+ static sal_uInt32 GetByteString( OString& rStr, const sal_uInt8* pStr );
/// Return the size of a string in the resource
static sal_uInt32 GetStringSize( sal_uInt32 nLen )
@@ -183,15 +183,15 @@ public:
sal_uInt32 GetRemainSize();
- const rtl::OUString& GetFileName() const;
+ const OUString& GetFileName() const;
sal_Int16 ReadShort();
sal_Int32 ReadLong();
OUString ReadString();
- rtl::OString ReadByteString();
+ OString ReadByteString();
/// Generate auto help ID for current resource stack
- rtl::OString GetAutoHelpId();
+ OString GetAutoHelpId();
static void SetReadStringHook( ResHookProc pProc );
static ResHookProc GetReadStringHook();
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index 78021bf92dcc..667454c6150c 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -64,7 +64,7 @@ public:
an existent string
@seealso IsAvailable
*/
- rtl::OUString ReadString( sal_uInt32 nId );
+ OUString ReadString( sal_uInt32 nId );
/** checks whether a certain resource is availble
@param _resourceType
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index bad7f6fe0421..78a0bc3df96f 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -234,7 +234,7 @@ private:
CharSet eStreamCharSet;
// Encryption
- rtl::OString m_aCryptMaskKey;// aCryptMaskKey.getLength != 0 -> Encryption used
+ OString m_aCryptMaskKey;// aCryptMaskKey.getLength != 0 -> Encryption used
unsigned char nCryptMask;
// Userdata
@@ -291,8 +291,8 @@ public:
{ nCompressMode = nNewMode; }
sal_uInt16 GetCompressMode() const { return nCompressMode; }
- void SetCryptMaskKey(const rtl::OString& rCryptMaskKey);
- const rtl::OString& GetCryptMaskKey() const { return m_aCryptMaskKey; }
+ void SetCryptMaskKey(const OString& rCryptMaskKey);
+ const OString& GetCryptMaskKey() const { return m_aCryptMaskKey; }
void SetStreamCharSet( CharSet eCharSet )
{ eStreamCharSet = eCharSet; }
@@ -363,8 +363,8 @@ public:
@endcode
causing endless loops ...
*/
- sal_Bool ReadLine( rtl::OString& rStr, sal_Int32 nMaxBytesToRead = 0xFFFE );
- sal_Bool WriteLine( const rtl::OString& rStr );
+ sal_Bool ReadLine( OString& rStr, sal_Int32 nMaxBytesToRead = 0xFFFE );
+ sal_Bool WriteLine( const OString& rStr );
/** Read a line of bytes.
@@ -380,7 +380,7 @@ public:
@endcode
causing endless loops ...
*/
- sal_Bool ReadByteStringLine( rtl::OUString& rStr, rtl_TextEncoding eSrcCharSet,
+ sal_Bool ReadByteStringLine( OUString& rStr, rtl_TextEncoding eSrcCharSet,
sal_Int32 nMaxBytesToRead = 0xFFFE );
sal_Bool ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet );
sal_Bool WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
@@ -413,15 +413,15 @@ public:
@endcode
causing endless loops ...
*/
- sal_Bool ReadUniStringLine( rtl::OUString& rStr, sal_Int32 nMaxCodepointsToRead = 0xFFFE );
+ sal_Bool ReadUniStringLine( OUString& rStr, sal_Int32 nMaxCodepointsToRead = 0xFFFE );
/** Read a 32bit length prefixed sequence of utf-16 if
eSrcCharSet==RTL_TEXTENCODING_UNICODE, otherwise read a 16bit length
prefixed sequence of bytes and convert from eSrcCharSet */
- rtl::OUString ReadUniOrByteString(rtl_TextEncoding eSrcCharSet);
+ OUString ReadUniOrByteString(rtl_TextEncoding eSrcCharSet);
/** Write a 32bit length prefixed sequence of utf-16 if
eSrcCharSet==RTL_TEXTENCODING_UNICODE, otherwise convert to eSrcCharSet
and write a 16bit length prefixed sequence of bytes */
- SvStream& WriteUniOrByteString( const rtl::OUString& rStr, rtl_TextEncoding eDestCharSet );
+ SvStream& WriteUniOrByteString( const OUString& rStr, rtl_TextEncoding eDestCharSet );
/** Read a line of Unicode if eSrcCharSet==RTL_TEXTENCODING_UNICODE,
otherwise read a line of Bytecode and convert from eSrcCharSet
@@ -438,7 +438,7 @@ public:
@endcode
causing endless loops ...
*/
- sal_Bool ReadUniOrByteStringLine( rtl::OUString& rStr, rtl_TextEncoding eSrcCharSet,
+ sal_Bool ReadUniOrByteStringLine( OUString& rStr, rtl_TextEncoding eSrcCharSet,
sal_Int32 nMaxCodepointsToRead = 0xFFFE );
/** Write a sequence of Unicode characters if
eDestCharSet==RTL_TEXTENCODING_UNICODE, otherwise write a sequence of
@@ -514,28 +514,28 @@ TOOLS_DLLPUBLIC SvStream& endlu( SvStream& rStr );
/// call endlu() if eStreamCharSet==RTL_TEXTECODING_UNICODE otherwise endl()
TOOLS_DLLPUBLIC SvStream& endlub( SvStream& rStr );
-/// Attempt to read nUnits 8bit units to an OString, returned rtl::OString's
+/// Attempt to read nUnits 8bit units to an OString, returned OString's
/// length is number of units successfully read
-TOOLS_DLLPUBLIC rtl::OString read_uInt8s_ToOString(SvStream& rStrm,
+TOOLS_DLLPUBLIC OString read_uInt8s_ToOString(SvStream& rStrm,
sal_Size nUnits);
/// Attempt to read nUnits 8bit units to an OUString
-TOOLS_DLLPUBLIC inline rtl::OUString read_uInt8s_ToOUString(SvStream& rStrm,
+TOOLS_DLLPUBLIC inline OUString read_uInt8s_ToOUString(SvStream& rStrm,
sal_Size nUnits, rtl_TextEncoding eEnc)
{
- return rtl::OStringToOUString(read_uInt8s_ToOString(rStrm, nUnits), eEnc);
+ return OStringToOUString(read_uInt8s_ToOString(rStrm, nUnits), eEnc);
}
/// Attempt to read nUnits 16bit units to an OUString, returned
-/// rtl::OUString's length is number of units successfully read
-TOOLS_DLLPUBLIC rtl::OUString read_uInt16s_ToOUString(SvStream& rStrm,
+/// OUString's length is number of units successfully read
+TOOLS_DLLPUBLIC OUString read_uInt16s_ToOUString(SvStream& rStrm,
sal_Size nUnits);
/// Attempt to read a pascal-style length (of type prefix) prefixed sequence of
-/// 16bit units to an OUString, returned rtl::OString's length is number of
+/// 16bit units to an OUString, returned OString's length is number of
/// units successfully read.
template<typename prefix>
-rtl::OUString read_lenPrefixed_uInt16s_ToOUString(SvStream& rStrm)
+OUString read_lenPrefixed_uInt16s_ToOUString(SvStream& rStrm)
{
prefix nUnits = 0;
rStrm >> nUnits;
@@ -545,10 +545,10 @@ rtl::OUString read_lenPrefixed_uInt16s_ToOUString(SvStream& rStrm)
/// Attempt to write a prefixed sequence of nUnits 16bit units from an OUString,
/// returned value is number of bytes written
TOOLS_DLLPUBLIC sal_Size write_uInt16s_FromOUString(SvStream& rStrm,
- const rtl::OUString& rStr, sal_Size nUnits);
+ const OUString& rStr, sal_Size nUnits);
TOOLS_DLLPUBLIC inline sal_Size write_uInt16s_FromOUString(SvStream& rStrm,
- const rtl::OUString& rStr)
+ const OUString& rStr)
{
return write_uInt16s_FromOUString(rStrm, rStr, rStr.getLength());
}
@@ -580,27 +580,27 @@ namespace streamdetail
/// of 16bit units from an OUString, returned value is number of bytes written
/// (including byte-count of prefix)
template<typename prefix> sal_Size write_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm,
- const rtl::OUString &rStr)
+ const OUString &rStr)
{
- return streamdetail::write_lenPrefixed_seq_From_str<prefix, rtl::OUString, write_uInt16s_FromOUString>(rStrm, rStr);
+ return streamdetail::write_lenPrefixed_seq_From_str<prefix, OUString, write_uInt16s_FromOUString>(rStrm, rStr);
}
/// Attempt to read 8bit units to an OString until a zero terminator is
-/// encountered, returned rtl::OString's length is number of units *definitely*
+/// encountered, returned OString's length is number of units *definitely*
/// successfully read, check SvStream::good() to see if null terminator was
/// successfully read
-TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm);
+TOOLS_DLLPUBLIC OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm);
/// Attempt to read 8bit units assuming source encoding eEnc to an OUString
/// until a zero terminator is encountered. Check SvStream::good() to see if
/// null terminator was successfully read
-TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc);
+TOOLS_DLLPUBLIC OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc);
/// Attempt to read a pascal-style length (of type prefix) prefixed sequence of
-/// 8bit units to an OString, returned rtl::OString's length is number of units
+/// 8bit units to an OString, returned OString's length is number of units
/// successfully read.
template<typename prefix>
-rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm)
+OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm)
{
prefix nUnits = 0;
rStrm >> nUnits;
@@ -610,21 +610,21 @@ rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm)
/// Attempt to read a pascal-style length (of type prefix) prefixed sequence of
/// 8bit units to an OUString
template<typename prefix>
-rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm,
+OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm,
rtl_TextEncoding eEnc)
{
- return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString<prefix>(rStrm), eEnc);
+ return OStringToOUString(read_lenPrefixed_uInt8s_ToOString<prefix>(rStrm), eEnc);
}
/// Attempt to write a prefixed sequence of nUnits 8bit units from an OString,
/// returned value is number of bytes written
-TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const rtl::OString& rStr,
+TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr,
sal_Size nUnits)
{
return rStrm.Write(rStr.getStr(), nUnits);
}
-TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const rtl::OString& rStr)
+TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr)
{
return write_uInt8s_FromOString(rStrm, rStr, rStr.getLength());
}
@@ -633,18 +633,18 @@ TOOLS_DLLPUBLIC inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const
/// of 8bit units from an OString, returned value is number of bytes written
/// (including byte-count of prefix)
template<typename prefix> sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm,
- const rtl::OString &rStr)
+ const OString &rStr)
{
- return streamdetail::write_lenPrefixed_seq_From_str<prefix, rtl::OString, write_uInt8s_FromOString>(rStrm, rStr);
+ return streamdetail::write_lenPrefixed_seq_From_str<prefix, OString, write_uInt8s_FromOString>(rStrm, rStr);
}
/// Attempt to write a pascal-style length (of type prefix) prefixed sequence
/// of 8bit units from an OUString, returned value is number of bytes written
/// (including byte-count of prefix)
template<typename prefix> sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm,
- const rtl::OUString &rStr, rtl_TextEncoding eEnc)
+ const OUString &rStr, rtl_TextEncoding eEnc)
{
- return write_lenPrefixed_uInt8s_FromOString<prefix>(rStrm, rtl::OUStringToOString(rStr, eEnc));
+ return write_lenPrefixed_uInt8s_FromOString<prefix>(rStrm, OUStringToOString(rStr, eEnc));
}
// FileStream
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 1c73fe4fb230..5efcd3e3d933 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -121,12 +121,12 @@ private:
TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 );
//detect and reject wrong way to attempt to create a UniString from a substring of
- //a rtl::OString
- TOOLS_DLLPRIVATE UniString(const rtl::OString& rByteStr, xub_StrLen nPos, xub_StrLen nLen,
+ //a OString
+ TOOLS_DLLPRIVATE UniString(const OString& rByteStr, xub_StrLen nPos, xub_StrLen nLen,
sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS);
//no longer implemented
- TOOLS_DLLPRIVATE UniString( const rtl::OString& rByteStr,
+ TOOLS_DLLPRIVATE UniString( const OString& rByteStr,
rtl_TextEncoding eTextEncoding,
sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr );
@@ -139,7 +139,7 @@ public:
UniString( const ResId& rResId );
UniString( const UniString& rStr );
UniString( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen );
- UniString( const rtl::OUString& rStr );
+ UniString( const OUString& rStr );
UniString(char c); // ...but allow "UniString('a')"
UniString( const sal_Char* pByteStr,
rtl_TextEncoding eTextEncoding,
@@ -149,19 +149,19 @@ public:
sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
~UniString();
- operator rtl::OUString () const
+ operator OUString () const
{
- return rtl::OUString( rtl_uStringBuffer_refReturn(
+ return OUString( rtl_uStringBuffer_refReturn(
reinterpret_cast<rtl_uString*>(mpData)), SAL_NO_ACQUIRE );
}
#ifdef RTL_FAST_STRING
template< typename T1, typename T2 >
UniString( const rtl::OUStringConcat< T1, T2 >& concat )
- : mpData(NULL) { Assign( rtl::OUString( concat )); }
+ : mpData(NULL) { Assign( OUString( concat )); }
template< typename T1, typename T2 >
UniString& operator =( const rtl::OUStringConcat< T1, T2 >& concat )
- { return Assign( rtl::OUString( concat )); }
+ { return Assign( OUString( concat )); }
template< typename T1, typename T2 >
UniString& operator +=( const rtl::OUStringConcat< T1, T2 >& concat )
{ return Append( UniString( concat ) ); }
@@ -172,7 +172,7 @@ public:
sal_Int64 ToInt64() const;
UniString& Assign( const UniString& rStr );
- UniString& Assign( const rtl::OUString& rStr );
+ UniString& Assign( const OUString& rStr );
UniString& Assign( const sal_Unicode* pCharStr );
UniString& Assign( sal_Unicode c );
inline UniString & Assign(char c) // ...but allow "Assign('a')"
@@ -181,7 +181,7 @@ public:
UniString& AssignAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
UniString& operator =( const UniString& rStr )
{ return Assign( rStr ); }
- UniString& operator =( const rtl::OUString& rStr )
+ UniString& operator =( const OUString& rStr )
{ return Assign( rStr ); }
UniString& operator =( const sal_Unicode* pCharStr )
{ return Assign( pCharStr ); }
@@ -200,7 +200,7 @@ public:
UniString& AppendAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
UniString& operator +=( const UniString& rStr )
{ return Append( rStr ); }
- UniString& operator +=( const rtl::OUString& rStr )
+ UniString& operator +=( const OUString& rStr )
{ return Append( UniString(rStr) ); }
UniString& operator +=( const sal_Unicode* pCharStr )
{ return Append( pCharStr ); }
@@ -312,7 +312,7 @@ operator <<(
std::basic_ostream<charT, traits> & stream, UniString const & string)
{
return stream <<
- rtl::OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr();
+ OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr();
// best effort; potentially loses data due to conversion failures
// (stray surrogate halves) and embedded null characters
}
@@ -334,24 +334,24 @@ struct ToStringHelper< UniString >
// some compare operators, so that conversions from String to OUString don't
// have to insert conversions all over the place
-inline bool operator==(UniString const& rLeft, ::rtl::OUString const& rRight)
+inline bool operator==(UniString const& rLeft, OUString const& rRight)
{
- return ::rtl::OUString(rLeft) == rRight;
+ return OUString(rLeft) == rRight;
}
-inline bool operator==(::rtl::OUString const& rLeft, UniString const& rRight)
+inline bool operator==(OUString const& rLeft, UniString const& rRight)
{
- return rLeft == ::rtl::OUString(rRight);
+ return rLeft == OUString(rRight);
}
-inline bool operator!=(UniString const& rLeft, ::rtl::OUString const& rRight)
+inline bool operator!=(UniString const& rLeft, OUString const& rRight)
{
- return ::rtl::OUString(rLeft) != rRight;
+ return OUString(rLeft) != rRight;
}
-inline bool operator!=(::rtl::OUString const& rLeft, UniString const& rRight)
+inline bool operator!=(OUString const& rLeft, UniString const& rRight)
{
- return rLeft != ::rtl::OUString(rRight);
+ return rLeft != OUString(rRight);
}
#ifdef RTL_FAST_STRING
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 2f4319968042..fef9f469c359 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -113,9 +113,9 @@ public:
/** The way input strings that represent (parts of) URIs are interpreted
in set-methods.
- @descr Most set-methods accept either a rtl::OString or a rtl::OUString
- as input. Using a rtl::OString, octets in the range 0x80--0xFF are
- replaced by single escape sequences. Using a rtl::OUString , UTF-32
+ @descr Most set-methods accept either a OString or a OUString
+ as input. Using a OString, octets in the range 0x80--0xFF are
+ replaced by single escape sequences. Using a OUString , UTF-32
characters in the range 0x80--0x10FFFF are replaced by sequences of
escape sequences, representing the UTF-8 coded characters.
@@ -191,20 +191,20 @@ public:
inline bool HasError() const { return m_eScheme == INET_PROT_NOT_VALID; }
- inline rtl::OUString GetMainURL(DecodeMechanism eMechanism,
+ inline OUString GetMainURL(DecodeMechanism eMechanism,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aAbsURIRef, getEscapePrefix(), eMechanism, eCharset); }
- rtl::OUString GetURLNoPass(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ OUString GetURLNoPass(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
const;
- rtl::OUString GetURLNoMark(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ OUString GetURLNoMark(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
const;
- rtl::OUString
+ OUString
getAbbreviated(com::sun::star::uno::Reference<
com::sun::star::util::XStringWidth > const &
rStringWidth,
@@ -225,26 +225,26 @@ public:
// Strict Parsing:
- inline INetURLObject(const rtl::OString& rTheAbsURIRef,
+ inline INetURLObject(const OString& rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline INetURLObject(rtl::OUString const & rTheAbsURIRef,
+ inline INetURLObject(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline bool SetURL(const rtl::OString& rTheAbsURIRef,
+ inline bool SetURL(const OString& rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline bool SetURL(rtl::OUString const & rTheAbsURIRef,
+ inline bool SetURL(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- bool ConcatData(INetProtocol eTheScheme, rtl::OUString const & rTheUser,
- rtl::OUString const & rThePassword,
- rtl::OUString const & rTheHost, sal_uInt32 nThePort,
- rtl::OUString const & rThePath,
+ bool ConcatData(INetProtocol eTheScheme, OUString const & rTheUser,
+ OUString const & rThePassword,
+ OUString const & rTheHost, sal_uInt32 nThePort,
+ OUString const & rThePath,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
@@ -347,7 +347,7 @@ public:
FSYS_DETECT = FSYS_VOS | FSYS_UNX | FSYS_DOS
};
- inline INetURLObject(rtl::OUString const & rTheAbsURIRef,
+ inline INetURLObject(OUString const & rTheAbsURIRef,
INetProtocol eTheSmartScheme,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
@@ -357,19 +357,19 @@ public:
{ m_eSmartScheme = eTheSmartScheme; }
inline bool
- SetSmartURL(const rtl::OString& rTheAbsURIRef,
+ SetSmartURL(const OString& rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
FSysStyle eStyle = FSYS_DETECT);
inline bool
- SetSmartURL(rtl::OUString const & rTheAbsURIRef,
+ SetSmartURL(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
FSysStyle eStyle = FSYS_DETECT);
inline INetURLObject
- smartRel2Abs(const rtl::OString& rTheRelURIRef,
+ smartRel2Abs(const OString& rTheRelURIRef,
bool & rWasAbsolute,
bool bIgnoreFragment = false,
EncodeMechanism eMechanism = WAS_ENCODED,
@@ -378,7 +378,7 @@ public:
FSysStyle eStyle = FSYS_DETECT) const;
inline INetURLObject
- smartRel2Abs(rtl::OUString const & rTheRelURIRef,
+ smartRel2Abs(OUString const & rTheRelURIRef,
bool & rWasAbsolute,
bool bIgnoreFragment = false,
EncodeMechanism eMechanism = WAS_ENCODED,
@@ -389,7 +389,7 @@ public:
// Relative URLs:
inline bool
- GetNewAbsURL(const rtl::OString& rTheRelURIRef,
+ GetNewAbsURL(const OString& rTheRelURIRef,
INetURLObject * pTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
@@ -397,7 +397,7 @@ public:
const;
inline bool
- GetNewAbsURL(rtl::OUString const & rTheRelURIRef,
+ GetNewAbsURL(OUString const & rTheRelURIRef,
INetURLObject * pTheAbsURIRef,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
@@ -411,26 +411,26 @@ public:
then rTheRelURIRef is returned unmodified; otherwise, an empty string
is returned.
*/
- static rtl::OUString
- GetAbsURL(rtl::OUString const & rTheBaseURIRef,
- rtl::OUString const & rTheRelURIRef,
+ static OUString
+ GetAbsURL(OUString const & rTheBaseURIRef,
+ OUString const & rTheRelURIRef,
bool bIgnoreFragment = false,
EncodeMechanism eEncodeMechanism = WAS_ENCODED,
DecodeMechanism eDecodeMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
FSysStyle eStyle = FSYS_DETECT);
- static inline rtl::OUString
- GetRelURL(const rtl::OString& rTheBaseURIRef,
- const rtl::OString& rTheAbsURIRef,
+ static inline OUString
+ GetRelURL(const OString& rTheBaseURIRef,
+ const OString& rTheAbsURIRef,
EncodeMechanism eEncodeMechanism = WAS_ENCODED,
DecodeMechanism eDecodeMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
FSysStyle eStyle = FSYS_DETECT);
- static inline rtl::OUString
- GetRelURL(rtl::OUString const & rTheBaseURIRef,
- rtl::OUString const & rTheAbsURIRef,
+ static inline OUString
+ GetRelURL(OUString const & rTheBaseURIRef,
+ OUString const & rTheAbsURIRef,
EncodeMechanism eEncodeMechanism = WAS_ENCODED,
DecodeMechanism eDecodeMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
@@ -438,33 +438,33 @@ public:
// External URLs:
- rtl::OUString getExternalURL(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ OUString getExternalURL(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const;
- static inline bool translateToExternal(const rtl::OString& rTheIntURIRef,
- rtl::OUString & rTheExtURIRef,
+ static inline bool translateToExternal(const OString& rTheIntURIRef,
+ OUString & rTheExtURIRef,
DecodeMechanism eDecodeMechanism
= DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8);
- static inline bool translateToExternal(rtl::OUString const & rTheIntURIRef,
- rtl::OUString & rTheExtURIRef,
+ static inline bool translateToExternal(OUString const & rTheIntURIRef,
+ OUString & rTheExtURIRef,
DecodeMechanism eDecodeMechanism
= DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8);
- static inline bool translateToInternal(const rtl::OString& rTheExtURIRef,
- rtl::OUString & rTheIntURIRef,
+ static inline bool translateToInternal(const OString& rTheExtURIRef,
+ OUString & rTheIntURIRef,
DecodeMechanism eDecodeMechanism
= DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8);
- static inline bool translateToInternal(rtl::OUString const & rTheExtURIRef,
- rtl::OUString & rTheIntURIRef,
+ static inline bool translateToInternal(OUString const & rTheExtURIRef,
+ OUString & rTheIntURIRef,
DecodeMechanism eDecodeMechanism
= DECODE_TO_IURI,
rtl_TextEncoding eCharset
@@ -482,13 +482,13 @@ public:
@return The 'prefix' of URLs of the given scheme.
*/
- static rtl::OUString GetScheme(INetProtocol eTheScheme);
+ static OUString GetScheme(INetProtocol eTheScheme);
- static inline INetProtocol CompareProtocolScheme(const rtl::OString&
+ static inline INetProtocol CompareProtocolScheme(const OString&
rTheAbsURIRef)
{ return CompareProtocolScheme(extend(rTheAbsURIRef)); }
- static INetProtocol CompareProtocolScheme(rtl::OUString const &
+ static INetProtocol CompareProtocolScheme(OUString const &
rTheAbsURIRef);
// User Info:
@@ -498,42 +498,42 @@ public:
inline bool IsEmptyUser() const
{ return m_aUser.isPresent() && m_aUser.isEmpty(); }
- inline rtl::OUString GetUser(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ inline OUString GetUser(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aUser, getEscapePrefix(), eMechanism, eCharset); }
- inline rtl::OUString GetPass(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ inline OUString GetPass(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aAuth, getEscapePrefix(), eMechanism, eCharset); }
- inline bool SetUser(const rtl::OString& rTheUser,
+ inline bool SetUser(const OString& rTheUser,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setUser(extend(rTheUser), true, eMechanism, eCharset); }
- inline bool SetUser(rtl::OUString const & rTheUser,
+ inline bool SetUser(OUString const & rTheUser,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setUser(rTheUser, false, eMechanism, eCharset); }
- inline bool SetPass(const rtl::OString& rThePassword,
+ inline bool SetPass(const OString& rThePassword,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline bool SetPass(rtl::OUString const & rThePassword,
+ inline bool SetPass(OUString const & rThePassword,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline bool SetUserAndPass(const rtl::OString& rTheUser,
- const rtl::OString& rThePassword,
+ inline bool SetUserAndPass(const OString& rTheUser,
+ const OString& rThePassword,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8);
- inline bool SetUserAndPass(rtl::OUString const & rTheUser,
- rtl::OUString const & rThePassword,
+ inline bool SetUserAndPass(OUString const & rTheUser,
+ OUString const & rThePassword,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8);
@@ -542,22 +542,22 @@ public:
inline bool HasPort() const { return m_aPort.isPresent(); }
- inline rtl::OUString GetHost(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ inline OUString GetHost(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aHost, getEscapePrefix(), eMechanism, eCharset); }
- rtl::OUString GetHostPort(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ OUString GetHostPort(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
sal_uInt32 GetPort() const;
- inline bool SetHost(const rtl::OString& rTheHost,
+ inline bool SetHost(const OString& rTheHost,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setHost(extend(rTheHost), true, eMechanism, eCharset); }
- inline bool SetHost(rtl::OUString const & rTheHost,
+ inline bool SetHost(OUString const & rTheHost,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setHost(rTheHost, false, eMechanism, eCharset); }
@@ -568,17 +568,17 @@ public:
inline bool HasURLPath() const { return !m_aPath.isEmpty(); }
- inline rtl::OUString GetURLPath(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ inline OUString GetURLPath(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aPath, getEscapePrefix(), eMechanism, eCharset); }
- inline bool SetURLPath(const rtl::OString& rThePath,
+ inline bool SetURLPath(const OString& rThePath,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setPath(extend(rThePath), true, eMechanism, eCharset); }
- inline bool SetURLPath(rtl::OUString const & rThePath,
+ inline bool SetURLPath(OUString const & rThePath,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setPath(rThePath, false, eMechanism, eCharset); }
@@ -661,7 +661,7 @@ public:
the specified place to insert the new segment does not exist, false is
returned. If false is returned, the object is not modified.
*/
- inline bool insertName(rtl::OUString const & rTheName,
+ inline bool insertName(OUString const & rTheName,
bool bAppendFinalSlash = false,
sal_Int32 nIndex = LAST_SEGMENT,
bool bIgnoreFinalSlash = true,
@@ -684,7 +684,7 @@ public:
hierarchical, or the specified segment does not exits, an empty string
is returned.
*/
- rtl::OUString getName(sal_Int32 nIndex = LAST_SEGMENT,
+ OUString getName(sal_Int32 nIndex = LAST_SEGMENT,
bool bIgnoreFinalSlash = true,
DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
@@ -710,7 +710,7 @@ public:
the specified segment does not exist, false is returned. If false is
returned, the object is not modified.
*/
- bool setName(rtl::OUString const & rTheName,
+ bool setName(OUString const & rTheName,
sal_Int32 nIndex = LAST_SEGMENT,
bool bIgnoreFinalSlash = true,
EncodeMechanism eMechanism = WAS_ENCODED,
@@ -732,7 +732,7 @@ public:
not hierarchical, or the specified segment does not exits, an empty
string is returned.
*/
- rtl::OUString getBase(sal_Int32 nIndex = LAST_SEGMENT,
+ OUString getBase(sal_Int32 nIndex = LAST_SEGMENT,
bool bIgnoreFinalSlash = true,
DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
@@ -757,7 +757,7 @@ public:
the specified segment does not exist, false is returned. If false is
returned, the object is not modified.
*/
- bool setBase(rtl::OUString const & rTheBase,
+ bool setBase(OUString const & rTheBase,
sal_Int32 nIndex = LAST_SEGMENT,
bool bIgnoreFinalSlash = true,
EncodeMechanism eMechanism = WAS_ENCODED,
@@ -794,7 +794,7 @@ public:
not hierarchical, or the specified segment does not exits, an empty
string is returned.
*/
- rtl::OUString getExtension(sal_Int32 nIndex = LAST_SEGMENT,
+ OUString getExtension(sal_Int32 nIndex = LAST_SEGMENT,
bool bIgnoreFinalSlash = true,
DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
@@ -820,7 +820,7 @@ public:
the specified segment does not exist, false is returned. If false is
returned, the object is not modified.
*/
- bool setExtension(rtl::OUString const & rTheExtension,
+ bool setExtension(OUString const & rTheExtension,
sal_Int32 nIndex = LAST_SEGMENT,
bool bIgnoreFinalSlash = true,
EncodeMechanism eMechanism = WAS_ENCODED,
@@ -873,16 +873,16 @@ public:
inline bool HasParam() const { return m_aQuery.isPresent(); }
- inline rtl::OUString GetParam(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ inline OUString GetParam(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aQuery, getEscapePrefix(), eMechanism, eCharset); }
- inline bool SetParam(const rtl::OString& rTheQuery,
+ inline bool SetParam(const OString& rTheQuery,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline bool SetParam(rtl::OUString const & rTheQuery,
+ inline bool SetParam(OUString const & rTheQuery,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
@@ -890,16 +890,16 @@ public:
inline bool HasMark() const { return m_aFragment.isPresent(); }
- inline rtl::OUString GetMark(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ inline OUString GetMark(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aFragment, getEscapePrefix(), eMechanism, eCharset); }
- inline bool SetMark(const rtl::OString& rTheFragment,
+ inline bool SetMark(const OString& rTheFragment,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline bool SetMark(rtl::OUString const & rTheFragment,
+ inline bool SetMark(OUString const & rTheFragment,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
@@ -911,7 +911,7 @@ public:
@param eStyle The notation of rFSysPath.
*/
- inline INetURLObject(rtl::OUString const & rFSysPath, FSysStyle eStyle);
+ inline INetURLObject(OUString const & rFSysPath, FSysStyle eStyle);
/** Set this INetURLObject to a file URL constructed from a file system
path.
@@ -923,7 +923,7 @@ public:
@return True if this INetURLObject has successfully been changed. If
false is returned, this INetURLObject has not been modified.
*/
- bool setFSysPath(rtl::OUString const & rFSysPath, FSysStyle eStyle);
+ bool setFSysPath(OUString const & rFSysPath, FSysStyle eStyle);
/** Return the file system path represented by a file URL (ignoring any
fragment part).
@@ -942,12 +942,12 @@ public:
specified notation, or if this is not a file URL at all, an empty
string is returned.
*/
- rtl::OUString getFSysPath(FSysStyle eStyle, sal_Unicode * pDelimiter = 0)
+ OUString getFSysPath(FSysStyle eStyle, sal_Unicode * pDelimiter = 0)
const;
// POP3 and URLs:
- rtl::OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ OUString GetMsgId(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
const;
@@ -1014,7 +1014,7 @@ public:
@return The encoded representation of the text ('forbidden'
characters replaced by escape sequences).
*/
- static inline rtl::OUString encode(const rtl::OString& rText, Part ePart,
+ static inline OUString encode(const OString& rText, Part ePart,
sal_Char cEscapePrefix,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset
@@ -1039,7 +1039,7 @@ public:
@return The text, encoded according to the given mechanism and
charset ('forbidden' characters replaced by escape sequences).
*/
- static inline rtl::OUString encode(rtl::OUString const & rText, Part ePart,
+ static inline OUString encode(OUString const & rText, Part ePart,
sal_Char cEscapePrefix,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset
@@ -1059,23 +1059,23 @@ public:
@return The text, decoded according to the given mechanism and
charset (escape sequences replaced by 'raw' characters).
*/
- static inline rtl::OUString decode(rtl::OUString const & rText,
+ static inline OUString decode(OUString const & rText,
sal_Char cEscapePrefix,
DecodeMechanism eMechanism,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8);
- static inline rtl::OUString decode(rtl::OUStringBuffer const & rText,
+ static inline OUString decode(OUStringBuffer const & rText,
sal_Char cEscapePrefix,
DecodeMechanism eMechanism,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8);
- static void appendUCS4Escape(rtl::OUStringBuffer & rTheText,
+ static void appendUCS4Escape(OUStringBuffer & rTheText,
sal_Char cEscapePrefix,
sal_uInt32 nUCS4);
- static void appendUCS4(rtl::OUStringBuffer & rTheText, sal_uInt32 nUCS4,
+ static void appendUCS4(OUStringBuffer & rTheText, sal_uInt32 nUCS4,
EscapeType eEscapeType, bool bOctets, Part ePart,
sal_Char cEscapePrefix, rtl_TextEncoding eCharset,
bool bKeepVisibleEscapes);
@@ -1095,7 +1095,7 @@ public:
// OBSOLETE Hierarchical Path:
- rtl::OUString GetPartBeforeLastName(DecodeMechanism eMechanism
+ OUString GetPartBeforeLastName(DecodeMechanism eMechanism
= DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const;
@@ -1110,7 +1110,7 @@ public:
the last unencoded '/'). Not that this last segment may be empty. If
the URL is not hierarchical, an empty string is returned.
*/
- rtl::OUString GetLastName(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ OUString GetLastName(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
const;
@@ -1125,16 +1125,16 @@ public:
be empty. If the URL is not hierarchical, or if the last segment does
not contain an unencoded '.', an empty string is returned.
*/
- rtl::OUString GetFileExtension(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ OUString GetFileExtension(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const;
- inline bool Append(const rtl::OString& rTheSegment,
+ inline bool Append(const OString& rTheSegment,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return appendSegment(extend(rTheSegment), true, eMechanism, eCharset); }
- inline bool Append(rtl::OUString const & rTheSegment,
+ inline bool Append(OUString const & rTheSegment,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return appendSegment(rTheSegment, false, eMechanism, eCharset); }
@@ -1143,36 +1143,36 @@ public:
// OBSOLETE File URLs:
- rtl::OUString PathToFileName() const;
+ OUString PathToFileName() const;
- rtl::OUString GetFull() const;
+ OUString GetFull() const;
- rtl::OUString GetPath() const;
+ OUString GetPath() const;
- void SetBase(rtl::OUString const & rTheBase);
+ void SetBase(OUString const & rTheBase);
- rtl::OUString GetBase() const;
+ OUString GetBase() const;
- void SetName(rtl::OUString const & rTheName,
+ void SetName(OUString const & rTheName,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline rtl::OUString GetName(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ inline OUString GetName(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return GetLastName(eMechanism, eCharset); }
- void SetExtension(rtl::OUString const & rTheExtension,
+ void SetExtension(OUString const & rTheExtension,
EncodeMechanism eMechanism = WAS_ENCODED,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
- inline rtl::OUString GetExtension(
+ inline OUString GetExtension(
DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset
= RTL_TEXTENCODING_UTF8) const
{ return GetFileExtension(eMechanism, eCharset); }
- rtl::OUString CutExtension(DecodeMechanism eMechanism = DECODE_TO_IURI,
+ OUString CutExtension(DecodeMechanism eMechanism = DECODE_TO_IURI,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
bool IsCaseSensitive() const;
@@ -1203,24 +1203,24 @@ private:
inline sal_Int32 clear();
- inline sal_Int32 set(rtl::OUStringBuffer & rString,
- rtl::OUString const & rSubString,
+ inline sal_Int32 set(OUStringBuffer & rString,
+ OUString const & rSubString,
sal_Int32 nTheBegin);
- inline sal_Int32 set(rtl::OUString & rString,
- rtl::OUString const & rSubString);
+ inline sal_Int32 set(OUString & rString,
+ OUString const & rSubString);
- inline sal_Int32 set(rtl::OUStringBuffer & rString,
- rtl::OUString const & rSubString);
+ inline sal_Int32 set(OUStringBuffer & rString,
+ OUString const & rSubString);
inline void operator +=(sal_Int32 nDelta);
int compare(SubString const & rOther,
- rtl::OUStringBuffer const & rThisString,
- rtl::OUStringBuffer const & rOtherString) const;
+ OUStringBuffer const & rThisString,
+ OUStringBuffer const & rOtherString) const;
};
- rtl::OUStringBuffer m_aAbsURIRef;
+ OUStringBuffer m_aAbsURIRef;
SubString m_aScheme;
SubString m_aUser;
SubString m_aAuth;
@@ -1235,35 +1235,35 @@ private:
TOOLS_DLLPRIVATE void setInvalid();
bool setAbsURIRef(
- rtl::OUString const & rTheAbsURIRef, bool bOctets,
+ OUString const & rTheAbsURIRef, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bSmart,
FSysStyle eStyle);
// Relative URLs:
bool convertRelToAbs(
- rtl::OUString const & rTheRelURIRef, bool bOctets,
+ OUString const & rTheRelURIRef, bool bOctets,
INetURLObject & rTheAbsURIRef, bool & rWasAbsolute,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset,
bool bIgnoreFragment, bool bSmart, bool bRelativeNonURIs,
FSysStyle eStyle) const;
bool convertAbsToRel(
- rtl::OUString const & rTheAbsURIRef, bool bOctets,
- rtl::OUString & rTheRelURIRef, EncodeMechanism eEncodeMechanism,
+ OUString const & rTheAbsURIRef, bool bOctets,
+ OUString & rTheRelURIRef, EncodeMechanism eEncodeMechanism,
DecodeMechanism eDecodeMechanism, rtl_TextEncoding eCharset,
FSysStyle eStyle) const;
// External URLs:
static bool convertIntToExt(
- rtl::OUString const & rTheIntURIRef, bool bOctets,
- rtl::OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism,
+ OUString const & rTheIntURIRef, bool bOctets,
+ OUString & rTheExtURIRef, DecodeMechanism eDecodeMechanism,
rtl_TextEncoding eCharset);
static bool convertExtToInt(
- rtl::OUString const & rTheExtURIRef, bool bOctets,
- rtl::OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism,
+ OUString const & rTheExtURIRef, bool bOctets,
+ OUString & rTheIntURIRef, DecodeMechanism eDecodeMechanism,
rtl_TextEncoding eCharset);
// Scheme:
@@ -1287,28 +1287,28 @@ private:
// User Info:
bool setUser(
- rtl::OUString const & rTheUser, bool bOctets,
+ OUString const & rTheUser, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
bool clearPassword();
bool setPassword(
- rtl::OUString const & rThePassword, bool bOctets,
+ OUString const & rThePassword, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
// Host and Port:
TOOLS_DLLPRIVATE static bool parseHost(
sal_Unicode const *& rBegin, sal_Unicode const * pEnd,
- rtl::OUString & rCanonic);
+ OUString & rCanonic);
TOOLS_DLLPRIVATE static bool parseHostOrNetBiosName(
sal_Unicode const * pBegin, sal_Unicode const * pEnd, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset,
- bool bNetBiosName, rtl::OUStringBuffer* pCanonic);
+ bool bNetBiosName, OUStringBuffer* pCanonic);
bool setHost(
- rtl::OUString const & rTheHost, bool bOctets,
+ OUString const & rTheHost, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
// Path:
@@ -1319,10 +1319,10 @@ private:
rtl_TextEncoding eCharset, bool bSkippedInitialSlash,
sal_uInt32 nSegmentDelimiter, sal_uInt32 nAltSegmentDelimiter,
sal_uInt32 nQueryDelimiter, sal_uInt32 nFragmentDelimiter,
- rtl::OUStringBuffer &rSynPath);
+ OUStringBuffer &rSynPath);
bool setPath(
- rtl::OUString const & rThePath, bool bOctets,
+ OUString const & rThePath, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
// Hierarchical Path:
@@ -1330,14 +1330,14 @@ private:
TOOLS_DLLPRIVATE bool checkHierarchical() const;
bool appendSegment(
- rtl::OUString const & rTheSegment, bool bOctets,
+ OUString const & rTheSegment, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
TOOLS_DLLPRIVATE SubString getSegment(
sal_Int32 nIndex, bool bIgnoreFinalSlash) const;
bool insertName(
- rtl::OUString const & rTheName, bool bOctets, bool bAppendFinalSlash,
+ OUString const & rTheName, bool bOctets, bool bAppendFinalSlash,
sal_Int32 nIndex, bool bIgnoreFinalSlash, EncodeMechanism eMechanism,
rtl_TextEncoding eCharset);
@@ -1346,7 +1346,7 @@ private:
bool clearQuery();
bool setQuery(
- rtl::OUString const & rTheQuery, bool bOctets,
+ OUString const & rTheQuery, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
// Fragment:
@@ -1354,7 +1354,7 @@ private:
bool clearFragment();
bool setFragment(
- rtl::OUString const & rTheMark, bool bOctets,
+ OUString const & rTheMark, bool bOctets,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
// FILE URLs:
@@ -1363,9 +1363,9 @@ private:
// Coding:
- static inline rtl::OUString extend(const rtl::OString& rOctets)
+ static inline OUString extend(const OString& rOctets)
{
- return rtl::OStringToOUString(rOctets, RTL_TEXTENCODING_ISO_8859_1);
+ return OStringToOUString(rOctets, RTL_TEXTENCODING_ISO_8859_1);
}
static inline sal_Char getEscapePrefix(INetProtocol eTheScheme)
@@ -1375,24 +1375,24 @@ private:
{ return getEscapePrefix(m_eScheme); }
TOOLS_DLLPRIVATE static inline void appendEscape(
- rtl::OUStringBuffer & rTheText, sal_Char cEscapePrefix,
+ OUStringBuffer & rTheText, sal_Char cEscapePrefix,
sal_uInt32 nOctet);
- static rtl::OUString encodeText(
+ static OUString encodeText(
sal_Unicode const * pBegin, sal_Unicode const * pEnd, bool bOctets,
Part ePart, sal_Char cEscapePrefix, EncodeMechanism eMechanism,
rtl_TextEncoding eCharset, bool bKeepVisibleEscapes);
- static inline rtl::OUString encodeText(
- rtl::OUString const & rTheText, bool bOctets, Part ePart,
+ static inline OUString encodeText(
+ OUString const & rTheText, bool bOctets, Part ePart,
sal_Char cEscapePrefix, EncodeMechanism eMechanism,
rtl_TextEncoding eCharset, bool bKeepVisibleEscapes);
- static rtl::OUString decode(
+ static OUString decode(
sal_Unicode const * pBegin, sal_Unicode const * pEnd,
sal_Char cEscapePrefix, DecodeMechanism, rtl_TextEncoding eCharset);
- inline rtl::OUString decode(
+ inline OUString decode(
SubString const & rSubString, sal_Char cEscapePrefix,
DecodeMechanism eMechanism, rtl_TextEncoding eCharset) const;
@@ -1406,7 +1406,7 @@ private:
};
// static
-inline rtl::OUString INetURLObject::encodeText(rtl::OUString const & rTheText,
+inline OUString INetURLObject::encodeText(OUString const & rTheText,
bool bOctets, Part ePart,
sal_Char cEscapePrefix,
EncodeMechanism eMechanism,
@@ -1419,7 +1419,7 @@ inline rtl::OUString INetURLObject::encodeText(rtl::OUString const & rTheText,
bKeepVisibleEscapes);
}
-inline rtl::OUString INetURLObject::decode(SubString const & rSubString,
+inline OUString INetURLObject::decode(SubString const & rSubString,
sal_Char cEscapePrefix,
DecodeMechanism eMechanism,
rtl_TextEncoding eCharset) const
@@ -1428,10 +1428,10 @@ inline rtl::OUString INetURLObject::decode(SubString const & rSubString,
decode(m_aAbsURIRef.getStr() + rSubString.getBegin(),
m_aAbsURIRef.getStr() + rSubString.getEnd(),
cEscapePrefix, eMechanism, eCharset) :
- rtl::OUString();
+ OUString();
}
-inline INetURLObject::INetURLObject(const rtl::OString& rTheAbsURIRef,
+inline INetURLObject::INetURLObject(const OString& rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset):
m_eScheme(INET_PROT_NOT_VALID), m_eSmartScheme(INET_PROT_HTTP)
@@ -1440,7 +1440,7 @@ inline INetURLObject::INetURLObject(const rtl::OString& rTheAbsURIRef,
FSysStyle(0));
}
-inline INetURLObject::INetURLObject(rtl::OUString const & rTheAbsURIRef,
+inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset):
m_eScheme(INET_PROT_NOT_VALID), m_eSmartScheme(INET_PROT_HTTP)
@@ -1449,7 +1449,7 @@ inline INetURLObject::INetURLObject(rtl::OUString const & rTheAbsURIRef,
FSysStyle(0));
}
-inline bool INetURLObject::SetURL(const rtl::OString& rTheAbsURIRef,
+inline bool INetURLObject::SetURL(const OString& rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1457,7 +1457,7 @@ inline bool INetURLObject::SetURL(const rtl::OString& rTheAbsURIRef,
false, FSysStyle(0));
}
-inline bool INetURLObject::SetURL(rtl::OUString const & rTheAbsURIRef,
+inline bool INetURLObject::SetURL(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1465,7 +1465,7 @@ inline bool INetURLObject::SetURL(rtl::OUString const & rTheAbsURIRef,
FSysStyle(0));
}
-inline INetURLObject::INetURLObject(rtl::OUString const & rTheAbsURIRef,
+inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
INetProtocol eTheSmartScheme,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset,
@@ -1475,7 +1475,7 @@ inline INetURLObject::INetURLObject(rtl::OUString const & rTheAbsURIRef,
setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, true, eStyle);
}
-inline bool INetURLObject::SetSmartURL(const rtl::OString& rTheAbsURIRef,
+inline bool INetURLObject::SetSmartURL(const OString& rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset,
FSysStyle eStyle)
@@ -1484,7 +1484,7 @@ inline bool INetURLObject::SetSmartURL(const rtl::OString& rTheAbsURIRef,
true, eStyle);
}
-inline bool INetURLObject::SetSmartURL(rtl::OUString const & rTheAbsURIRef,
+inline bool INetURLObject::SetSmartURL(OUString const & rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset,
FSysStyle eStyle)
@@ -1494,7 +1494,7 @@ inline bool INetURLObject::SetSmartURL(rtl::OUString const & rTheAbsURIRef,
}
inline INetURLObject
-INetURLObject::smartRel2Abs(const rtl::OString& rTheRelURIRef,
+INetURLObject::smartRel2Abs(const OString& rTheRelURIRef,
bool & rWasAbsolute,
bool bIgnoreFragment,
EncodeMechanism eMechanism,
@@ -1510,7 +1510,7 @@ INetURLObject::smartRel2Abs(const rtl::OString& rTheRelURIRef,
}
inline INetURLObject
-INetURLObject::smartRel2Abs(rtl::OUString const & rTheRelURIRef,
+INetURLObject::smartRel2Abs(OUString const & rTheRelURIRef,
bool & rWasAbsolute,
bool bIgnoreFragment,
EncodeMechanism eMechanism,
@@ -1525,7 +1525,7 @@ INetURLObject::smartRel2Abs(rtl::OUString const & rTheRelURIRef,
return aTheAbsURIRef;
}
-inline bool INetURLObject::GetNewAbsURL(const rtl::OString& rTheRelURIRef,
+inline bool INetURLObject::GetNewAbsURL(const OString& rTheRelURIRef,
INetURLObject * pTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset,
@@ -1543,7 +1543,7 @@ inline bool INetURLObject::GetNewAbsURL(const rtl::OString& rTheRelURIRef,
return true;
}
-inline bool INetURLObject::GetNewAbsURL(rtl::OUString const & rTheRelURIRef,
+inline bool INetURLObject::GetNewAbsURL(OUString const & rTheRelURIRef,
INetURLObject * pTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset,
@@ -1562,14 +1562,14 @@ inline bool INetURLObject::GetNewAbsURL(rtl::OUString const & rTheRelURIRef,
}
// static
-inline rtl::OUString INetURLObject::GetRelURL(const rtl::OString& rTheBaseURIRef,
- const rtl::OString& rTheAbsURIRef,
+inline OUString INetURLObject::GetRelURL(const OString& rTheBaseURIRef,
+ const OString& rTheAbsURIRef,
EncodeMechanism eEncodeMechanism,
DecodeMechanism eDecodeMechanism,
rtl_TextEncoding eCharset,
FSysStyle eStyle)
{
- rtl::OUString aTheRelURIRef;
+ OUString aTheRelURIRef;
INetURLObject(rTheBaseURIRef, eEncodeMechanism, eCharset).
convertAbsToRel(extend(rTheAbsURIRef), true, aTheRelURIRef,
eEncodeMechanism, eDecodeMechanism, eCharset, eStyle);
@@ -1577,14 +1577,14 @@ inline rtl::OUString INetURLObject::GetRelURL(const rtl::OString& rTheBaseURIRef
}
// static
-inline rtl::OUString INetURLObject::GetRelURL(rtl::OUString const & rTheBaseURIRef,
- rtl::OUString const & rTheAbsURIRef,
+inline OUString INetURLObject::GetRelURL(OUString const & rTheBaseURIRef,
+ OUString const & rTheAbsURIRef,
EncodeMechanism eEncodeMechanism,
DecodeMechanism eDecodeMechanism,
rtl_TextEncoding eCharset,
FSysStyle eStyle)
{
- rtl::OUString aTheRelURIRef;
+ OUString aTheRelURIRef;
INetURLObject(rTheBaseURIRef, eEncodeMechanism, eCharset).
convertAbsToRel(rTheAbsURIRef, false, aTheRelURIRef, eEncodeMechanism,
eDecodeMechanism, eCharset, eStyle);
@@ -1592,13 +1592,13 @@ inline rtl::OUString INetURLObject::GetRelURL(rtl::OUString const & rTheBaseURIR
}
// static
-inline bool INetURLObject::translateToExternal(const rtl::OString& rTheIntURIRef,
- rtl::OUString & rTheExtURIRef,
+inline bool INetURLObject::translateToExternal(const OString& rTheIntURIRef,
+ OUString & rTheExtURIRef,
DecodeMechanism
eDecodeMechanism,
rtl_TextEncoding eCharset)
{
- rtl::OUString aTheExtURIRef;
+ OUString aTheExtURIRef;
bool bRet = convertIntToExt(extend(rTheIntURIRef), true, aTheExtURIRef,
eDecodeMechanism, eCharset);
rTheExtURIRef = aTheExtURIRef;
@@ -1606,9 +1606,9 @@ inline bool INetURLObject::translateToExternal(const rtl::OString& rTheIntURIRef
}
// static
-inline bool INetURLObject::translateToExternal(rtl::OUString const &
+inline bool INetURLObject::translateToExternal(OUString const &
rTheIntURIRef,
- rtl::OUString & rTheExtURIRef,
+ OUString & rTheExtURIRef,
DecodeMechanism
eDecodeMechanism,
rtl_TextEncoding eCharset)
@@ -1618,14 +1618,14 @@ inline bool INetURLObject::translateToExternal(rtl::OUString const &
}
// static
-inline bool INetURLObject::translateToInternal(const rtl::OString&
+inline bool INetURLObject::translateToInternal(const OString&
rTheExtURIRef,
- rtl::OUString & rTheIntURIRef,
+ OUString & rTheIntURIRef,
DecodeMechanism
eDecodeMechanism,
rtl_TextEncoding eCharset)
{
- rtl::OUString aTheIntURIRef;
+ OUString aTheIntURIRef;
bool bRet = convertExtToInt(extend(rTheExtURIRef), true, aTheIntURIRef,
eDecodeMechanism, eCharset);
rTheIntURIRef = aTheIntURIRef;
@@ -1633,9 +1633,9 @@ inline bool INetURLObject::translateToInternal(const rtl::OString&
}
// static
-inline bool INetURLObject::translateToInternal(rtl::OUString const &
+inline bool INetURLObject::translateToInternal(OUString const &
rTheExtURIRef,
- rtl::OUString & rTheIntURIRef,
+ OUString & rTheIntURIRef,
DecodeMechanism
eDecodeMechanism,
rtl_TextEncoding eCharset)
@@ -1644,7 +1644,7 @@ inline bool INetURLObject::translateToInternal(rtl::OUString const &
eDecodeMechanism, eCharset);
}
-inline bool INetURLObject::SetPass(const rtl::OString& rThePassword,
+inline bool INetURLObject::SetPass(const OString& rThePassword,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1653,7 +1653,7 @@ inline bool INetURLObject::SetPass(const rtl::OString& rThePassword,
setPassword(extend(rThePassword), true, eMechanism, eCharset);
}
-inline bool INetURLObject::SetPass(rtl::OUString const & rThePassword,
+inline bool INetURLObject::SetPass(OUString const & rThePassword,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1662,8 +1662,8 @@ inline bool INetURLObject::SetPass(rtl::OUString const & rThePassword,
setPassword(rThePassword, false, eMechanism, eCharset);
}
-inline bool INetURLObject::SetUserAndPass(const rtl::OString& rTheUser,
- const rtl::OString& rThePassword,
+inline bool INetURLObject::SetUserAndPass(const OString& rTheUser,
+ const OString& rThePassword,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1674,8 +1674,8 @@ inline bool INetURLObject::SetUserAndPass(const rtl::OString& rTheUser,
eCharset));
}
-inline bool INetURLObject::SetUserAndPass(rtl::OUString const & rTheUser,
- rtl::OUString const & rThePassword,
+inline bool INetURLObject::SetUserAndPass(OUString const & rTheUser,
+ OUString const & rThePassword,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1685,7 +1685,7 @@ inline bool INetURLObject::SetUserAndPass(rtl::OUString const & rTheUser,
setPassword(rThePassword, false, eMechanism, eCharset));
}
-inline bool INetURLObject::insertName(rtl::OUString const & rTheName,
+inline bool INetURLObject::insertName(OUString const & rTheName,
bool bAppendFinalSlash,
sal_Int32 nIndex,
bool bIgnoreFinalSlash,
@@ -1696,7 +1696,7 @@ inline bool INetURLObject::insertName(rtl::OUString const & rTheName,
bIgnoreFinalSlash, eMechanism, eCharset);
}
-inline bool INetURLObject::SetParam(const rtl::OString& rTheQuery,
+inline bool INetURLObject::SetParam(const OString& rTheQuery,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1705,7 +1705,7 @@ inline bool INetURLObject::SetParam(const rtl::OString& rTheQuery,
setQuery(extend(rTheQuery), true, eMechanism, eCharset);
}
-inline bool INetURLObject::SetParam(rtl::OUString const & rTheQuery,
+inline bool INetURLObject::SetParam(OUString const & rTheQuery,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1714,7 +1714,7 @@ inline bool INetURLObject::SetParam(rtl::OUString const & rTheQuery,
setQuery(rTheQuery, false, eMechanism, eCharset);
}
-inline bool INetURLObject::SetMark(const rtl::OString& rTheFragment,
+inline bool INetURLObject::SetMark(const OString& rTheFragment,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1723,7 +1723,7 @@ inline bool INetURLObject::SetMark(const rtl::OString& rTheFragment,
setFragment(extend(rTheFragment), true, eMechanism, eCharset);
}
-inline bool INetURLObject::SetMark(rtl::OUString const & rTheFragment,
+inline bool INetURLObject::SetMark(OUString const & rTheFragment,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1732,7 +1732,7 @@ inline bool INetURLObject::SetMark(rtl::OUString const & rTheFragment,
setFragment(rTheFragment, false, eMechanism, eCharset);
}
-inline INetURLObject::INetURLObject(rtl::OUString const & rFSysPath,
+inline INetURLObject::INetURLObject(OUString const & rFSysPath,
FSysStyle eStyle):
m_eScheme(INET_PROT_NOT_VALID), m_eSmartScheme(INET_PROT_HTTP)
{
@@ -1740,7 +1740,7 @@ inline INetURLObject::INetURLObject(rtl::OUString const & rFSysPath,
}
// static
-inline rtl::OUString INetURLObject::encode(const rtl::OString& rText, Part ePart,
+inline OUString INetURLObject::encode(const OString& rText, Part ePart,
sal_Char cEscapePrefix,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
@@ -1750,7 +1750,7 @@ inline rtl::OUString INetURLObject::encode(const rtl::OString& rText, Part ePart
}
// static
-inline rtl::OUString INetURLObject::encode(rtl::OUString const & rText, Part ePart,
+inline OUString INetURLObject::encode(OUString const & rText, Part ePart,
sal_Char cEscapePrefix,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
@@ -1760,7 +1760,7 @@ inline rtl::OUString INetURLObject::encode(rtl::OUString const & rText, Part ePa
}
// static
-inline rtl::OUString INetURLObject::decode(rtl::OUString const & rText,
+inline OUString INetURLObject::decode(OUString const & rText,
sal_Char cEscapePrefix,
DecodeMechanism eMechanism,
rtl_TextEncoding eCharset)
@@ -1769,7 +1769,7 @@ inline rtl::OUString INetURLObject::decode(rtl::OUString const & rText,
cEscapePrefix, eMechanism, eCharset);
}
-inline rtl::OUString INetURLObject::decode(rtl::OUStringBuffer const & rText,
+inline OUString INetURLObject::decode(OUStringBuffer const & rText,
sal_Char cEscapePrefix,
DecodeMechanism eMechanism,
rtl_TextEncoding eCharset)
diff --git a/tools/inc/tools/wldcrd.hxx b/tools/inc/tools/wldcrd.hxx
index cf82984cfa52..8991b8882474 100644
--- a/tools/inc/tools/wldcrd.hxx
+++ b/tools/inc/tools/wldcrd.hxx
@@ -26,7 +26,7 @@
class TOOLS_DLLPUBLIC WildCard
{
private:
- rtl::OString aWildString;
+ OString aWildString;
char cSepSymbol;
sal_uInt16 ImpMatch( const char *pWild, const char *pStr ) const;
@@ -38,20 +38,20 @@ public:
{
}
- WildCard(const rtl::OUString& rWildCard, const char cSeparator = '\0')
- : aWildString(rtl::OUStringToOString(rWildCard, osl_getThreadTextEncoding()))
+ WildCard(const OUString& rWildCard, const char cSeparator = '\0')
+ : aWildString(OUStringToOString(rWildCard, osl_getThreadTextEncoding()))
, cSepSymbol(cSeparator)
{
}
- const rtl::OUString getGlob() const
+ const OUString getGlob() const
{
- return rtl::OStringToOUString(aWildString, osl_getThreadTextEncoding());
+ return OStringToOUString(aWildString, osl_getThreadTextEncoding());
}
- void setGlob(const rtl::OUString& rString)
+ void setGlob(const OUString& rString)
{
- aWildString = rtl::OUStringToOString(rString, osl_getThreadTextEncoding());
+ aWildString = OUStringToOString(rString, osl_getThreadTextEncoding());
}
sal_Bool Matches( const String& rStr ) const;