download.lst | 2 +-
svtools/source/config/menuoptions.cxx | 8 ++++----
svx/source/form/fmdmod.cxx | 4 ++--
unotools/source/config/fontoptions.cxx | 6 +++---
unotools/source/config/localisationoptions.cxx | 4 ++--
unotools/source/config/syslocaleoptions.cxx | 12 ++++++------
6 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit b7e61384f135f9f513659bcfd2502a9d00acd2f9
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date: Thu Dec 18 15:21:12 2014 -0500
Update mdds to 0.11.2.
Change-Id: I1c331863df2b1e560ba8a3d5b7dde67cce59b2df
diff --git a/download.lst b/download.lst
index 9afac7b..c2e5949 100644
--- a/download.lst
+++ b/download.lst
@@ -99,7 +99,7 @@ export LIBXML_TARBALL :=
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
export LIBXSLT_TARBALL :=
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_TARBALL :=
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2
+export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
export MWAW_MD5SUM := 19b879c2a27251db6fb274d6c585d488
commit 62de3d17a10cb2fc4eb20992e9decd682eb1d7bb
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date: Thu Dec 18 20:45:06 2014 -0500
Build fix for gcc 4.7.
Change-Id: I9b971928fa2737d21c225406bf2a86c088be5b9c
diff --git a/svtools/source/config/menuoptions.cxx
b/svtools/source/config/menuoptions.cxx
index b1055eb..c7dc8fe 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 a9a1b5e..e9e8a8f 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 e810502..2541c27 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 244fe16..2ad2ee1 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 cbcb7e8..ff5da14 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
