From 6b393b6cc65992ba6af4476024bb2f26518c388b Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 5 Aug 2021 13:43:50 +0200 Subject: sw: fix assert fail with ShowRedlineChanges=false and para format It fails like this: loolforkit: sw/source/core/layout/wsfrm.cxx:4551: void UnHide(SwRootFrame&): Assertion `rLayout.GetCurrShell()->ActionPend()' failed. #4 0x00007f98e9f8c198 in UnHide(SwRootFrame&) (rLayout=...) at sw/source/core/layout/wsfrm.cxx:4551 #5 0x00007f98e9f8c839 in SwRootFrame::SetHideRedlines(bool) (this=0x7f98c40f7bd0, bHideRedlines=false) at sw/source/core/layout/wsfrm.cxx:4664 #6 0x00007f98e9b18afd in sw::DocumentRedlineManager::SetRedlineFlags(RedlineFlags) (this=0x80a4120, eMode=49) at sw/source/core/doc/DocumentRedlineManager.cxx:1097 #7 0x00007f98e9cfa503 in SwEditShell::SetAttrSet(SfxItemSet const&, SetAttrMode, SwPaM*, bool) (this=0x8885840, rSet= SfxItemSet of pool 0x808fd10 with parent 0x0 and Which ranges: [(63, 64), (120, 120)] = {...}, nFlags=SetAttrMode::DEFAULT, pPaM=0x0, bParagraphSetting=true) at sw/source/core/edit/edatmisc.cxx:187 #8 0x00007f98ea995f07 in SwTextShell::ExecParaAttr(SfxRequest&) (this=0x8bd0820, rReq=...) at sw/source/uibase/shells/txtattr.cxx:451 Fix it the same way commit dd489bc01adc22fc5015ea56b61d66104af184a8 (tdf#125754 sw_redlinehide: avoid recursive layout in SetHideRedlines(), 2019-06-19) did: make sure that SetHideRedlines() is called before EndAllAction(). (cherry picked from commit 39392ee94c78692a9179f7face15af0c9e74e492) Change-Id: I6304abec2e2e2967a8369b0219492bebcd606d03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120139 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- bin/find-unneeded-includes | 1 + sw/CppunitTest_sw_core_edit.mk | 75 ++++++++++++++++++++++++++++++++ sw/Module_sw.mk | 1 + sw/qa/core/edit/data/redline-hidden.fodt | 32 ++++++++++++++ sw/qa/core/edit/edit.cxx | 43 ++++++++++++++++++ sw/source/core/edit/edatmisc.cxx | 2 +- 6 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 sw/CppunitTest_sw_core_edit.mk create mode 100644 sw/qa/core/edit/data/redline-hidden.fodt create mode 100644 sw/qa/core/edit/edit.cxx diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index 4f90ab55e9f5..3f8c38bdb158 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -286,6 +286,7 @@ def tidy(compileCommands, paths): args = args.replace(assumeAbs, "-x c++ " + pathAbs) invocation = "include-what-you-use -Xiwyu --no_fwd_decls -Xiwyu --max_line_length=200 " + args + print(invocation) task_queue.put((invocation, moduleRules)) task_queue.join() diff --git a/sw/CppunitTest_sw_core_edit.mk b/sw/CppunitTest_sw_core_edit.mk new file mode 100644 index 000000000000..21afd9ec538f --- /dev/null +++ b/sw/CppunitTest_sw_core_edit.mk @@ -0,0 +1,75 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,sw_core_edit)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_edit)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_edit, \ + sw/qa/core/edit/edit \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_core_edit, \ + editeng \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + sfx \ + svxcore \ + sw \ + swqahelper \ + test \ + unotest \ + utl \ + vcl \ + svt \ + tl \ + svl \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_core_edit,\ + boost_headers \ + libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_core_edit,\ + -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/uibase/inc \ + -I$(SRCDIR)/sw/qa/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_core_edit,\ + udkapi \ + offapi \ + oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_core_edit)) +$(eval $(call gb_CppunitTest_use_vcl,sw_core_edit)) + +$(eval $(call gb_CppunitTest_use_rdb,sw_core_edit,services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_edit,\ + officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_core_edit)) + +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_edit, \ + modules/swriter \ +)) + +$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_edit)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 28782147fb9e..f4530e2a139d 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -139,6 +139,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_core_undo \ CppunitTest_sw_uibase_uiview \ CppunitTest_sw_core_draw \ + CppunitTest_sw_core_edit \ CppunitTest_sw_uibase_fldui \ )) diff --git a/sw/qa/core/edit/data/redline-hidden.fodt b/sw/qa/core/edit/data/redline-hidden.fodt new file mode 100644 index 000000000000..10355e3ac485 --- /dev/null +++ b/sw/qa/core/edit/data/redline-hidden.fodt @@ -0,0 +1,32 @@ + + + + + false + + + + + + + + + + + + + + + + + + Creator + 2017-04-27T17:12:10 + + + + + test + + + diff --git a/sw/qa/core/edit/edit.cxx b/sw/qa/core/edit/edit.cxx new file mode 100644 index 000000000000..30d0d3726a29 --- /dev/null +++ b/sw/qa/core/edit/edit.cxx @@ -0,0 +1,43 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include + +#include +#include +#include + +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/edit/data/"; + +namespace +{ +/// Covers sw/source/core/edit/ fixes. +class Test : public SwModelTestBase +{ +}; +} + +CPPUNIT_TEST_FIXTURE(Test, testRedlineHidden) +{ + // Given a document with ShowRedlineChanges=false: + SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "redline-hidden.fodt"); + + // When formatting a paragraph by setting the para adjust to center, then make sure setting the + // new item set on the paragraph doesn't crash: + SwView* pView = pDoc->GetDocShell()->GetView(); + SfxItemSet aSet(pView->GetPool(), svl::Items{}); + SvxAdjustItem aItem(SvxAdjust::Center, RES_PARATR_ADJUST); + aSet.Put(aItem); + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + pWrtShell->SetAttrSet(aSet, SetAttrMode::DEFAULT, nullptr, true); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx index 4e26e33773a1..b3556a0494e2 100644 --- a/sw/source/core/edit/edatmisc.cxx +++ b/sw/source/core/edit/edatmisc.cxx @@ -183,8 +183,8 @@ void SwEditShell::SetAttrSet( const SfxItemSet& rSet, SetAttrMode nFlags, SwPaM* GetDoc()->getIDocumentContentOperations().InsertItemSet(*pCursor, rSet, nFlags, GetLayout()); } - EndAllAction(); GetDoc()->getIDocumentRedlineAccess().SetRedlineFlags( eOldMode ); + EndAllAction(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit