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 /svtools/source | |
| 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 'svtools/source')
| -rw-r--r-- | svtools/source/misc/langtab.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/urlobj/inetimg.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index de365590843e..120c82643462 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -120,7 +120,7 @@ const OUString ApplyLreOrRleEmbedding( const OUString &rText ) if (bFound) { aRes = OUString(cStart) + aRes - + OUStringLiteral1<cPopDirectionalFormat>(); + + OUStringLiteral1(cPopDirectionalFormat); } return aRes; diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 74b5beb1f728..36efa809fb4b 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -32,12 +32,12 @@ void INetImage::Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const case SotClipboardFormatId::INET_IMAGE: { OUString sString( - aImageURL + OUStringLiteral1<TOKEN_SEPARATOR>() + aTargetURL - + OUStringLiteral1<TOKEN_SEPARATOR>() + aTargetFrame - + OUStringLiteral1<TOKEN_SEPARATOR>() + aAlternateText - + OUStringLiteral1<TOKEN_SEPARATOR>() + aImageURL + OUStringLiteral1(TOKEN_SEPARATOR) + aTargetURL + + OUStringLiteral1(TOKEN_SEPARATOR) + aTargetFrame + + OUStringLiteral1(TOKEN_SEPARATOR) + aAlternateText + + OUStringLiteral1(TOKEN_SEPARATOR) + OUString::number(aSizePixel.Width()) - + OUStringLiteral1<TOKEN_SEPARATOR>() + + OUStringLiteral1(TOKEN_SEPARATOR) + OUString::number(aSizePixel.Height())); OString sOut(OUStringToOString(sString, |