diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-06-05 16:45:45 +0300 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-18 13:10:46 +0200 |
| commit | 9284ea261eb7339733202c56e90ef881a1775afb (patch) | |
| tree | 7cbb88cc09b7054fe5951791097be281fb546abb /svx | |
| parent | 8aac888a3bd933a2c67d0104077c5ec9fee448c5 (diff) | |
Fix: could not convert [...] ‘const char*’ to ‘const rtl::OUString’
Change-Id: Ib94c9f5eed0da67e846705f5c2c233c10583c791
(cherry picked from commit a44b770b59d322083cac6ac22cef20ce17a89e6d)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmdmod.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 447ad5a65b91..bb63fed3b326 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -65,25 +65,25 @@ SAL_WNOUNREACHABLE_CODE_POP { static const OUString aSvxComponentServiceNameList[] = { - 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, + OUString(FM_SUN_COMPONENT_TEXTFIELD), + OUString(FM_SUN_COMPONENT_FORM), + OUString(FM_SUN_COMPONENT_LISTBOX), + OUString(FM_SUN_COMPONENT_COMBOBOX), + OUString(FM_SUN_COMPONENT_RADIOBUTTON), + OUString(FM_SUN_COMPONENT_GROUPBOX), + OUString(FM_SUN_COMPONENT_FIXEDTEXT), + OUString(FM_SUN_COMPONENT_COMMANDBUTTON), OUString(FM_SUN_COMPONENT_CHECKBOX), - FM_SUN_COMPONENT_GRIDCONTROL, - FM_SUN_COMPONENT_IMAGEBUTTON, - FM_SUN_COMPONENT_FILECONTROL, - FM_SUN_COMPONENT_TIMEFIELD, - FM_SUN_COMPONENT_DATEFIELD, + OUString(FM_SUN_COMPONENT_GRIDCONTROL), + OUString(FM_SUN_COMPONENT_IMAGEBUTTON), + OUString(FM_SUN_COMPONENT_FILECONTROL), + OUString(FM_SUN_COMPONENT_TIMEFIELD), + OUString(FM_SUN_COMPONENT_DATEFIELD), OUString(FM_SUN_COMPONENT_NUMERICFIELD), - FM_SUN_COMPONENT_CURRENCYFIELD, - FM_SUN_COMPONENT_PATTERNFIELD, - FM_SUN_COMPONENT_HIDDENCONTROL, - FM_SUN_COMPONENT_IMAGECONTROL + OUString(FM_SUN_COMPONENT_CURRENCYFIELD), + OUString(FM_SUN_COMPONENT_PATTERNFIELD), + OUString(FM_SUN_COMPONENT_HIDDENCONTROL), + OUString(FM_SUN_COMPONENT_IMAGECONTROL) }; static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] ); |