da967d5f8f
It turns out that commit 4652b911c4 wasn't
quite right: writing out the m_aRunText doesn't necessarily put it in
the right place, it just happened to work on that bugdoc but in other
cases the shape may be written before the paragraph properties of the
paragraph it's in...
So instead change the text frame case to save and restore the run
related buffers and members, so that the text frame itself can do
whatever it wants, and the result is appended to m_aRunText.
The members saved are a superset of those saved in
WriteHeaderFooter_Impl(), writeTextFrame(), TextFootnote_Impl().
Also another thing was missing is that OLE objects would trigger the
assert because they are also buffered into m_aRunText, e.g.
ooo46760-1.odt.
Change-Id: Icc6988f8ed19724c593760df46e0254792cd1735
Reviewed-on: https://gerrit.libreoffice.org/83105
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
59 lines
1.5 KiB
Makefile
59 lines
1.5 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/.
|
|
#
|
|
#*************************************************************************
|
|
|
|
$(eval $(call gb_CppunitTest_CppunitTest,sw_rtfexport4))
|
|
|
|
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_rtfexport4))
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,sw_rtfexport4, \
|
|
sw/qa/extras/rtfexport/rtfexport4 \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,sw_rtfexport4, \
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
svl \
|
|
sfx \
|
|
sw \
|
|
test \
|
|
unotest \
|
|
utl \
|
|
tl \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_externals,sw_rtfexport4,\
|
|
boost_headers \
|
|
libxml2 \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,sw_rtfexport4,\
|
|
-I$(SRCDIR)/sw/inc \
|
|
-I$(SRCDIR)/sw/source/core/inc \
|
|
-I$(SRCDIR)/sw/qa/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_api,sw_rtfexport4,\
|
|
udkapi \
|
|
offapi \
|
|
oovbaapi \
|
|
))
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,sw_rtfexport4))
|
|
$(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport4))
|
|
|
|
$(eval $(call gb_CppunitTest_use_rdb,sw_rtfexport4,services))
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport4))
|
|
|
|
# vim: set noet sw=4 ts=4:
|