51942eafdb
In case the margin (distance between body frame and page frame) is
smaller than the border spacing (distance between border and page
frame), then we can map that to a negative border distance during the
import of DOCX files since commit
1f127a2b9e (sw layout: allow negative page
border distances, 2022-06-07), but DOC import had the same problem.
The above commit intentionally kept the default behavior of
BorderDistanceFromWord() unchanged to avoid side effects in other
clients of that function (not DOCX import), but means that DOC import
was still broken.
Given that it turns out there are only 2 callers of
BorderDistanceFromWord(), fix the problem by allowing negative border
distances unconditionally: this simplifies code & SetBorderDistance() in
the DOC import will now get the correct border distance out of the box.
DOC export works out of the box without any additional work.
Change-Id: I6bf15b3c73823c9265218b7b3a7b869e131818db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135484
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
213 lines
6 KiB
Makefile
213 lines
6 KiB
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/.
|
|
#
|
|
# This file incorporates work covered by the following license notice:
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
# with this work for additional information regarding copyright
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
#
|
|
|
|
include $(SRCDIR)/sw/layoutwriter_setup.mk
|
|
include $(SRCDIR)/sw/ooxmlexport_setup.mk
|
|
include $(SRCDIR)/sw/rtfexport_setup.mk
|
|
include $(SRCDIR)/sw/uiwriter_setup.mk
|
|
include $(SRCDIR)/sw/ww8export_setup.mk
|
|
|
|
$(eval $(call gb_Module_Module,sw))
|
|
|
|
$(eval $(call gb_Module_add_targets,sw,\
|
|
CustomTarget_generated \
|
|
Library_msword \
|
|
Library_sw \
|
|
Library_swd \
|
|
Library_swui \
|
|
UIConfig_sglobal \
|
|
UIConfig_sweb \
|
|
UIConfig_swform \
|
|
UIConfig_swreport \
|
|
UIConfig_swriter \
|
|
UIConfig_swxform \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_l10n_targets,sw,\
|
|
AllLangMoTarget_sw \
|
|
))
|
|
|
|
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
|
|
|
|
$(eval $(call gb_Module_add_targets,sw,\
|
|
Library_vbaswobj \
|
|
))
|
|
|
|
endif
|
|
|
|
ifneq ($(OS),iOS)
|
|
$(eval $(call gb_Module_add_check_targets,sw,\
|
|
Library_swqahelper \
|
|
CppunitTest_sw_uibase_unit \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
|
|
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
|
|
CppunitTest_sw_uwriter) \
|
|
CppunitTest_sw_rtfexport \
|
|
CppunitTest_sw_rtfexport2 \
|
|
CppunitTest_sw_rtfexport3 \
|
|
CppunitTest_sw_rtfexport4 \
|
|
CppunitTest_sw_rtfexport5 \
|
|
CppunitTest_sw_docbookexport \
|
|
CppunitTest_sw_fodfexport \
|
|
CppunitTest_sw_htmlexport \
|
|
CppunitTest_sw_xhtmlexport \
|
|
CppunitTest_sw_htmlimport \
|
|
CppunitTest_sw_indexingexport \
|
|
CppunitTest_sw_macros_test \
|
|
CppunitTest_sw_ooxmlexport \
|
|
CppunitTest_sw_ooxmlexport2 \
|
|
CppunitTest_sw_ooxmlexport3 \
|
|
CppunitTest_sw_ooxmlexport4 \
|
|
CppunitTest_sw_ooxmlexport5 \
|
|
CppunitTest_sw_ooxmlexport6 \
|
|
CppunitTest_sw_ooxmlexport7 \
|
|
CppunitTest_sw_ooxmlexport8 \
|
|
CppunitTest_sw_ooxmlexport9 \
|
|
CppunitTest_sw_ooxmlexport10 \
|
|
CppunitTest_sw_ooxmlexport11 \
|
|
CppunitTest_sw_ooxmlexport12 \
|
|
CppunitTest_sw_ooxmlexport13 \
|
|
CppunitTest_sw_ooxmlexport14 \
|
|
CppunitTest_sw_ooxmlexport15 \
|
|
CppunitTest_sw_ooxmlexport16 \
|
|
CppunitTest_sw_ooxmlexport17 \
|
|
CppunitTest_sw_ooxmlexport_template \
|
|
CppunitTest_sw_ooxmlfieldexport \
|
|
CppunitTest_sw_ooxmllinks \
|
|
CppunitTest_sw_ooxmlw14export \
|
|
CppunitTest_sw_ooxmlencryption \
|
|
CppunitTest_sw_ooxmlimport \
|
|
CppunitTest_sw_ooxmlimport2 \
|
|
CppunitTest_sw_ww8export \
|
|
CppunitTest_sw_ww8export2 \
|
|
CppunitTest_sw_ww8export3 \
|
|
CppunitTest_sw_ww8import \
|
|
CppunitTest_sw_rtfimport \
|
|
CppunitTest_sw_odfexport \
|
|
CppunitTest_sw_odfexport2 \
|
|
CppunitTest_sw_odfimport \
|
|
CppunitTest_sw_txtexport \
|
|
CppunitTest_sw_txtencexport \
|
|
CppunitTest_sw_txtimport \
|
|
CppunitTest_sw_uiwriter \
|
|
CppunitTest_sw_uiwriter2 \
|
|
CppunitTest_sw_uiwriter3 \
|
|
CppunitTest_sw_uiwriter4 \
|
|
CppunitTest_sw_uiwriter5 \
|
|
CppunitTest_sw_uiwriter6 \
|
|
CppunitTest_sw_uiwriter7 \
|
|
CppunitTest_sw_layoutwriter \
|
|
CppunitTest_sw_layoutwriter2 \
|
|
CppunitTest_sw_mailmerge \
|
|
CppunitTest_sw_globalfilter \
|
|
CppunitTest_sw_accessible_relation_set \
|
|
CppunitTest_sw_apiterminate \
|
|
CppunitTest_sw_apitests \
|
|
CppunitTest_sw_unowriter \
|
|
CppunitTest_sw_core_text \
|
|
CppunitTest_sw_core_doc \
|
|
CppunitTest_sw_core_docnode \
|
|
CppunitTest_sw_uibase_shells \
|
|
CppunitTest_sw_uibase_dochdl \
|
|
CppunitTest_sw_uibase_frmdlg \
|
|
CppunitTest_sw_uibase_uno \
|
|
CppunitTest_sw_uibase_wrtsh \
|
|
CppunitTest_sw_core_accessibilitycheck \
|
|
CppunitTest_sw_core_layout \
|
|
CppunitTest_sw_core_fields \
|
|
CppunitTest_sw_core_tox \
|
|
CppunitTest_sw_core_frmedt \
|
|
CppunitTest_sw_core_txtnode \
|
|
CppunitTest_sw_core_objectpositioning \
|
|
CppunitTest_sw_core_unocore \
|
|
CppunitTest_sw_core_crsr \
|
|
CppunitTest_sw_core_undo \
|
|
CppunitTest_sw_uibase_uiview \
|
|
CppunitTest_sw_core_draw \
|
|
CppunitTest_sw_core_edit \
|
|
CppunitTest_sw_uibase_fldui \
|
|
CppunitTest_sw_core_view \
|
|
CppunitTest_sw_core_attr \
|
|
CppunitTest_sw_filter_ww8 \
|
|
))
|
|
|
|
ifneq ($(DISABLE_GUI),TRUE)
|
|
ifeq ($(OS),LINUX)
|
|
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
|
|
CppunitTest_sw_tiledrendering \
|
|
))
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(DISABLE_CVE_TESTS),TRUE)
|
|
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
|
|
CppunitTest_sw_filters_test \
|
|
CppunitTest_sw_filters_test2 \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
|
|
JunitTest_sw_complex \
|
|
JunitTest_sw_unoapi_1 \
|
|
JunitTest_sw_unoapi_2 \
|
|
JunitTest_sw_unoapi_3 \
|
|
JunitTest_sw_unoapi_4 \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
|
|
PythonTest_sw_python \
|
|
))
|
|
|
|
# screenshots
|
|
$(eval $(call gb_Module_add_screenshot_targets,sw,\
|
|
CppunitTest_sw_dialogs_test \
|
|
CppunitTest_sw_dialogs_test_2 \
|
|
))
|
|
|
|
$(eval $(call gb_Module_add_uicheck_targets,sw,\
|
|
$(call gb_Helper_optional,LIBRELOGO,UITest_librelogo) \
|
|
UITest_writer_tests \
|
|
UITest_writer_tests2 \
|
|
UITest_writer_tests3 \
|
|
UITest_writer_tests4 \
|
|
UITest_writer_tests5 \
|
|
UITest_writer_tests6 \
|
|
UITest_writer_tests7 \
|
|
UITest_sw_table \
|
|
UITest_sw_chart \
|
|
UITest_sw_fieldDialog \
|
|
UITest_sw_findBar \
|
|
UITest_sw_findReplace \
|
|
UITest_chapterNumbering \
|
|
UITest_sw_navigator \
|
|
UITest_sw_options \
|
|
UITest_sw_sidebar \
|
|
UITest_sw_styleInspector \
|
|
UITest_sw_ui_fmtui \
|
|
UITest_sw_ui_index \
|
|
UITest_sw_uibase_shells \
|
|
UITest_classification \
|
|
UITest_writer_macro_tests \
|
|
UITest_writer_dialogs \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|