diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-14 09:06:03 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-14 09:17:30 +0100 |
commit | cbb9bc55b44edea0c7b0a22bfe411c414fadbc69 (patch) | |
tree | 9071071ffe46e10ba3964b6038e00e12b71dcda2 /registry | |
parent | cbbdd2f07ee68286614748ae6c64c3058a238c80 (diff) |
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
Diffstat (limited to 'registry')
-rw-r--r-- | registry/source/reflread.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index e51178867671..62bfaa913e83 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; } |