summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-08-30 15:30:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-08-30 15:30:04 +0200
commit8baef341d5a6f6199f4bce2ab88d53b471d7a760 (patch)
tree0444056b8ef4cb2822073a59484846c41bd52eeb /vcl
parente29b6be3c4c7843459ba7b9307af3272c4d94fff (diff)
loplugin:stringconstant: adapt to improved OUStringLiteral1 (vcl)
Change-Id: Ic04f33413713b592c10ebf27c1e3460a44e3794f
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/combobox.cxx4
-rw-r--r--vcl/source/control/edit.cxx2
-rw-r--r--vcl/source/control/quickselectionengine.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
-rw-r--r--vcl/source/outdev/text.cxx4
5 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index ddc49a973f57..9c5aa7c62bd0 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -422,11 +422,11 @@ IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void)
if ( !aSelInText.count( nP ) )
{
if (!aText.isEmpty() && (aText[aText.getLength()-1] != m_cMultiSep))
- aText += OUString(m_cMultiSep);
+ aText += OUStringLiteral1(m_cMultiSep);
if ( !aText.isEmpty() )
aText += " "; // slightly loosen
aText += m_pImplLB->GetEntryList()->GetEntryText( nP );
- aText += OUString(m_cMultiSep);
+ aText += OUStringLiteral1(m_cMultiSep);
}
}
aText = comphelper::string::stripEnd( aText, m_cMultiSep );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d4d993684cf3..fcd35f9bbeb8 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2330,7 +2330,7 @@ OUString TextFilter::filter(const OUString &rText)
OUString sTemp(rText);
for (sal_Int32 i = 0; i < sForbiddenChars.getLength(); ++i)
{
- sTemp = sTemp.replaceAll(OUString(sForbiddenChars[i]), "");
+ sTemp = sTemp.replaceAll(OUStringLiteral1(sForbiddenChars[i]), "");
}
return sTemp;
}
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index 146b48e399ac..1e2e251dd383 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -117,7 +117,7 @@ namespace vcl
if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() )
{
- m_pData->sCurrentSearchString += OUString(c);
+ m_pData->sCurrentSearchString += OUStringLiteral1(c);
OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() );
if ( m_pData->sCurrentSearchString.getLength() == 1 )
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 76beeaa9df7a..e80d9864d5fe 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7715,7 +7715,7 @@ static void escapeStringXML( const OUString& rStr, OUString &rValue)
rValue += "&quot;";
break;
default:
- rValue += OUString( *pUni );
+ rValue += OUStringLiteral1( *pUni );
break;
}
}
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 4368113c807d..8dfd44ddf2fe 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -881,7 +881,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
{
pVector->push_back( *it );
if( pDisplayText )
- *pDisplayText += OUString(rStr[ nIndex ]);
+ *pDisplayText += OUStringLiteral1(rStr[ nIndex ]);
bInserted = true;
}
}
@@ -2043,7 +2043,7 @@ OUString OutputDevice::ImplGetEllipsisString( const OutputDevice& rTargetDevice,
}
if ( aStr.isEmpty() && (nStyle & DrawTextFlags::Clip) )
- aStr += OUString(rOrigStr[ 0 ]);
+ aStr += OUStringLiteral1(rOrigStr[ 0 ]);
}
else if ( nStyle & DrawTextFlags::PathEllipsis )
{