mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix for gcc 4.7.

Browse Source 
Change-Id: I9b971928fa2737d21c225406bf2a86c088be5b9c
This commit is contained in:
Kohei Yoshida
2014-12-18 20:45:06 -05:00
parent fc93c17a2e
commit 62de3d17a1
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
svtools/source/config/menuoptions.cxx
View File

@@ -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 );

4
svx/source/form/fmdmod.cxx
View File

@@ -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,

6
unotools/source/config/fontoptions.cxx
View File

@@ -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 );

4
unotools/source/config/localisationoptions.cxx
View File

@@ -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);

12
unotools/source/config/syslocaleoptions.cxx
View File

@@ -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;