diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-18 20:45:06 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-18 20:46:06 -0500 |
commit | 62de3d17a10cb2fc4eb20992e9decd682eb1d7bb (patch) | |
tree | eff04296405915c7be57f2eb818fd3c3b32ed956 | |
parent | fc93c17a2e2186ff5e52cc2a3d8f65aadb26c44e (diff) |
Build fix for gcc 4.7.
Change-Id: I9b971928fa2737d21c225406bf2a86c088be5b9c
-rw-r--r-- | svtools/source/config/menuoptions.cxx | 8 | ||||
-rw-r--r-- | svx/source/form/fmdmod.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/fontoptions.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/localisationoptions.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/syslocaleoptions.cxx | 12 |
5 files changed, 17 insertions, 17 deletions
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index b1055eb7bdf2..c7dc8fe2d356 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -350,10 +350,10 @@ Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames() // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_DONTHIDEDISABLEDENTRIES , - PROPERTYNAME_FOLLOWMOUSE , - PROPERTYNAME_SHOWICONSINMENUES , - PROPERTYNAME_SYSTEMICONSINMENUES + OUString(PROPERTYNAME_DONTHIDEDISABLEDENTRIES) , + OUString(PROPERTYNAME_FOLLOWMOUSE) , + OUString(PROPERTYNAME_SHOWICONSINMENUES) , + OUString(PROPERTYNAME_SYSTEMICONSINMENUES) }; // Initialize return sequence with these list ... static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT ); diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index a9a1b5e5053f..e9e8a8ffc57b 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -73,13 +73,13 @@ SAL_WNOUNREACHABLE_CODE_POP FM_SUN_COMPONENT_GROUPBOX, FM_SUN_COMPONENT_FIXEDTEXT, FM_SUN_COMPONENT_COMMANDBUTTON, - FM_SUN_COMPONENT_CHECKBOX, + 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, - FM_SUN_COMPONENT_NUMERICFIELD, + OUString(FM_SUN_COMPONENT_NUMERICFIELD), FM_SUN_COMPONENT_CURRENCYFIELD, FM_SUN_COMPONENT_PATTERNFIELD, FM_SUN_COMPONENT_HIDDENCONTROL, diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index e8105029fd7f..2541c27fb748 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -254,9 +254,9 @@ Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames() // Build list of configuration key names. const OUString pProperties[] = { - PROPERTYNAME_REPLACEMENTTABLE , - PROPERTYNAME_FONTHISTORY , - PROPERTYNAME_FONTWYSIWYG , + OUString(PROPERTYNAME_REPLACEMENTTABLE) , + OUString(PROPERTYNAME_FONTHISTORY) , + OUString(PROPERTYNAME_FONTWYSIWYG) , }; // Initialize return sequence with these list ... const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT ); diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index 244fe16d6d5d..2ad2ee1fa6e0 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -221,8 +221,8 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames() // Build static list of configuration key names. const OUString aProperties[] = { - PROPERTYNAME_AUTOMNEMONIC , - PROPERTYNAME_DIALOGSCALE , + OUString(PROPERTYNAME_AUTOMNEMONIC) , + OUString(PROPERTYNAME_DIALOGSCALE) , }; // Initialize return sequence with these list ... Sequence< OUString > seqPropertyNames(aProperties, PROPERTYCOUNT); diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index cbcb7e8a8d4f..ff5da146f076 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -122,12 +122,12 @@ const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames() { const OUString pProperties[] = { - PROPERTYNAME_LOCALE, - PROPERTYNAME_UILOCALE, - PROPERTYNAME_CURRENCY, - PROPERTYNAME_DECIMALSEPARATOR, - PROPERTYNAME_DATEPATTERNS, - PROPERTYNAME_IGNORELANGCHANGE + OUString(PROPERTYNAME_LOCALE), + OUString(PROPERTYNAME_UILOCALE), + OUString(PROPERTYNAME_CURRENCY), + OUString(PROPERTYNAME_DECIMALSEPARATOR), + OUString(PROPERTYNAME_DATEPATTERNS), + OUString(PROPERTYNAME_IGNORELANGCHANGE) }; const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT ); return seqPropertyNames; |