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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/core/relations.cxx | 2 | ||||
| -rw-r--r-- | oox/source/dump/dumperbase.cxx | 2 | ||||
| -rw-r--r-- | oox/source/helper/containerhelper.cxx | 2 | ||||
| -rw-r--r-- | oox/source/helper/textinputstream.cxx | 2 | ||||
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx index 49a84d368e56..25e8646d1669 100644 --- a/oox/source/core/relations.cxx +++ b/oox/source/core/relations.cxx @@ -35,7 +35,7 @@ OUString lclRemoveFileName( const OUString& rPath ) OUString lclAppendFileName( const OUString& rPath, const OUString& rFileName ) { return rPath.isEmpty() ? rFileName : - rPath + OUStringLiteral1('/') + rFileName; + rPath + OUStringChar('/') + rFileName; } OUString createOfficeDocRelationTypeTransitional(const OUString& rType) diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index c1a5f04b4035..9f4d18165f10 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2380,7 +2380,7 @@ void XmlStreamObject::implDumpText( TextInputStream& rTextStrm ) { while( (nPos < aElem.getLength()) && (aElem[ nPos ] >= 32) ) ++nPos; if( nPos < aElem.getLength() ) - aElem = aElem.copy( 0, nPos ) + OUStringLiteral1(' ') + aElem.copy( nPos ).trim(); + aElem = aElem.copy( 0, nPos ) + OUStringChar(' ') + aElem.copy( nPos ).trim(); ++nPos; } diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index eea52e254ac2..32296fbbd8c8 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -86,7 +86,7 @@ OUString ContainerHelper::getUnusedName( OUString aNewName = rSuggestedName; sal_Int32 nIndex = -1; while( rxNameAccess->hasByName( aNewName ) ) - aNewName = rSuggestedName + OUStringLiteral1(cSeparator) + OUString::number( nIndex++ ); + aNewName = rSuggestedName + OUStringChar(cSeparator) + OUString::number( nIndex++ ); return aNewName; } diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 2884bd14d99d..3d284cfc8e72 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -194,7 +194,7 @@ OUString TextInputStream::createFinalString( const OUString& rString ) if( mcPendingChar == 0 ) return rString; - OUString aString = OUStringLiteral1( mcPendingChar ) + rString; + OUString aString = OUStringChar( mcPendingChar ) + rString; mcPendingChar = 0; return aString; } diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index c21471e5c475..e27700fec895 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -325,7 +325,7 @@ OUString ShapeBase::getShapeName() const { sal_Int32 nShapeIdx = mrDrawing.getLocalShapeIndex( getShapeId() ); if( nShapeIdx > 0 ) - return aBaseName + OUStringLiteral1(' ') + OUString::number( nShapeIdx ); + return aBaseName + OUStringChar(' ') + OUString::number( nShapeIdx ); } return OUString(); |