Kaydet (Commit) 0663224a authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) Michael Stahl

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 cbb9bc55)
üst cf13f53b
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment