From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: 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 --- i18nutil/inc/i18nutil/paper.hxx | 4 ++-- i18nutil/inc/i18nutil/scripttypedetector.hxx | 12 ++++++------ i18nutil/inc/i18nutil/widthfolding.hxx | 4 ++-- i18nutil/source/utility/paper.cxx | 12 ++++++------ i18nutil/source/utility/scripttypedetector.cxx | 12 ++++++------ i18nutil/source/utility/widthfolding.cxx | 1 - 6 files changed, 22 insertions(+), 23 deletions(-) (limited to 'i18nutil') diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx index c4736f78625d..8847b294fbdb 100644 --- a/i18nutil/inc/i18nutil/paper.hxx +++ b/i18nutil/inc/i18nutil/paper.hxx @@ -137,8 +137,8 @@ public: static PaperInfo getSystemDefaultPaper(); static PaperInfo getDefaultPaperForLocale(const ::com::sun::star::lang::Locale & rLocale); - static Paper fromPSName(const rtl::OString &rName); - static rtl::OString toPSName(Paper eType); + static Paper fromPSName(const OString &rName); + static OString toPSName(Paper eType); static long sloppyFitPageDimension(long nDimension); }; diff --git a/i18nutil/inc/i18nutil/scripttypedetector.hxx b/i18nutil/inc/i18nutil/scripttypedetector.hxx index 8920ebce3d29..cf3b9b71e11b 100644 --- a/i18nutil/inc/i18nutil/scripttypedetector.hxx +++ b/i18nutil/inc/i18nutil/scripttypedetector.hxx @@ -25,12 +25,12 @@ class I18NUTIL_DLLPUBLIC ScriptTypeDetector { public: - static sal_Int32 beginOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ); - static sal_Int32 endOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ); - static sal_Int16 getScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ); - static sal_Int32 beginOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos ); - static sal_Int32 endOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos ); - static sal_Int16 getCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos ); + static sal_Int32 beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ); + static sal_Int32 endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ); + static sal_Int16 getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ); + static sal_Int32 beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ); + static sal_Int32 endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ); + static sal_Int16 getCTLScriptType( const OUString& Text, sal_Int32 nPos ); }; #endif diff --git a/i18nutil/inc/i18nutil/widthfolding.hxx b/i18nutil/inc/i18nutil/widthfolding.hxx index 6193c07142f5..481239deca88 100644 --- a/i18nutil/inc/i18nutil/widthfolding.hxx +++ b/i18nutil/inc/i18nutil/widthfolding.hxx @@ -40,9 +40,9 @@ public: static oneToOneMapping& getfullKana2halfKanaTable(); static oneToOneMapping& gethalfKana2fullKanaTable(); - static rtl::OUString decompose_ja_voiced_sound_marks(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset); + static OUString decompose_ja_voiced_sound_marks(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset); static sal_Unicode decompose_ja_voiced_sound_marksChar2Char (sal_Unicode inChar); - static rtl::OUString compose_ja_voiced_sound_marks(const rtl::OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 nFlags = 0 ); + static OUString compose_ja_voiced_sound_marks(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset, sal_Bool useOffset, sal_Int32 nFlags = 0 ); static sal_Unicode getCompositionChar(sal_Unicode c1, sal_Unicode c2); }; diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index 463479937c58..5199b0712eea 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -207,7 +207,7 @@ long PaperInfo::sloppyFitPageDimension(long nDimension) PaperInfo PaperInfo::getSystemDefaultPaper() { - rtl::OUString aLocaleStr = officecfg::Setup::L10N::ooSetupSystemLocale::get(); + OUString aLocaleStr = officecfg::Setup::L10N::ooSetupSystemLocale::get(); #ifdef UNX // if set to "use system", get papersize from system @@ -233,7 +233,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper() if (pBuffer && *pBuffer != 0) { - rtl::OString aPaper(pBuffer); + OString aPaper(pBuffer); aPaper = aPaper.trim(); static struct { const char *pName; Paper ePaper; } aCustoms [] = { @@ -328,7 +328,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper() aLocaleStr = officecfg::System::L10N::Locale::get(); if (aLocaleStr.isEmpty()) - aLocaleStr = rtl::OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US")); + aLocaleStr = OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US")); // convert locale string to locale struct ::com::sun::star::lang::Locale aSysLocale; @@ -368,13 +368,13 @@ PaperInfo::PaperInfo(long nPaperWidth, long nPaperHeight) } } -rtl::OString PaperInfo::toPSName(Paper ePaper) +OString PaperInfo::toPSName(Paper ePaper) { return static_cast(ePaper) < nTabSize ? - rtl::OString(aDinTab[ePaper].m_pPSName) : rtl::OString(); + OString(aDinTab[ePaper].m_pPSName) : OString(); } -Paper PaperInfo::fromPSName(const rtl::OString &rName) +Paper PaperInfo::fromPSName(const OString &rName) { if (rName.isEmpty()) return PAPER_USER; diff --git a/i18nutil/source/utility/scripttypedetector.cxx b/i18nutil/source/utility/scripttypedetector.cxx index 799774f34314..ece2b575e593 100644 --- a/i18nutil/source/utility/scripttypedetector.cxx +++ b/i18nutil/source/utility/scripttypedetector.cxx @@ -47,14 +47,14 @@ static sal_Int16 scriptDirection[] = { ScriptDirection::NEUTRAL, // DirectionProperty_BOUNDARY_NEUTRAL = 18, }; -sal_Int16 ScriptTypeDetector::getScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) +sal_Int16 ScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) { sal_Int16 dir = scriptDirection[unicode::getUnicodeDirection(Text[nPos])]; return (dir == ScriptDirection::NEUTRAL) ? defaultScriptDirection : dir; } // return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range. -sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction ) +sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) { sal_Int32 cPos = nPos; @@ -67,7 +67,7 @@ sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const rtl::OUString& Text, return cPos == nPos ? -1 : cPos + 1; } -sal_Int32 ScriptTypeDetector::endOfScriptDirection( const rtl::OUString& Text, sal_Int32 nPos, sal_Int16 direction ) +sal_Int32 ScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) { sal_Int32 cPos = nPos; sal_Int32 len = Text.getLength(); @@ -81,7 +81,7 @@ sal_Int32 ScriptTypeDetector::endOfScriptDirection( const rtl::OUString& Text, s return cPos == nPos ? -1 : cPos; } -sal_Int16 ScriptTypeDetector::getCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos ) +sal_Int16 ScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) { static ScriptTypeList typeList[] = { { UnicodeScript_kHebrew, UnicodeScript_kHebrew, CTLScriptType::CTL_HEBREW }, // 10 @@ -95,7 +95,7 @@ sal_Int16 ScriptTypeDetector::getCTLScriptType( const rtl::OUString& Text, sal_I } // Begin of Script Type is inclusive. -sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos ) +sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) { if (nPos < 0) return 0; @@ -112,7 +112,7 @@ sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const rtl::OUString& Text, s } // End of the Script Type is exclusive, the return value pointing to the begin of next script type -sal_Int32 ScriptTypeDetector::endOfCTLScriptType( const rtl::OUString& Text, sal_Int32 nPos ) +sal_Int32 ScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) { if (nPos < 0) return 0; diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx index 0777c979101f..99508043dee8 100644 --- a/i18nutil/source/utility/widthfolding.cxx +++ b/i18nutil/source/utility/widthfolding.cxx @@ -25,7 +25,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; namespace com { namespace sun { namespace star { namespace i18n { -- cgit