summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-16 15:06:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-17 07:28:49 +0200
commit8b4719c29fc9bd7e198ad6ced301e1ff7a350f16 (patch)
treed3ec594b343f56c76056418d835d3bc7b696a9ab /editeng
parentf51cd77bcecc5134e0e04c398bfb7b34eb65d68d (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 'editeng')
-rw-r--r--editeng/source/accessibility/AccessibleStaticTextBase.cxx6
-rw-r--r--editeng/source/editeng/editeng.cxx2
-rw-r--r--editeng/source/editeng/impedit.cxx2
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--editeng/source/editeng/impedit4.cxx4
-rw-r--r--editeng/source/items/bulitem.cxx2
-rw-r--r--editeng/source/items/textitem.cxx4
-rw-r--r--editeng/source/lookuptree/Trie.cxx2
-rw-r--r--editeng/source/outliner/outliner.cxx2
9 files changed, 13 insertions, 13 deletions
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 048f757542fe..c85cc3c9a589 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -719,11 +719,11 @@ namespace accessibility
//or at the end of the result string.
if ( bStart )
{
- aRes.insert(0, OUStringLiteral1(cNewLine));
+ aRes.insert(0, OUStringChar(cNewLine));
}
if ( bEnd )
{
- aRes.append(OUStringLiteral1(cNewLine));
+ aRes.append(OUStringChar(cNewLine));
}
return aRes.makeStringAndClear();
}
@@ -859,7 +859,7 @@ namespace accessibility
mpImpl->CorrectTextSegment( aResult, aPos.nPara );
if ( bLineBreak )
{
- aResult.SegmentText = OUStringLiteral1(cNewLine) + aResult.SegmentText;
+ aResult.SegmentText = OUStringChar(cNewLine) + aResult.SegmentText;
}
}
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index d787bc65628c..7d72d45c3194 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2145,7 +2145,7 @@ void EditEngine::SetWordDelimiters( const OUString& rDelimiters )
{
pImpEditEngine->aWordDelimiters = rDelimiters;
if (pImpEditEngine->aWordDelimiters.indexOf(CH_FEATURE) == -1)
- pImpEditEngine->aWordDelimiters += OUStringLiteral1(CH_FEATURE);
+ pImpEditEngine->aWordDelimiters += OUStringChar(CH_FEATURE);
}
const OUString& EditEngine::GetWordDelimiters() const
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 1137a1447e61..5006cd620d18 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1620,7 +1620,7 @@ void ImpEditView::Paste( css::uno::Reference< css::datatransfer::clipboard::XCli
OUString aTmpText;
aData >>= aTmpText;
OUString aText(convertLineEnd(aTmpText, LINEEND_LF));
- aText = aText.replaceAll( OUStringLiteral1(LINE_SEP), " " );
+ aText = aText.replaceAll( OUStringChar(LINE_SEP), " " );
aSel = pEditEngine->InsertText(aSel, aText);
}
catch( ... )
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 846687d763f8..826bdea59998 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3365,7 +3365,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po
{
if ( rTextPortion.GetExtraValue() )
aText = OUString(rTextPortion.GetExtraValue());
- aText += OUStringLiteral1(CH_HYPH);
+ aText += OUStringChar(CH_HYPH);
nTextStart = 0;
nTextLen = aText.getLength();
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 8a35b36c8beb..f1cb5072735b 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1830,7 +1830,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
if ( cNext == '.' )
{
aCurSel.Max().SetIndex( aCurSel.Max().GetIndex()+1 );
- aWord += OUStringLiteral1(cNext);
+ aWord += OUStringChar(cNext);
}
}
@@ -1880,7 +1880,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r
if ( cNext == '.' )
{
aCurSel.Max().SetIndex( aCurSel.Max().GetIndex()+1 );
- aWord += OUStringLiteral1(cNext);
+ aWord += OUStringChar(cNext);
}
}
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 97b9b5370064..2b87196da1b6 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -122,7 +122,7 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
OUString SvxBulletItem::GetFullText() const
{
- return aPrevText + OUStringLiteral1(cSymbol) + aFollowText;
+ return aPrevText + OUStringChar(cSymbol) + aFollowText;
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ae7239a8e878..afd053da51e7 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2163,9 +2163,9 @@ bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/,
{
rText = EditResId( RID_SVXITEMS_TWOLINES );
if( GetStartBracket() )
- rText = OUStringLiteral1(GetStartBracket()) + rText;
+ rText = OUStringChar(GetStartBracket()) + rText;
if( GetEndBracket() )
- rText += OUStringLiteral1(GetEndBracket());
+ rText += OUStringChar(GetEndBracket());
}
return true;
}
diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx
index 184330ef4f2f..87a285fcdddc 100644
--- a/editeng/source/lookuptree/Trie.cxx
+++ b/editeng/source/lookuptree/Trie.cxx
@@ -99,7 +99,7 @@ void TrieNode::collectSuggestions(const OUString& sPath, vector<OUString>& rSugg
void TrieNode::collectSuggestionsForCurrentNode(TrieNode* pCurrent, const OUString& sPath, vector<OUString>& rSuggestionList)
{
- OUString aStringPath = sPath + OUStringLiteral1(pCurrent->mCharacter);
+ OUString aStringPath = sPath + OUStringChar(pCurrent->mCharacter);
if(pCurrent->mMarker)
{
rSuggestionList.push_back(aStringPath);
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index c6116b3b9520..e841c1fac408 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1846,7 +1846,7 @@ void Outliner::ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRec
aBulletText += pFmt->GetPrefix();
if( pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL )
{
- aBulletText += OUStringLiteral1(pFmt->GetBulletChar());
+ aBulletText += OUStringChar(pFmt->GetBulletChar());
}
else if( pFmt->GetNumberingType() != SVX_NUM_NUMBER_NONE )
{