diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-16 15:06:23 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-17 07:28:49 +0200 |
commit | 8b4719c29fc9bd7e198ad6ced301e1ff7a350f16 (patch) | |
tree | d3ec594b343f56c76056418d835d3bc7b696a9ab /svx/source | |
parent | f51cd77bcecc5134e0e04c398bfb7b34eb65d68d (diff) |
Rename OUStringLiteral1 to OUStringChar
It started out as a wrapper around character literals, but has by now become a
wrapper around arbitrary single characters. Besides updating the documentation,
this change is a mechanical
for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done
Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f
Reviewed-on: https://gerrit.libreoffice.org/80892
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/pagectrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/galmisc.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/rotmodit.cxx | 2 | ||||
-rw-r--r-- | svx/source/stbctrls/pszctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 44e5fddc8622..6119973c7ebf 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -264,7 +264,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO break; default: break; } - sText += OUStringLiteral1(cArrow); + sText += OUStringChar(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 b798263e7498..e933419c252c 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -186,11 +186,11 @@ OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen ) if (nPathPrefixLen >= 0) { aReduced = aPath.copy(0, nPathPrefixLen) + "..." - + OUStringLiteral1(aDelimiter) + aName; + + OUStringChar(aDelimiter) + aName; } else { - aReduced += "..." + OUStringLiteral1(aDelimiter) + "..." + aReduced += "..." + OUStringChar(aDelimiter) + "..." + aName.copy( aName.getLength() - (nMaxLen - 7) ); } } diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 274a01d46160..8ae88d21cf66 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -70,7 +70,7 @@ bool SvxRotateModeItem::GetPresentation( [[fallthrough]]; // break; // FALL THROUGH!!! case SfxItemPresentation::Nameless: - rText += OUStringLiteral1( GetValue() ); + rText += OUStringChar( GetValue() ); return true; break; default: ;//prevent warning diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 06877c8f06e4..ddb66bd5253a 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -78,7 +78,7 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) if( FieldUnit::NONE != eOutUnit ) { - sMetric += OUStringLiteral1(cSep); + sMetric += OUStringChar(cSep); sal_Int64 nFract = nConvVal % 100; if ( nFract < 0 ) diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 4cb6101d6f9b..86083652274f 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -320,7 +320,7 @@ void TableWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang // #i95350# force RTL output if (IsRTLEnabled()) - aText = OUStringLiteral1(0x202D) + aText; + aText = OUStringChar(0x202D) + aText; rRenderContext.DrawText(Point(nTextX, nTextY), aText); } diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 6ecd15af5d7c..0271af05eb69 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -346,10 +346,10 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) switch(mpDoc->GetPageNumType()) { case css::style::NumberingType::CHARS_UPPER_LETTER: - aPageNumValue += OUStringLiteral1( (mnPageNumber - 1) % 26 + 'A' ); + aPageNumValue += OUStringChar( (mnPageNumber - 1) % 26 + 'A' ); break; case css::style::NumberingType::CHARS_LOWER_LETTER: - aPageNumValue += OUStringLiteral1( (mnPageNumber - 1) % 26 + 'a' ); + aPageNumValue += OUStringChar( (mnPageNumber - 1) % 26 + 'a' ); break; case css::style::NumberingType::ROMAN_UPPER: bUpper = true; |