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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 00c9feb3642c..0c6c28a1a68e 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1056,7 +1056,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 break; case SVX_NUM_NUMBER_LOWER_ZH : { - if ( sSuffix == OUStringLiteral1<0xff0e>() ) + if ( sSuffix == OUStringLiteral1(0xff0e) ) nMappedNumType = 0x260001; // Japanese with double-byte period. else if ( !sSuffix.isEmpty() ) nMappedNumType = 0x1B0001; // Japanese/Korean with single-byte period. diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 9e158bdd22bc..8579ce9f4f4b 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -831,7 +831,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) OUString aTmpStr( m_pLbTreeDocument->GetSelectEntry() ); if( !aTmpStr.isEmpty() ) { - aStr += OUStringLiteral1<DOCUMENT_TOKEN>() + aTmpStr; + aStr += OUStringLiteral1(DOCUMENT_TOKEN) + aTmpStr; } } diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 06f49290ae97..4f38e6204a3d 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -585,7 +585,7 @@ void SdTpOptionsMisc::SetDrawMode() OUString SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY ) { - return OUString::number(nX) + OUStringLiteral1<TOKEN>() + OUString::number(nY); + return OUString::number(nX) + OUStringLiteral1(TOKEN) + OUString::number(nY); } bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ) |