e0d0274c2b
Regression from commit ed654c4aa7 (Revert
"fdo#43869 use the old rtf importer for paste", 2012-11-30), the direct
problem is that SwXText::insertTextPortion() is now used by
writerfilter, so in case it's not as good as the internal API used by
the old RTF filter, we have a problem.
This function calls SwXCell::CreateCursor(), which calls
SwXCell::createTextCursor(), which uses Move() to go to the first
content node in the cell, but that means we end up at the inner cell's
XText for an outer cell.
So later when we want to go to the end of the outer cell, we can't, as
that would be a different XText and we throw an exception.
Fix the problem by instead using createTextCursorByRange(), which
immediately positions the cursor at the insert position, so the XText
will be correct.
FWIW, the ODF import at SwXMLImport::setTextInsertMode() also uses
createTextCursorByRange() to handle this situation.
Change-Id: I1db13b860bc60771d98c2b4099be73f4bf41c375
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96901
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
175 lines
4.8 KiB
Makefile
175 lines
4.8 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/ooxmlexport_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,\
|
|
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_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_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_odfimport \
|
|
CppunitTest_sw_txtexport \
|
|
$(if $(filter-out MACOSX,$(OS)), \
|
|
CppunitTest_sw_uiwriter \
|
|
) \
|
|
CppunitTest_sw_layoutwriter \
|
|
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_uibase_shells \
|
|
CppunitTest_sw_uibase_dochdl \
|
|
CppunitTest_sw_core_accessibilitycheck \
|
|
CppunitTest_sw_core_layout \
|
|
CppunitTest_sw_core_frmedt \
|
|
CppunitTest_sw_core_txtnode \
|
|
CppunitTest_sw_core_objectpositioning \
|
|
CppunitTest_sw_core_unocore \
|
|
))
|
|
|
|
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,\
|
|
UITest_writer_tests \
|
|
UITest_writer_tests2 \
|
|
UITest_writer_tests3 \
|
|
UITest_writer_tests4 \
|
|
UITest_writer_tests5 \
|
|
UITest_writer_tests6 \
|
|
UITest_writer_tests7 \
|
|
UITest_table \
|
|
UITest_sw_findReplace \
|
|
UITest_sw_findSimilarity \
|
|
UITest_chapterNumbering \
|
|
UITest_librelogo \
|
|
UITest_options \
|
|
UITest_sw_ui_fmtui \
|
|
UITest_classification \
|
|
UITest_writer_macro_tests \
|
|
UITest_writer_dialogs \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|