2e33986a90
- Add few patch to get LO in more buildable state on SLE11, all upstreamed: * 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch * 0001-writerperfect-fix-gcc-4.7-build.patch * fix-old-poppler.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=293
66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
From a44b770b59d322083cac6ac22cef20ce17a89e6d Mon Sep 17 00:00:00 2001
|
|
From: Tor Lillqvist <tml@collabora.com>
|
|
Date: Fri, 5 Jun 2015 16:45:45 +0300
|
|
Subject: [PATCH] =?UTF-8?q?Fix:=20could=20not=20convert=20[...]=20?=
|
|
=?UTF-8?q?=E2=80=98const=20char*=E2=80=99=20to=20=E2=80=98const=20rtl::OU?=
|
|
=?UTF-8?q?String=E2=80=99?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Change-Id: Ib94c9f5eed0da67e846705f5c2c233c10583c791
|
|
---
|
|
svx/source/form/fmdmod.cxx | 34 +++++++++++++++++-----------------
|
|
1 file changed, 17 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
|
|
index 447ad5a..bb63fed 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] );
|
|
--
|
|
2.4.3
|
|
|