diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-22 15:51:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-22 21:02:07 +0100 |
commit | 3afe0c79fa185a6fe01c48e427c49b12728e8c4a (patch) | |
tree | 6d27b17a476ca075f04d2ea419f3441988601e19 /sw | |
parent | f19dfaf817556ba28d68c000f3561a2752635727 (diff) |
--enable-dbgutil --disable-assert-always-abort fixes
...which <https://ci.libreoffice.org/job/lo_tb_random_config_linux/>
occasionally stumbles across; plus some related loplugin:staticmethods fixes
Change-Id: If6998c302cfbabfcad626d9c68d94d3368548a41
Reviewed-on: https://gerrit.libreoffice.org/63808
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/bastyp/swcache.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 74511a554cbf..2693578c8b21 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -58,7 +58,7 @@ void SwCache::Check() assert(pObj == m_pLast); } pObj = pObj->GetNext(); - assert(pObj != pOldRealFirst); + assert(pObj != pOldRealFirst); (void) pOldRealFirst; } assert(bFirstFound); SAL_WARN_IF( nCnt + m_aFreePositions.size() != size(), "sw.core", "Lost Chain." ); diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index d3e640531f79..d5e368c8fe77 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1573,7 +1573,7 @@ SwRect SwTextFrame::SmartTagScan(SwTextNode & rNode) void SwTextFrame::CollectAutoCmplWrds(SwTextNode & rNode, sal_Int32 nActPos) { - assert(sw::FrameContainsNode(*this, rNode.GetIndex())); + assert(sw::FrameContainsNode(*this, rNode.GetIndex())); (void) this; SwTextNode *const pNode(&rNode); if (!nActPos) nActPos = COMPLETE_STRING; |