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().
Change-Id: I6304abec2e2e2967a8369b0219492bebcd606d03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120069
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
2021-08-05 06:43:50 -05:00
|
|
|
# -*- 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 \
|
2021-08-06 02:32:18 -05:00
|
|
|
swqahelper \
|
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().
Change-Id: I6304abec2e2e2967a8369b0219492bebcd606d03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120069
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
2021-08-05 06:43:50 -05:00
|
|
|
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:
|