Justin Luth
d008800730
Problem: applying any para style
was removing all numbering or bullets.
This fixes a 25.2 regression from
commit 075560420a
tdf#162326 reset paragraph list attributes on style apply
The problem is that bResetListAttrs was already set to true,
but the conditions under which bResetListAttrs applies
were changed by the above commit
so now it affects situations it was never intended to match.
Specifically, this was the condition that changed:
- && pFormat->GetItemState(RES_PARATR_NUMRULE) == SfxItemState::SET
+ && pCNd->GetTextNode()->IsInList()
So two changes need to happen here:
1.) bResetListAttrs needs to only be set
under the existing comment's stated condition (docst.cxx/doc.hxx)
that the para style itself contains a numbering rule.
2.) When the control key is held down,
then bRestListAttrs needs to be set to true
(which is the stated intention of the above commit).
Possibly #1 should also be done for SwDocShell::MakeInlineHeading,
but that entire concept is just weird... so who knows.
make CppunitTest_sw_uiwriter11 \
CPPUNIT_TEST_NAME=testTdf167760_numberedPara
Change-Id: Iae646124a8a434dd3b49a75caeae4bb360396a49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190309
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
19 lines
665 B
Makefile
19 lines
665 B
Makefile
# -*- 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 sw_uiwriter_test,11))
|
|
|
|
ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
|
|
$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_uiwriter11,abort))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|