diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-16 17:14:07 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-17 16:12:02 +0000 |
commit | 83d2c5180d255532b7cdf5d2922fee1cf056eef3 (patch) | |
tree | 7a58db4a6723008afe96e17185a69aa17a864e1f /svx | |
parent | 87707670c993794ab12b0fad0f048f11429269c2 (diff) |
Adapt to no-longer explicit OUStringLiteral ctor
...from previous commit
Change-Id: I062b7cd212c17e7eb5274476e6859228d0477c7f
Reviewed-on: https://gerrit.libreoffice.org/32098
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 8 | ||||
-rw-r--r-- | svx/source/form/fmdmod.cxx | 38 | ||||
-rw-r--r-- | svx/source/form/fmundo.cxx | 8 |
3 files changed, 27 insertions, 27 deletions
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 57f359ea8001..eb80bbadf41b 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1596,8 +1596,8 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol) { static const OUStringLiteral aPropsListenedTo[] = { - OUStringLiteral(FM_PROP_LABEL), OUStringLiteral(FM_PROP_WIDTH), OUStringLiteral(FM_PROP_HIDDEN), - OUStringLiteral(FM_PROP_ALIGN), OUStringLiteral(FM_PROP_FORMATKEY) + FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN, + FM_PROP_FORMATKEY }; // as not all properties have to be supported by all columns we have to check this @@ -1621,8 +1621,8 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol) // we have to do it this way .... static const OUStringLiteral aPropsListenedTo[] = { - OUStringLiteral(FM_PROP_LABEL), OUStringLiteral(FM_PROP_WIDTH), OUStringLiteral(FM_PROP_HIDDEN), - OUStringLiteral(FM_PROP_ALIGN), OUStringLiteral(FM_PROP_FORMATKEY) + FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN, + FM_PROP_FORMATKEY }; Reference< XPropertySetInfo > xInfo = xCol->getPropertySetInfo(); diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 0578d9f9dc41..a3c96f8fdc9c 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -51,25 +51,25 @@ using namespace ::svxform; { static const OUStringLiteral aSvxComponentServiceNameList[] = { - OUStringLiteral(FM_SUN_COMPONENT_TEXTFIELD), - OUStringLiteral(FM_SUN_COMPONENT_FORM), - OUStringLiteral(FM_SUN_COMPONENT_LISTBOX), - OUStringLiteral(FM_SUN_COMPONENT_COMBOBOX), - OUStringLiteral(FM_SUN_COMPONENT_RADIOBUTTON), - OUStringLiteral(FM_SUN_COMPONENT_GROUPBOX), - OUStringLiteral(FM_SUN_COMPONENT_FIXEDTEXT), - OUStringLiteral(FM_SUN_COMPONENT_COMMANDBUTTON), - OUStringLiteral(FM_SUN_COMPONENT_CHECKBOX), - OUStringLiteral(FM_SUN_COMPONENT_GRIDCONTROL), - OUStringLiteral(FM_SUN_COMPONENT_IMAGEBUTTON), - OUStringLiteral(FM_SUN_COMPONENT_FILECONTROL), - OUStringLiteral(FM_SUN_COMPONENT_TIMEFIELD), - OUStringLiteral(FM_SUN_COMPONENT_DATEFIELD), - OUStringLiteral(FM_SUN_COMPONENT_NUMERICFIELD), - OUStringLiteral(FM_SUN_COMPONENT_CURRENCYFIELD), - OUStringLiteral(FM_SUN_COMPONENT_PATTERNFIELD), - OUStringLiteral(FM_SUN_COMPONENT_HIDDENCONTROL), - OUStringLiteral(FM_SUN_COMPONENT_IMAGECONTROL) + FM_SUN_COMPONENT_TEXTFIELD, + FM_SUN_COMPONENT_FORM, + FM_SUN_COMPONENT_LISTBOX, + FM_SUN_COMPONENT_COMBOBOX, + FM_SUN_COMPONENT_RADIOBUTTON, + FM_SUN_COMPONENT_GROUPBOX, + FM_SUN_COMPONENT_FIXEDTEXT, + FM_SUN_COMPONENT_COMMANDBUTTON, + FM_SUN_COMPONENT_CHECKBOX, + FM_SUN_COMPONENT_GRIDCONTROL, + FM_SUN_COMPONENT_IMAGEBUTTON, + FM_SUN_COMPONENT_FILECONTROL, + FM_SUN_COMPONENT_TIMEFIELD, + FM_SUN_COMPONENT_DATEFIELD, + FM_SUN_COMPONENT_NUMERICFIELD, + FM_SUN_COMPONENT_CURRENCYFIELD, + FM_SUN_COMPONENT_PATTERNFIELD, + FM_SUN_COMPONENT_HIDDENCONTROL, + FM_SUN_COMPONENT_IMAGECONTROL }; static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList); diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index da616c8bf9fe..6aecd03c1d44 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -537,12 +537,12 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // if it's a "default value" property of a control model, set the according "value" property static const OUStringLiteral pDefaultValueProperties[] = { - OUStringLiteral(FM_PROP_DEFAULT_TEXT), OUStringLiteral(FM_PROP_DEFAULTCHECKED), OUStringLiteral(FM_PROP_DEFAULT_DATE), OUStringLiteral(FM_PROP_DEFAULT_TIME), - OUStringLiteral(FM_PROP_DEFAULT_VALUE), OUStringLiteral(FM_PROP_DEFAULT_SELECT_SEQ), OUStringLiteral(FM_PROP_EFFECTIVE_DEFAULT) + FM_PROP_DEFAULT_TEXT, FM_PROP_DEFAULTCHECKED, FM_PROP_DEFAULT_DATE, FM_PROP_DEFAULT_TIME, + FM_PROP_DEFAULT_VALUE, FM_PROP_DEFAULT_SELECT_SEQ, FM_PROP_EFFECTIVE_DEFAULT }; static const OUStringLiteral aValueProperties[] = { - OUStringLiteral(FM_PROP_TEXT), OUStringLiteral(FM_PROP_STATE), OUStringLiteral(FM_PROP_DATE), OUStringLiteral(FM_PROP_TIME), - OUStringLiteral(FM_PROP_VALUE), OUStringLiteral(FM_PROP_SELECT_SEQ), OUStringLiteral(FM_PROP_EFFECTIVE_VALUE) + FM_PROP_TEXT, FM_PROP_STATE, FM_PROP_DATE, FM_PROP_TIME, + FM_PROP_VALUE, FM_PROP_SELECT_SEQ, FM_PROP_EFFECTIVE_VALUE }; sal_Int32 nDefaultValueProps = SAL_N_ELEMENTS(pDefaultValueProperties); OSL_ENSURE(SAL_N_ELEMENTS(aValueProperties) == nDefaultValueProps, |