[Libreoffice-commits] core.git: sw/source

[Libreoffice Gerrit user]

 sw/source/core/inc/wrong.hxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit f96ba2d948deb4a14dd686d74c758e1429c239a4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Aug 7 11:14:30 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Aug 7 13:37:00 2018 +0200

    Ensure consistent pointer-to-member representation on MSVC
    
    ...even with --disable-pch, where CppunitTest_sw_macros_test failed because
    creating the three iterWrong, iterGrammar, iterSmartTags in
    SwTextFrame::PaintSwFrame (sw/source/core/text/frmpaint.cxx) happend to have a
    differnt idea about the size of pointer-to-SwTextNode-member than the
    WrongListIterator ctor in sw/source/core/text/wrong.cxx.
    
    Change-Id: I6acef19c798991cc0fd65f6e8d5cf44485b6d2c6
    Reviewed-on: https://gerrit.libreoffice.org/58670
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 0003d54266ba..17c83c7fb033 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -34,6 +34,13 @@
 #include <viewopt.hxx>
 #include "TextFrameIndex.hxx"
 
+#if defined _MSC_VER
+// For MSVC (without /vmg) SwTextNode must consistently be defined for
+// WrongListIterator::m_pGetWrongList of pointer-to-SwTextNode-member type to consitently have the
+// same size in all translation units that include this file:
+#include <ndtxt.hxx>
+#endif
+
 class SwWrongList;
 
 enum WrongAreaLineType