diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 07:43:52 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 07:43:52 +0200 |
commit | 5536aea8228778e00b9f1ca8199d858cd03780ad (patch) | |
tree | d244654bc3c5aa4e5b3a87df5f004ef61049996c /editeng | |
parent | 20f6a6b159c69771dc0e087f63b6c701908e32e2 (diff) |
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
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
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<CH_FEATURE>(); + 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<LINE_SEP>(), " " ); + 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<CH_HYPH>(); + aText += OUStringLiteral1(CH_HYPH); nTextStart = 0; nTextLen = aText.getLength(); |