summaryrefslogtreecommitdiff
path: root/sw/source/ui
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/ui
parent185c3c8207de78ebb4f4dc053b5fe16f810929cc (diff)
loplugin:stringconstant: adapt to improved OUStringLiteral1 (sw)
Change-Id: Ifa1a6bafd3628b48ebceb09f8cd864361848e81c
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/index/cnttab.cxx8
-rw-r--r--sw/source/ui/misc/bookmark.cxx4
-rw-r--r--sw/source/ui/misc/glossary.cxx2
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx4
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx2
5 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 9e0b2ccdc3ff..5f6373771e3a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -287,9 +287,9 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet&
{
OUString sBrackets;
if(pFType->GetPrefix())
- sBrackets += OUString(pFType->GetPrefix());
+ sBrackets += OUStringLiteral1(pFType->GetPrefix());
if(pFType->GetSuffix())
- sBrackets += OUString(pFType->GetSuffix());
+ sBrackets += OUStringLiteral1(pFType->GetSuffix());
pDescArr[nArrayIndex]->SetAuthBrackets(sBrackets);
pDescArr[nArrayIndex]->SetAuthSequence(pFType->IsSequence());
}
@@ -433,8 +433,8 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
rSh.GetFieldType(RES_AUTHORITY, aEmptyOUStr));
if(pFType)
{
- pDescArr[nIndex]->SetAuthBrackets(OUString(pFType->GetPrefix()) +
- OUString(pFType->GetSuffix()));
+ pDescArr[nIndex]->SetAuthBrackets(OUStringLiteral1(pFType->GetPrefix()) +
+ OUStringLiteral1(pFType->GetSuffix()));
pDescArr[nIndex]->SetAuthSequence(pFType->IsSequence());
}
else
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 1a94408163b2..ec6f3a306ea5 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -56,9 +56,9 @@ IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, ModifyHdl, Edit&, void)
for (sal_Int32 i = 0; i < BookmarkTable::aForbiddenChars.getLength(); i++)
{
const sal_Int32 nTmpLen = sTmp.getLength();
- sTmp = sTmp.replaceAll(OUString(BookmarkTable::aForbiddenChars[i]), "");
+ sTmp = sTmp.replaceAll(OUStringLiteral1(BookmarkTable::aForbiddenChars[i]), "");
if (sTmp.getLength() != nTmpLen)
- sMsg += OUString(BookmarkTable::aForbiddenChars[i]);
+ sMsg += OUStringLiteral1(BookmarkTable::aForbiddenChars[i]);
}
if (sTmp.getLength() != nLen)
{
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 33de3ebcf575..9deb0fe237fd 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -98,7 +98,7 @@ static OUString lcl_GetValidShortCut( const OUString& rName )
for( ; nStart < nSz; ++nStart )
{
if( rName[nStart-1]==' ' && rName[nStart]!=' ')
- aBuf += OUString(rName[nStart]);
+ aBuf += OUStringLiteral1(rName[nStart]);
}
return aBuf;
}
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 62b81aeb8d14..19d333b660e9 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -102,9 +102,9 @@ OUString SwVbaTableHelper::getColumnStr( sal_Int32 nCol )
do{
nCalc = nCol % coDiff;
if( nCalc >= 26 )
- sRet = OUString( sal_Unicode('a' - 26 + nCalc ) ) + sRet;
+ sRet = OUStringLiteral1( 'a' - 26 + nCalc ) + sRet;
else
- sRet = OUString( sal_Unicode('A' + nCalc ) ) + sRet;
+ sRet = OUStringLiteral1( 'A' + nCalc ) + sRet;
if( 0 == ( nCol = nCol - nCalc ) )
break;
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 6d8d1dd45276..69ff6ee85fea 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -40,7 +40,7 @@ static OUString lcl_CheckGroupName( const OUString& rGroupName )
if (rtl::isAsciiAlphanumeric(cChar) ||
cChar == '_' || cChar == 0x20)
{
- sRet += OUString(cChar);
+ sRet += OUStringLiteral1(cChar);
}
}
return comphelper::string::strip(sRet, ' ');