diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-07-20 21:22:14 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-07-21 08:52:38 +0200 |
| commit | 5a083be34456e91427d0f2e2fea172f49f4502db (patch) | |
| tree | c69b553a63765a70dd0d22090a6c85a7d6897f24 /writerfilter/CppunitTest_writerfilter_rtftok.mk | |
| parent | fa2afa041d9b1588bda9c1a7f1a3065af7175869 (diff) | |
tdf#134400 RTF import: fix unexpected inner properties for picture-in-textframe
Regression from commit 4ab658b56f5c6ff0082d38d8ace1924d11e30e96 (RTF
import: implement support for tables inside text frames, 2013-06-16),
the problem was that both the outer "textbox" and the inner "picture
frame" object had a shapeType property, and the properties were stored
in a vector. So by the time RTFSdrImport::initShape() looked up the
shape type for the inner shape, it thought it's not a picture frame,
leading to data loss.
Change-Id: I4a536789371619d1d54afa8c8d41c7d273b0d21b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99111
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter/CppunitTest_writerfilter_rtftok.mk')
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk new file mode 100644 index 000000000000..4ca730b9d3fc --- /dev/null +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -0,0 +1,49 @@ +# -*- 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,writerfilter_rtftok)) + +$(eval $(call gb_CppunitTest_use_externals,writerfilter_rtftok,\ + boost_headers \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \ + writerfilter/qa/cppunittests/rtftok/rtfsdrimport \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ + basegfx \ + comphelper \ + cppu \ + oox \ + sal \ + test \ + unotest \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_rtftok)) + +$(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok)) +$(eval $(call gb_CppunitTest_use_vcl,writerfilter_rtftok)) + +$(eval $(call gb_CppunitTest_use_rdb,writerfilter_rtftok,services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_rtftok,\ + officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok)) + +# we need to explicitly depend on library writerfilter because it is not implied +# by a link relation +$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter) + +# vim: set noet sw=4 ts=4: |