summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-08-30 15:29:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-08-30 15:29:41 +0200
commit32f9120fa076ef9dcee1d29e0a596a36aade353c (patch)
tree8f5ca4bc9f37598ee2e04726a124ed767a826edd /sw/source/uibase
parent185c3c8207de78ebb4f4dc053b5fe16f810929cc (diff)
loplugin:stringconstant: adapt to improved OUStringLiteral1 (sw)
Change-Id: Ifa1a6bafd3628b48ebceb09f8cd864361848e81c
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/app/docstyle.cxx2
-rw-r--r--sw/source/uibase/config/modcfg.cxx6
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.cxx2
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx2
7 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 4506dfb9d5dd..f7a176a54d32 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -400,7 +400,7 @@ sal_uInt32 SwStyleSheetIterator::SwPoolFormatList::FindName(SfxStyleFamily eFam,
cStyle = ' ';
break;
}
- const OUString sSrch = OUString(cStyle) + rName;
+ const OUString sSrch = OUStringLiteral1(cStyle) + rName;
UniqueHash::const_iterator it = maUnique.find(sSrch);
if (it != maUnique.end())
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 0d954ab60de7..eb3be3341226 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -177,7 +177,7 @@ OUString SwModuleOptions::ConvertWordDelimiter(const OUString& rDelim, bool bFro
nChar += nVal;
}
if( bValidData )
- sReturn += OUString(nChar);
+ sReturn += OUStringLiteral1(nChar);
break;
}
@@ -188,7 +188,7 @@ OUString SwModuleOptions::ConvertWordDelimiter(const OUString& rDelim, bool bFro
}
}
else
- sReturn += OUString(c);
+ sReturn += OUStringLiteral1(c);
}
}
else
@@ -210,7 +210,7 @@ OUString SwModuleOptions::ConvertWordDelimiter(const OUString& rDelim, bool bFro
}
else
{
- sReturn += OUString(c);
+ sReturn += OUStringLiteral1(c);
}
}
}
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 8b9206616564..f906c5535a40 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -629,7 +629,7 @@ static OUString lcl_FindColumn(const OUString& sFormatStr,sal_uInt16 &nUsedPos
nSeparator = DB_SEP_NEWLINE;
break;
default:
- sReturn += OUString(cAkt);
+ sReturn += OUStringLiteral1(cAkt);
}
nUsedPos++;
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 14b13a1aecf7..7ff7008ce374 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -396,7 +396,7 @@ static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeader
for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
{
OUString sHeader = "<" + rHeaders.GetString( i ) + ">";
- OUString sReplace = "<" + OUString(sal_Unicode('0' + i)) + ">";
+ OUString sReplace = "<" + OUStringLiteral1('0' + i) + ">";
sBlock = sBlock.replaceAll(sHeader, sReplace);
}
rBlock = sBlock;
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 1c637baec29d..e493e719c9c4 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -942,7 +942,7 @@ void SwEditWin::FlushInBuffer()
if (xISC->checkInputSequence( aNewText, nTmpPos - 1, cChar, nCheckMode ))
{
// character can be inserted:
- aNewText += OUString( (sal_Unicode) cChar );
+ aNewText += OUStringLiteral1( cChar );
++nTmpPos;
}
}
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 98784d3e625f..4ad77aee5727 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -74,7 +74,7 @@ PageSizeControl::PageSizeControl(
sal_Unicode c = aText[i];
if ( rtl::isAsciiAlpha(c) || (c == '\'') || (c == '\"') || (c == '%') )
{
- aMetricStr = OUString(c) + aMetricStr;
+ aMetricStr = OUStringLiteral1(c) + aMetricStr;
}
else
{
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index c096eec78fdc..dbe9b27335ab 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -1605,7 +1605,7 @@ void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar )
aTmpStr1 += SW_RES(STR_END_QUOTE);
OUString aTmpStr3;
aTmpStr3 += SW_RES(STR_START_QUOTE);
- aTmpStr3 += OUString(cChar);
+ aTmpStr3 += OUStringLiteral1(cChar);
aTmpStr3 += SW_RES(STR_END_QUOTE);
aRewriter.AddRule( UndoArg1, aTmpStr1 );
aRewriter.AddRule( UndoArg2, SW_RES(STR_YIELDS) );