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

[Libreoffice Gerrit user]

 external/openssl/ExternalProject_openssl.mk |    1 +
 sw/source/filter/ww8/ww8par.cxx             |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 81a6835048d1f2e01432b8765e696f8b3529bed3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 3 17:20:21 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 3 22:01:51 2018 +0200

    ofz#10198 reset uncommitted fly stuff & pams before applying redlining
    
    Change-Id: I2a2587ec4590926f7cffc2a4d58a22d9d5f19c99
    Reviewed-on: https://gerrit.libreoffice.org/59946
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index d5fe4bde60b4..79c7ef20b885 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5393,6 +5393,9 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss)
 
     UpdateFields();
 
+    m_xWFlyPara.reset();
+    m_xSFlyPara.reset();
+
     // delete the pam before the call for hide all redlines (Bug 73683)
     if (m_bNewDoc)
       m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode);
commit 6666b31829c93d8ae45bdda52155021d44b91b73
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 3 16:57:23 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 3 22:01:41 2018 +0200

    define PURIFY for openssl for dbgutil to silence valgrind spew
    
    Change-Id: I318ca368f26e42038a043b1e264a619795a9515e
    Reviewed-on: https://gerrit.libreoffice.org/59945
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index 211de4ab06fd..c00521f9f168 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -82,6 +82,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& $(MAKE) build_libs \
 			CC="$(CC) -fPIC \
+				$(if $(filter TRUE, $(ENABLE_DBGUTIL)), -DPURIFY,) \
 				$(if $(filter-out WNT MACOSX,$(OS)),-fvisibility=hidden)" \
 	)
 endif