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/tox | |
| 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/tox')
| -rw-r--r-- | sw/source/core/tox/tox.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/tox/txmsrt.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 70f58388125f..83d42b8074da 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -620,9 +620,9 @@ OUString SwFormToken::GetString() const + OUString::number( nOutlineLevel ); break; case TOKEN_TEXT: - sData += OUStringLiteral1<TOX_STYLE_DELIMITER>() - + sText.replaceAll(OUStringLiteral1<TOX_STYLE_DELIMITER>(), "") - + OUStringLiteral1<TOX_STYLE_DELIMITER>(); + sData += OUStringLiteral1(TOX_STYLE_DELIMITER) + + sText.replaceAll(OUStringLiteral1(TOX_STYLE_DELIMITER), "") + + OUStringLiteral1(TOX_STYLE_DELIMITER); break; case TOKEN_AUTHORITY: if (nAuthorityField<10) diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 955fd898e6fc..65393a506fa6 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -587,7 +587,7 @@ OUString SwTOXPara::GetURL() const SwFrameFormat* pFly = pNd->GetFlyFormat(); if( pFly ) { - aText = "#" + pFly->GetName() + OUStringLiteral1<cMarkSeparator>(); + aText = "#" + pFly->GetName() + OUStringLiteral1(cMarkSeparator); const sal_Char* pStr; switch( eType ) { @@ -603,7 +603,7 @@ OUString SwTOXPara::GetURL() const break; case nsSwTOXElement::TOX_SEQUENCE: { - aText = "#" + m_sSequenceName + OUStringLiteral1<cMarkSeparator>() + aText = "#" + m_sSequenceName + OUStringLiteral1(cMarkSeparator) + "sequence"; } break; @@ -655,7 +655,7 @@ OUString SwTOXTable::GetURL() const if ( sName.isEmpty() ) return OUString(); - return "#" + sName + OUStringLiteral1<cMarkSeparator>() + "table"; + return "#" + sName + OUStringLiteral1(cMarkSeparator) + "table"; } SwTOXAuthority::SwTOXAuthority( const SwContentNode& rNd, |