[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - registry/source

[Tor Lillqvist (via logerrit)]

 registry/source/reflwrit.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9ad2465d3bb412a56d20620f84f4829f0d05c108
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Oct 3 16:48:04 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Oct 4 00:18:31 2019 +0200

    tdf#127766: Avoid ODR violation for class/struct FieldEntry
    
    We have a class FieldEntry in registry/source/reflwrit.cxx and a
    struct FieldEntry in sd/source/filter/eppt/text.hxx. That causes
    problems when code from both is linked into one binary, as in the iOS
    and Android apps. The wrong FieldEntry destructor got called from the
    code in sd which of course lead to a crash.
    
    Fix by putting the one in registry into an unnamed namespace. (I put a
    large chunk of the source file in it while at it.)
    
    Reviewed-on: https://gerrit.libreoffice.org/80143
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit d97f27133ddc07ca224297a7525dcda6297077bc)
    
    Change-Id: I1b32075f7aba256129b36ceb38eba605c882b9ff
    Reviewed-on: https://gerrit.libreoffice.org/80167
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 9c753cf9c444..592e4e8bd321 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -166,6 +166,7 @@ sal_uInt32 writeDouble(sal_uInt8* buffer, double v)
 
 **************************************************************************/
 
+namespace {
 
 /**************************************************************************
 
@@ -1100,6 +1101,7 @@ void TypeWriter::createBlop()
     m_blopSize = blopSize;
 }
 
+} // unnamed namespace
 
 /**************************************************************************