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 /sw/source/core/edit | |
| 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 'sw/source/core/edit')
| -rw-r--r-- | sw/source/core/edit/autofmt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/edit/editsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/edit/edlingu.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 0cf4b47652c9..61a87aa71012 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -764,12 +764,12 @@ sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTextNode& rNd, sal_Int32& rPos, } if( pNumTypes ) - *pNumTypes += OUStringLiteral1<'0' + SVX_NUM_ARABIC>(); + *pNumTypes += OUStringLiteral1('0' + SVX_NUM_ARABIC); eScan = eScan | CHG; } else if( pNumTypes && !(eScan & DIGIT) ) - *pNumTypes += OUStringLiteral1<'0' + SVX_NUM_ARABIC>(); + *pNumTypes += OUStringLiteral1('0' + SVX_NUM_ARABIC); eScan &= ~DELIM; // remove Delim if( 0 != (eScan & ~CHG) && DIGIT != (eScan & ~CHG)) diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 83cc9dfd9793..7fa98e0be980 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -673,7 +673,7 @@ void SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr ) OUString sText( pTextNd->GetExpandText( rAttr.GetStart(), *rAttr.GetEnd() - rAttr.GetStart() ) ); - sText = sText.replaceAll(OUStringLiteral1<0x0a>(), ""); + sText = sText.replaceAll(OUStringLiteral1(0x0a), ""); sText = comphelper::string::strip(sText, ' '); if( !sText.isEmpty() ) diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 6928e48494ad..4d0c46eb6e83 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -861,8 +861,8 @@ uno::Reference< XSpellAlternatives > if( pWrong->InWrongWord(nBegin,nLen) && !pNode->IsSymbol(nBegin) ) { const OUString aText(pNode->GetText().copy(nBegin, nLen)); - OUString aWord = aText.replaceAll(OUStringLiteral1<CH_TXTATR_BREAKWORD>(), "") - .replaceAll(OUStringLiteral1<CH_TXTATR_INWORD>(), ""); + OUString aWord = aText.replaceAll(OUStringLiteral1(CH_TXTATR_BREAKWORD), "") + .replaceAll(OUStringLiteral1(CH_TXTATR_INWORD), ""); uno::Reference< XSpellChecker1 > xSpell( ::GetSpellChecker() ); if( xSpell.is() ) |