summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-26 13:54:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-26 13:55:34 +0200
commit85c6b88e74b4a6f058cc55c2ed2772699211ce66 (patch)
treee4957456d012828bc6b7e483ba6e781db37d4542 /sd
parentcf029c125d188c22b87590f1d58d3866f9ea796a (diff)
loplugin:stringconstant: handle OUString+=OUString(literal)
Change-Id: I0d1d7f598a0c61d36d72f9d51cccdcd1071c30b6
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/drawdoc3.cxx3
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx3
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx6
-rw-r--r--sd/source/ui/dlg/tpaction.cxx3
-rw-r--r--sd/source/ui/func/fuprobjs.cxx5
5 files changed, 9 insertions, 11 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 33830602160f..e274f0370a49 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -112,7 +112,8 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc
// about this
if( bRenameDuplicates && aTest != OUString( SdResId( STR_LAYOUT_DEFAULT_NAME ) ) && pTestPage->getHash() != pBMMPage->getHash() )
{
- pBookmarkDoc->RenameLayoutTemplate( pBMMPage->GetLayoutName(), OUString(pBMMPage->GetName())+=OUString("_") );
+ pBookmarkDoc->RenameLayoutTemplate(
+ pBMMPage->GetLayoutName(), pBMMPage->GetName() + "_");
aLayout = pBMMPage->GetName();
break;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 0ff1b9705503..f6446ae0d1b4 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -520,8 +520,7 @@ void CustomAnimationPane::updateControls()
if( !aUIName.isEmpty() )
{
- aTemp += OUString( (sal_Unicode)' ' );
- aTemp += aUIName;
+ aTemp += " " + aUIName;
mpFTEffect->SetText( aTemp );
}
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 530102903100..f5a75cfc32cc 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -517,9 +517,9 @@ BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected )
{
ScopedVclPtrInstance< VirtualDevice > pVDev;
- OUString sAuthor( getInitials( mxAnnotation->getAuthor() ) );
- sAuthor += OUString( ' ' );
- sAuthor += OUString::number( mnIndex );
+ OUString sAuthor(
+ getInitials(mxAnnotation->getAuthor()) + " "
+ + OUString::number(mnIndex));
pVDev->SetFont( mrFont );
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index e038120c6a00..81a711452cae 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -844,8 +844,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination )
OUString aTmpStr( m_pLbTreeDocument->GetSelectEntry() );
if( !aTmpStr.isEmpty() )
{
- aStr += OUString(DOCUMENT_TOKEN);
- aStr += aTmpStr;
+ aStr += OUStringLiteral1<DOCUMENT_TOKEN>() + aTmpStr;
}
}
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 3946dc7fc4e5..46988bf8fed3 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -127,9 +127,8 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
else
{
ePO = (PresentationObjects) ( PO_OUTLINE_1 + nDepth - 1 );
- aStyleName += SD_RESSTR(STR_LAYOUT_OUTLINE);
- aStyleName += OUString(' ') ;
- aStyleName += OUString::number( nDepth ) ;
+ aStyleName += SD_RESSTR(STR_LAYOUT_OUTLINE) + " "
+ + OUString::number(nDepth);
}
SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh->GetStyleSheetPool();