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

Bjoern Michaelsen (via logerrit) logerrit at kemper.freedesktop.org
Sun Nov 1 20:34:49 UTC 2020


 sw/source/core/docnode/node.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit fccbd1211ca5c620482591e7916f0f262d9f86bc
Author:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
AuthorDate: Sun Nov 1 13:32:03 2020 +0100
Commit:     Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>
CommitDate: Sun Nov 1 21:34:07 2020 +0100

    move UpdateAttr sanity check to DBG_UTIL
    
    Change-Id: I9a6fd1ef8ea704a0ea3f8182d06cbbe938fd1937
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105137
    Tested-by: Jenkins
    Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen at libreoffice.org>

diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index abfc0d13e827..c13ffe5620ed 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -69,7 +69,9 @@
 #include <swcrsr.hxx>
 #include <hints.hxx>
 #include <frameformats.hxx>
+#ifdef DBG_UTIL
 #include <sal/backtrace.hxx>
+#endif
 
 using namespace ::com::sun::star::i18n;
 
@@ -1169,11 +1171,13 @@ void SwContentNode::SwClientNotify( const SwModify&, const SfxHint& rHint)
                 // This makes the crude "WhichId" type divert from the true type, which is bad.
                 // Thus we are asserting here, but falling back to an proper
                 // hint instead. so that we at least will not spread such poison further.
+#ifdef DBG_UTIL
                 if(pLegacyHint->m_pNew != pLegacyHint->m_pOld)
                 {
                     auto pBT = sal::backtrace_get(20);
                     SAL_WARN("sw.core", "UpdateAttr not matching! " << sal::backtrace_to_string(pBT.get()));
                 }
+#endif
                 assert(pLegacyHint->m_pNew == pLegacyHint->m_pOld);
                 assert(dynamic_cast<const SwUpdateAttr*>(pLegacyHint->m_pNew));
                 const SwUpdateAttr aFallbackHint(0,0,0);


More information about the Libreoffice-commits mailing list