summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-10-03 16:48:04 +0300
committerTor Lillqvist <tml@collabora.com>2019-10-03 17:35:37 +0200
commit6ad127ead70cc0942c9876556dda7f525d7d01a0 (patch)
tree00c216e008a6bb3765aed0a88e79bc749b71f006 /registry
parent9db8406b839df8a892d025e054e818def4a60edc (diff)
tdf#127766: Avoid ODR violation for class/struct FieldEntry
We had 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.) Change-Id: I1b32075f7aba256129b36ceb38eba605c882b9ff Reviewed-on: https://gerrit.libreoffice.org/80141 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'registry')
-rw-r--r--registry/source/reflwrit.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index afb01d96b213..25937eea8f8d 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -165,6 +165,7 @@ sal_uInt32 writeDouble(sal_uInt8* buffer, double v)
**************************************************************************/
+namespace {
/**************************************************************************
@@ -1098,6 +1099,7 @@ void TypeWriter::createBlop()
m_blopSize = blopSize;
}
+} // unnamed namespace
/**************************************************************************