diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-02 19:52:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-02 21:47:38 +0100 |
| commit | 7f305223fa6d6a1ad4a6f906b14f879cb01539be (patch) | |
| tree | c48f2af6875094ab09853058323c804c6cb36d4c /extensions | |
| parent | ed94101d8c399f6de2e2b9b7cd31dd6b68d269a8 (diff) | |
New loplugin:conditionalstring
Change-Id: I2eab990c15f845b44a3b598571aca361dadf9ff3
Reviewed-on: https://gerrit.libreoffice.org/81946
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 6 | ||||
| -rw-r--r-- | extensions/source/propctrlr/selectlabeldialog.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 3983d241ea72..7feca01b5a55 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -997,8 +997,8 @@ namespace pcr aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow() ); aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId - ? OUString(UID_PROP_DLG_ATTR_TARGET_URL) - : OUString(UID_PROP_DLG_IMAGE_URL); + ? OUStringLiteral(UID_PROP_DLG_ATTR_TARGET_URL) + : OUStringLiteral(UID_PROP_DLG_IMAGE_URL); } break; @@ -1371,7 +1371,7 @@ namespace pcr aDescriptor.HasSecondaryButton = true; bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; - aDescriptor.Category = bIsDataProperty ? OUString("Data") : OUString("General"); + aDescriptor.Category = bIsDataProperty ? OUStringLiteral("Data") : OUStringLiteral("General"); return aDescriptor; } diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index e1aee794cc63..2f963ea81c5c 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -88,8 +88,8 @@ namespace pcr // check which service the allowed components must support sal_Int16 nClassId = 0; try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { } - m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT); - m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(RID_EXTBMP_GROUPBOX) : OUString(RID_EXTBMP_FIXEDTEXT); + m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(SERVICE_COMPONENT_GROUPBOX) : OUStringLiteral(SERVICE_COMPONENT_FIXEDTEXT); + m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT); // calc the currently set label control (so InsertEntries can calc m_xInitialSelection) Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) ); |