summaryrefslogtreecommitdiff
path: root/sw/source/uibase/fldui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-08-30 07:43:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-08-30 07:43:52 +0200
commit5536aea8228778e00b9f1ca8199d858cd03780ad (patch)
treed244654bc3c5aa4e5b3a87df5f004ef61049996c /sw/source/uibase/fldui
parent20f6a6b159c69771dc0e087f63b6c701908e32e2 (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/uibase/fldui')
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index e6c9a174ce0f..a51dd7666f3d 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -946,10 +946,10 @@ bool SwFieldMgr::InsertField(
//JP 28.08.95: DDE-Topics/-Items can have blanks in their names!
// That's not yet considered here.
sal_Int32 nIndex = 0;
- OUString sCmd = rData.m_sPar2.replaceFirst(" ", OUStringLiteral1<sfx2::cTokenSeparator>(), &nIndex);
+ OUString sCmd = rData.m_sPar2.replaceFirst(" ", OUStringLiteral1(sfx2::cTokenSeparator), &nIndex);
if (nIndex>=0 && ++nIndex<sCmd.getLength())
{
- sCmd = sCmd.replaceFirst(" ", OUStringLiteral1<sfx2::cTokenSeparator>(), &nIndex);
+ sCmd = sCmd.replaceFirst(" ", OUStringLiteral1(sfx2::cTokenSeparator), &nIndex);
}
SwDDEFieldType aType( rData.m_sPar1, sCmd, static_cast<SfxLinkUpdateMode>(nFormatId) );
@@ -1397,10 +1397,10 @@ void SwFieldMgr::UpdateCurField(sal_uLong nFormat,
// DDE-Topics/-Items can have blanks in their names!
// That's not yet considered here!
sal_Int32 nIndex = 0;
- sPar2 = sPar2.replaceFirst(" ", OUStringLiteral1<sfx2::cTokenSeparator>(), &nIndex );
+ sPar2 = sPar2.replaceFirst(" ", OUStringLiteral1(sfx2::cTokenSeparator), &nIndex );
if (nIndex>=0 && ++nIndex<sPar2.getLength())
{
- sPar2 = sPar2.replaceFirst(" ", OUStringLiteral1<sfx2::cTokenSeparator>(), &nIndex);
+ sPar2 = sPar2.replaceFirst(" ", OUStringLiteral1(sfx2::cTokenSeparator), &nIndex);
}
break;
}