From 5536aea8228778e00b9f1ca8199d858cd03780ad Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Aug 2016 07:43:52 +0200 Subject: Let OUStringLiteral1 take its arg as ctor arg, not template arg ...which makes it more flexible, can now also be used on non-const arguments. The drawback of the argument no longer being a compile-time constant is remedied by making the ctor constexpr. Change-Id: Ia4903a2cc86791fece92eac0cb8406b6659dd19d --- editeng/source/editeng/editeng.cxx | 2 +- editeng/source/editeng/impedit.cxx | 2 +- editeng/source/editeng/impedit3.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 37718c5f75e4..596d4715429f 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2097,7 +2097,7 @@ void EditEngine::SetWordDelimiters( const OUString& rDelimiters ) { pImpEditEngine->aWordDelimiters = rDelimiters; if (pImpEditEngine->aWordDelimiters.indexOf(CH_FEATURE) == -1) - pImpEditEngine->aWordDelimiters += OUStringLiteral1(); + pImpEditEngine->aWordDelimiters += OUStringLiteral1(CH_FEATURE); } const OUString& EditEngine::GetWordDelimiters() const diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 2ef02909e6ee..701e66b60965 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -1482,7 +1482,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(), " " ); + aText = aText.replaceAll( OUStringLiteral1(LINE_SEP), " " ); aSel = pEditEngine->InsertText(aSel, aText); } catch( ... ) diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index f8917685c583..0ec971186558 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3225,7 +3225,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt { if ( rTextPortion.GetExtraValue() ) aText = OUString(rTextPortion.GetExtraValue()); - aText += OUStringLiteral1(); + aText += OUStringLiteral1(CH_HYPH); nTextStart = 0; nTextLen = aText.getLength(); -- cgit v1.2.3