diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /ucb/source/inc | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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 'ucb/source/inc')
-rw-r--r-- | ucb/source/inc/regexp.hxx | 18 | ||||
-rw-r--r-- | ucb/source/inc/regexpmap.hxx | 16 |
2 files changed, 17 insertions, 17 deletions
diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx index b59b7187bd0c..ddee7c11314d 100644 --- a/ucb/source/inc/regexp.hxx +++ b/ucb/source/inc/regexp.hxx @@ -42,25 +42,25 @@ public: inline Kind getKind() const { return m_eKind; } - bool matches(rtl::OUString const & rString, rtl::OUString * pTranslation, + bool matches(OUString const & rString, OUString * pTranslation, bool * pTranslated) const; - rtl::OUString getRegexp(bool bReverse) const; + OUString getRegexp(bool bReverse) const; - static Regexp parse(rtl::OUString const & rRegexp); + static Regexp parse(OUString const & rRegexp); private: Kind m_eKind; - rtl::OUString m_aPrefix; - rtl::OUString m_aInfix; - rtl::OUString m_aReversePrefix; + OUString m_aPrefix; + OUString m_aInfix; + OUString m_aReversePrefix; bool m_bEmptyDomain; bool m_bTranslation; - inline Regexp(Kind eTheKind, rtl::OUString const & rThePrefix, - bool bTheEmptyDomain, rtl::OUString const & rTheInfix, + inline Regexp(Kind eTheKind, OUString const & rThePrefix, + bool bTheEmptyDomain, OUString const & rTheInfix, bool bTheTranslation, - rtl::OUString const & rTheReversePrefix); + OUString const & rTheReversePrefix); }; inline bool Regexp::operator ==(Regexp const & rOther) const diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index fc4b218f16ce..3e960d1bd93b 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -33,18 +33,18 @@ template< typename Val > class RegexpMapEntry { public: - inline RegexpMapEntry(rtl::OUString const & rTheRegexp, + inline RegexpMapEntry(OUString const & rTheRegexp, Val * pTheValue): m_aRegexp(rTheRegexp), m_pValue(pTheValue) {} - rtl::OUString getRegexp() const { return m_aRegexp; } + OUString getRegexp() const { return m_aRegexp; } Val const & getValue() const { return *m_pValue; } Val & getValue() { return *m_pValue; } private: - rtl::OUString m_aRegexp; + OUString m_aRegexp; Val * m_pValue; }; @@ -130,11 +130,11 @@ public: RegexpMap & operator =(RegexpMap const & rOther); - bool add(rtl::OUString const & rKey, Val const & rValue, bool bOverwrite, - rtl::OUString * pReverse = 0); + bool add(OUString const & rKey, Val const & rValue, bool bOverwrite, + OUString * pReverse = 0); // throws com::sun::star::lang::IllegalArgumentException - iterator find(rtl::OUString const & rKey, rtl::OUString * pReverse = 0); + iterator find(OUString const & rKey, OUString * pReverse = 0); // throws com::sun::star::lang::IllegalArgumentException void erase(iterator const & rPos); @@ -151,8 +151,8 @@ public: size_type size() const; - Val const * map(rtl::OUString const & rString, - rtl::OUString * pTranslation = 0, bool * pTranslated = 0) + Val const * map(OUString const & rString, + OUString * pTranslation = 0, bool * pTranslated = 0) const; private: |