diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-02 18:59:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-03 17:11:14 +0100 |
| commit | ab285c743afa1c8769581871d7b56374fd8c49f1 (patch) | |
| tree | d5628df49fb4db29d474e5e7b7cef4072c33153a /cui | |
| parent | f4544f3903fed3a656e3cd57e1bd83582e024b96 (diff) | |
loplugin:stringadd
tweak the plugin to be more permissive, then validate by hand
afterwards
Change-Id: I40c5c911fe6ff7e45baaca372abf7dac211d9654
Reviewed-on: https://gerrit.libreoffice.org/81942
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/SvxConfigPageHelper.cxx | 5 | ||||
| -rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx index cee19268467e..f59ccb118adc 100644 --- a/cui/source/customize/SvxConfigPageHelper.cxx +++ b/cui/source/customize/SvxConfigPageHelper.cxx @@ -196,10 +196,9 @@ sal_uInt32 SvxConfigPageHelper::generateRandomValue() OUString SvxConfigPageHelper::generateCustomURL( SvxEntries* entries ) { - OUString url = OUStringLiteral(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR; - + OUString url = OUStringLiteral(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR + // use a random number to minimize possible clash with existing custom toolbars - url += OUString::number( generateRandomValue(), 16 ); + OUString::number( generateRandomValue(), 16 ); // now check is there is an already existing entry with this url bool bFoundEntry = false; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ab63f7073a7e..265ee489912e 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -460,9 +460,8 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl, weld::Button&, void) if ((pInfo->GetId() == nId) && (pInfo->GetThemeName() != m_pThm->GetName())) { - OUString aStr( CuiResId( RID_SVXSTR_GALLERY_ID_EXISTS ) ); - - aStr += " (" + pInfo->GetThemeName() + ")"; + OUString aStr = CuiResId( RID_SVXSTR_GALLERY_ID_EXISTS ) + + " (" + pInfo->GetThemeName() + ")"; std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(m_xDialog.get(), VclMessageType::Info, VclButtonsType::Ok, |