diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 15:29:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 15:29:36 +0200 |
| commit | 185c3c8207de78ebb4f4dc053b5fe16f810929cc (patch) | |
| tree | 9456b32dbdabaf488b8f70265daa34202d46f3a6 | |
| parent | 4d21c085e6acdc6b61d0e890ebcabeb4a4b8151e (diff) | |
loplugin:stringconstant: adapt to improved OUStringLiteral1 (svx)
Change-Id: I4d95f15896327101c1c19abc00edcecd7fee26a2
| -rw-r--r-- | svx/source/dialog/pagectrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/gallery2/galmisc.cxx | 12 | ||||
| -rw-r--r-- | svx/source/items/rotmodit.cxx | 2 | ||||
| -rw-r--r-- | svx/source/stbctrls/pszctrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 4 |
5 files changed, 9 insertions, 13 deletions
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 2f727e93fe47..f5e12ddeb840 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -285,7 +285,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO aMove.X() = 0; break; } - sText += OUString(cArrow); + sText += OUStringLiteral1(cArrow); for (sal_Int32 i = 0; i < sText.getLength(); i++) { OUString sDraw(sText.copy(i,1)); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 1fb0777fd016..2578ac37a06c 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -204,17 +204,13 @@ OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen ) if (nPathPrefixLen >= 0) { - aReduced = aPath.copy(0, nPathPrefixLen); - aReduced += "..."; - aReduced += OUString(aDelimiter); - aReduced += aName; + aReduced = aPath.copy(0, nPathPrefixLen) + "..." + + OUStringLiteral1(aDelimiter) + aName; } else { - aReduced += "..."; - aReduced += OUString(aDelimiter); - aReduced += "..."; - aReduced += aName.copy( aName.getLength() - (nMaxLen - 7) ); + aReduced += "..." + OUStringLiteral1(aDelimiter) + "..." + + aName.copy( aName.getLength() - (nMaxLen - 7) ); } } else diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 7c00734edb2a..1ea243ed946b 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -78,7 +78,7 @@ bool SvxRotateModeItem::GetPresentation( SAL_FALLTHROUGH; // break; // FALL THROUGH!!! case SFX_ITEM_PRESENTATION_NAMELESS: - rText += OUString( sal_Unicode(GetValue()) ); + rText += OUStringLiteral1( GetValue() ); return true; break; default: ;//prevent warning diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 0f27306cfd78..d623a86fd006 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -73,7 +73,7 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) if( FUNIT_NONE != eOutUnit ) { - sMetric += OUString(cSep); + sMetric += OUStringLiteral1(cSep); sal_Int64 nFract = nConvVal % 100; if ( nFract < 0 ) diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 3d734ad26ab8..e87055b3a95e 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -356,10 +356,10 @@ IMPL_LINK_TYPED(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) switch(mpDoc->GetPageNumType()) { case SVX_CHARS_UPPER_LETTER: - aPageNumValue += OUString( (sal_Unicode)(char)((mnPageNumber - 1) % 26 + 'A') ); + aPageNumValue += OUStringLiteral1( (mnPageNumber - 1) % 26 + 'A' ); break; case SVX_CHARS_LOWER_LETTER: - aPageNumValue += OUString( (sal_Unicode)(char)((mnPageNumber - 1) % 26 + 'a') ); + aPageNumValue += OUStringLiteral1( (mnPageNumber - 1) % 26 + 'a' ); break; case SVX_ROMAN_UPPER: bUpper = true; |