offapi/com/sun/star/sheet/DataResult.idl | 2 +-
offapi/com/sun/star/sheet/DataResultFlags.idl | 2 +-
offapi/com/sun/star/sheet/MemberResult.idl | 2 +-
offapi/com/sun/star/sheet/MemberResultFlags.idl | 2 +-
offapi/type_reference/types.rdb |binary
offapi/type_reference/update-rdb.sh | 4 ++--
registry/source/reflread.cxx | 2 +-
registry/source/registry.cxx | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit ee82f4e21dc8f58216c51f0303d4a309f1e871c0
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Thu Jan 3 23:29:16 2013 +0100
API CHANGE: unpublish more Data Pilot interfaces
Change-Id: I2e957f174bcafadf4f2cbad7ba3b2e40d22be4e4
STRUCT: /UCR/com/sun/star/sheet/DataResult
published in 1 but unpublished in 2
CONSTANTS: /UCR/com/sun/star/sheet/DataResultFlags
published in 1 but unpublished in 2
STRUCT: /UCR/com/sun/star/sheet/MemberResult
published in 1 but unpublished in 2
CONSTANTS: /UCR/com/sun/star/sheet/MemberResultFlags
published in 1 but unpublished in 2
(cherry picked from commit bcb152889759c76aa9681aa72fcf7a92e5c3a2d7)
Conflicts:
offapi/type_reference/types.rdb
diff --git a/offapi/com/sun/star/sheet/DataResult.idl
b/offapi/com/sun/star/sheet/DataResult.idl
index d6fccd9..5c8a3ec 100644
--- a/offapi/com/sun/star/sheet/DataResult.idl
+++ b/offapi/com/sun/star/sheet/DataResult.idl
@@ -28,7 +28,7 @@ module com { module sun { module star { module sheet {
@see com::sun::star::sheet::XDataPilotResults
*/
-published struct DataResult
+struct DataResult
{
/** contains boolean flags describing the result.
diff --git a/offapi/com/sun/star/sheet/DataResultFlags.idl
b/offapi/com/sun/star/sheet/DataResultFlags.idl
index 68869ab..25641fb 100644
--- a/offapi/com/sun/star/sheet/DataResultFlags.idl
+++ b/offapi/com/sun/star/sheet/DataResultFlags.idl
@@ -29,7 +29,7 @@ module com { module sun { module star { module sheet {
@see com::sun::star::sheet::DataResult
*/
-published constants DataResultFlags
+constants DataResultFlags
{
/** The element contains data.
diff --git a/offapi/com/sun/star/sheet/MemberResult.idl
b/offapi/com/sun/star/sheet/MemberResult.idl
index 1d34338..8cb4c22 100644
--- a/offapi/com/sun/star/sheet/MemberResult.idl
+++ b/offapi/com/sun/star/sheet/MemberResult.idl
@@ -28,7 +28,7 @@ module com { module sun { module star { module sheet {
@see com::sun::star::sheet::XDataPilotMemberResults
*/
-published struct MemberResult
+struct MemberResult
{
/** the internal name of the field.
*/
diff --git a/offapi/com/sun/star/sheet/MemberResultFlags.idl
b/offapi/com/sun/star/sheet/MemberResultFlags.idl
index 5d5f064..4e3aed2 100644
--- a/offapi/com/sun/star/sheet/MemberResultFlags.idl
+++ b/offapi/com/sun/star/sheet/MemberResultFlags.idl
@@ -26,7 +26,7 @@ module com { module sun { module star { module sheet {
/** used to give information about elements in data pilot member results.
*/
-published constants MemberResultFlags
+constants MemberResultFlags
{
/** The element contains a member.
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index ae39ecb..b9e6624 100644
Binary files a/offapi/type_reference/types.rdb and
b/offapi/type_reference/types.rdb differ
commit 0663224aa5d608aed21fdec58ebef37760a7e1df
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 14 09:06:03 2012 +0100
Create a TYPEREG_VERSION_1 RegistryTypeReader
RegistryTypeReader is deprecated anyway, so was never lifted from
TYPEREG_VERSION_0 to _1 back in the day of implementing "shiny new UNO."
However, that now caused problems when trying to use
offapi/type_reference/update-rdb.sh to unpublish an old-style service.
Quoting
my summary on IRC: "the problem with regmerge was that regmerge is still
using
an old API that only knows old rdb blob format, the format got extended 10
years
ago to accomodate things like 'published' or multiple-inheritance
inrterfaces;
removing the 'published' from an old-style service no longer requires it to
be
written in the new format, so the two rdbs to be merged had that blob with
different formats, and regmerge's 'checkBlop' only knowing about the old
format
barked that those blobs were completely incompatible; oh my :)" I hope this
"fix" does not break anything unrelated (but usage of deprecated
RegistryTypeReader should indeed be rather limited.)
Change-Id: If04a67f8ba00fbbea3352182e5ce0d868de7c0b5
(cherry picked from commit cbb9bc55b44edea0c7b0a22bfe411c414fadbc69)
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index e511788..62bfaa91 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -1179,7 +1179,7 @@ REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE
typereg_reader_create(
static TypeReaderImpl TYPEREG_CALLTYPE createEntry(const sal_uInt8* buffer,
sal_uInt32 len, sal_Bool copyBuffer)
{
void * handle;
- typereg_reader_create(buffer, len, copyBuffer, TYPEREG_VERSION_0, &handle);
+ typereg_reader_create(buffer, len, copyBuffer, TYPEREG_VERSION_1, &handle);
return handle;
}
commit cf13f53bf32ccde8e162da8e9bb85dd5159f4531
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Dec 13 11:03:03 2012 +0100
Make registry's mergeKey fail if it cannot process regFileName
...so that regmerge fails for bad regfile arguments. Add -v to the regmerge
calls in update-rdb.sh so that an error message is printed in case of
failure.
Change-Id: I6613b9756b4e5628772541580938f6c80fd9bc9e
(cherry picked from commit 53fbd30b3cd6465251b1b07f4728813d524fcd82)
diff --git a/offapi/type_reference/update-rdb.sh
b/offapi/type_reference/update-rdb.sh
index 0f41721..79fd29c 100755
--- a/offapi/type_reference/update-rdb.sh
+++ b/offapi/type_reference/update-rdb.sh
@@ -24,10 +24,10 @@ fi
mkdir tmp
for i in "$@"; do
- "${OUTDIR_FOR_BUILD?}"/bin/regmerge tmp/out1.rdb /UCR \
+ "${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out1.rdb /UCR \
"${WORKDIR_FOR_BUILD?}"/UnoApiPartTarget/"${i%.idl}".urd
done
-"${OUTDIR_FOR_BUILD?}"/bin/regmerge tmp/out2.rdb / \
+"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out2.rdb / \
"${SRC_ROOT?}"/offapi/type_reference/types.rdb tmp/out1.rdb
echo "sanity check diff:"
diff <("${OUTDIR_FOR_BUILD?}"/bin/regview \
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 5851199..345631a 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -361,7 +361,7 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg,
return _ret;
_ret = pReg->loadKey(pNewKey, regFileName, bWarnings, bReport);
- if (_ret == REG_MERGE_ERROR || (_ret == REG_MERGE_CONFLICT &&
bWarnings))
+ if (_ret != REG_NO_ERROR && (_ret != REG_MERGE_CONFLICT || bWarnings))
{
if (pNewKey != pKey)
(void) pKey->closeKey(pNewKey);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
