[Libreoffice-commits] core.git: sc/inc sc/source
Eike Rathke
erack at redhat.com
Wed Oct 30 15:34:04 CET 2013
sc/inc/helpids.h | 2 ++
sc/source/ui/src/scfuncs.src | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit fe0037e045036419b6c6b5fc979328d500dd4d08
Author: Eike Rathke <erack at redhat.com>
Date: Wed Oct 30 15:28:56 2013 +0100
using dbgutil builds is good for you (TM)
Init of function description resources displayed
"Class: 272, Id: 412. Classpointer not at the end!"
that was due to resource SC_OPCODE_WEBSERVICE having an extraneous
parameter flag in ExtraData that wasn't read because the function has 1
and not 2 parameters.
Additionally added HID_FUNC_FILTERXML and HID_FUNC_WEBSERVICE where the
resources used a copy&paste HID_FUNC_BITLSHIFT instead.
Change-Id: Iaf5a860901d5e02581965a4b33cfc50c1a601b1f
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index f772fc7..648ff4f 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -676,5 +676,7 @@
#define HID_FUNC_BITXOR "SC_HID_FUNC_BITXOR"
#define HID_FUNC_BITLSHIFT "SC_HID_FUNC_BITLSHIFT"
#define HID_FUNC_BITRSHIFT "SC_HID_FUNC_BITRSHIFT"
+#define HID_FUNC_FILTERXML "SC_HID_FUNC_FILTERXML"
+#define HID_FUNC_WEBSERVICE "SC_HID_FUNC_WEBSERVICE"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 11fdecb..8b8d2ca 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -9850,7 +9850,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
0;
ID_FUNCTION_GRP_TEXT;
- U2S( HID_FUNC_BITLSHIFT );
+ U2S( HID_FUNC_FILTERXML );
2; 0; 0;
0;
};
@@ -9885,8 +9885,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
{
0;
ID_FUNCTION_GRP_TEXT;
- U2S( HID_FUNC_BITLSHIFT );
- 1; 0; 0;
+ U2S( HID_FUNC_WEBSERVICE );
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
More information about the Libreoffice-commits
mailing list