summaryrefslogtreecommitdiff
path: root/sd/UI_sdraw.mk
blob: c557e66837190ce0eb0f72dbda8eba8796a5761d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
# -*- 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_UI_UI,modules/sdraw))

$(eval $(call gb_UI_add_uifiles,modules/sdraw,\
	sd/uiconfig/sdraw/ui/printeroptions \
))

# vim: set noet sw=4 ts=4:
core/patch/?id=a1ee86ebe1f3106d9601c989e4feeacfc1941331'>patch) treee34288f7a36f65192ff5d429d47c015af1b1cfc5 parent69a036043a1b7ba1cff2e17016a73e94055baced (diff)
tdf#146917: docx import: better support for style with num reset
When paragraph style is disabling numbering defined in parent style we should apply margin properties (like we already do in other numbering cases), but we should include only properties from styles not affected by numbering. In other words, only styles without w:numId are used. Unittest was extended to cover different combinations of this situation. Change-Id: Ic19e00fcfe16b2357cdfe763b4f969cc63122e89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129701 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 96e1be11540bada172fbdbfbbe3f9b7dc3e58462) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129827 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Diffstat