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/ui/misc/glosbib.cxx | |
| 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/ui/misc/glosbib.cxx')
| -rw-r--r-- | sw/source/ui/misc/glosbib.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 576e8821ecb8..9f7942147a9a 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -210,7 +210,7 @@ IMPL_LINK_NOARG_TYPED( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void ) IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, NewHdl, Button*, void) { OUString sGroup = m_pNameED->GetText() - + OUStringLiteral1<GLOS_DELIM>() + + OUStringLiteral1(GLOS_DELIM) + OUString::number(m_pPathLB->GetSelectEntryPos()); OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!"); m_InsertedArr.push_back(sGroup); @@ -283,7 +283,7 @@ IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, RenameHdl, Button*, void) const OUString sNewTitle(m_pNameED->GetText()); OUString sNewName = sNewTitle - + OUStringLiteral1<GLOS_DELIM>() + + OUStringLiteral1(GLOS_DELIM) + OUString::number(m_pPathLB->GetSelectEntryPos()); OSL_ENSURE(!pGlosHdl->FindGroupName(sNewName), "group already available!"); @@ -302,8 +302,8 @@ IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, RenameHdl, Button*, void) } if(!bDone) { - sEntry += OUStringLiteral1<RENAME_TOKEN_DELIM>() + sNewName - + OUStringLiteral1<RENAME_TOKEN_DELIM>() + sNewTitle; + sEntry += OUStringLiteral1(RENAME_TOKEN_DELIM) + sNewName + + OUStringLiteral1(RENAME_TOKEN_DELIM) + sNewTitle; m_RenamedArr.push_back(sEntry); } delete static_cast<GlosBibUserData*>(pEntry->GetUserData()); |