summaryrefslogtreecommitdiff
path: root/sw/source/ui/chrdlg
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 /sw/source/ui/chrdlg
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 'sw/source/ui/chrdlg')
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx8
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx4
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx
index 8573b7365d03..b5c7359e318f 100644
--- a/sw/source/ui/chrdlg/ccoll.cxx
+++ b/sw/source/ui/chrdlg/ccoll.cxx
@@ -78,7 +78,7 @@ const char *aCommandContext[COND_COMMAND_COUNT] =
"NumberingLevel10"
};
-sal_Int16 GetCommandContextIndex( const rtl::OUString &rContextName )
+sal_Int16 GetCommandContextIndex( const OUString &rContextName )
{
sal_Int16 nRes = -1;
for (sal_Int16 i = 0; nRes == -1 && i < COND_COMMAND_COUNT; ++i)
@@ -89,12 +89,12 @@ sal_Int16 GetCommandContextIndex( const rtl::OUString &rContextName )
return nRes;
}
-rtl::OUString GetCommandContextByIndex( sal_Int16 nIndex )
+OUString GetCommandContextByIndex( sal_Int16 nIndex )
{
- rtl::OUString aRes;
+ OUString aRes;
if (0 <= nIndex && nIndex < COND_COMMAND_COUNT)
{
- aRes = rtl::OUString::createFromAscii( aCommandContext[ nIndex ] );
+ aRes = OUString::createFromAscii( aCommandContext[ nIndex ] );
}
return aRes;
}
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index e7efa9177250..cfa6741b1820 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -235,7 +235,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet)
sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
{
- ::rtl::OUString sURL = m_pURLED->GetText();
+ OUString sURL = m_pURLED->GetText();
if(!sURL.isEmpty())
{
sURL = URIHelper::SmartRel2Abs(INetURLObject(), sURL, Link(), false );
@@ -243,7 +243,7 @@ sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet)
static const sal_Char* pFile = "file:";
sal_Int32 nLength = ((sal_Int32)sizeof(pFile)-1);
if( sURL.copy(0, nLength ).equalsAsciiL( pFile, nLength ))
- sURL = URIHelper::simpleNormalizedMakeRelative(::rtl::OUString(), sURL);
+ sURL = URIHelper::simpleNormalizedMakeRelative(OUString(), sURL);
}
SwFmtINetFmt aINetFmt(sURL, m_pTargetFrmLB->GetText());
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index efae40258d38..0c7c0402252e 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -164,7 +164,7 @@ String GetDefaultString(sal_uInt16 nChars)
{
String aStr;
for (sal_uInt16 i = 0; i < nChars; i++)
- aStr += rtl::OUString((char) (i + 65));
+ aStr += OUString((char) (i + 65));
return aStr;
}