[Libreoffice-commits] .: registry/source

[Libreoffice Gerrit user]

 registry/source/reflread.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cbb9bc55b44edea0c7b0a22bfe411c414fadbc69
Author: Stephan Bergmann <sbergman at 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

diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index e511788..62bfaa9 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;
 }