strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/oox/CppunitTest_oox_export.mk

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

54 lines
1.4 KiB
Makefile
Raw Normal View History

tdf#122962 DOCX drawingML export: fix polygon shape in group shape Regression from commit cfb5b20cdc230320ff9f864d1cfd81aaea221da0 (DocxAttributeOutput::OutputFlyFrame_Impl: enable DML export by default, 2013-12-18), there were two problems here. First, <a:chOff> and <a:chExt> was not written for docx group shapes. This can be done for toplevel shapes just by writing what would be the shape position and size (but for docx, we don't write the size). Second, (poly)polygon shapes used the bounding rectangle of their points as size, which doesn't necessarily match the shape size. Given that the group shape is meant to simply contain its children in LibreOffice (and not have an own size), switch to using the UNO API for polygon shapes as well, that way the two sizes will always match. Change-Id: I4406ddefe5f6105aa2fc74d805359add452936bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114305 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-19 13:27:32 -05:00
# -*- 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,oox_export))
$(eval $(call gb_CppunitTest_use_externals,oox_export,\
boost_headers \
libxml2 \
))
$(eval $(call gb_CppunitTest_add_exception_objects,oox_export, \
oox/qa/unit/export \
))
$(eval $(call gb_CppunitTest_use_libraries,oox_export, \
comphelper \
cppu \
move password handling from SwModelTestBase to UnoApiTest so other places inheriting from UnoApiTest can also import/export protected documents Change-Id: I0e2716204dbb171c9e17e3939b266977e1b96dda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142592 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-11-11 09:44:59 -06:00
cppuhelper \
tdf#122962 DOCX drawingML export: fix polygon shape in group shape Regression from commit cfb5b20cdc230320ff9f864d1cfd81aaea221da0 (DocxAttributeOutput::OutputFlyFrame_Impl: enable DML export by default, 2013-12-18), there were two problems here. First, <a:chOff> and <a:chExt> was not written for docx group shapes. This can be done for toplevel shapes just by writing what would be the shape position and size (but for docx, we don't write the size). Second, (poly)polygon shapes used the bounding rectangle of their points as size, which doesn't necessarily match the shape size. Given that the group shape is meant to simply contain its children in LibreOffice (and not have an own size), switch to using the UNO API for polygon shapes as well, that way the two sizes will always match. Change-Id: I4406ddefe5f6105aa2fc74d805359add452936bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114305 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-19 13:27:32 -05:00
oox \
sal \
CppunitTest_oox_export: inherit from UnoApiTest Change-Id: I46ae3ce5b1fdf6ef5c9d9a22cd589ed04d08ca2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141802 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-10-25 04:39:44 -05:00
subsequenttest \
tdf#122962 DOCX drawingML export: fix polygon shape in group shape Regression from commit cfb5b20cdc230320ff9f864d1cfd81aaea221da0 (DocxAttributeOutput::OutputFlyFrame_Impl: enable DML export by default, 2013-12-18), there were two problems here. First, <a:chOff> and <a:chExt> was not written for docx group shapes. This can be done for toplevel shapes just by writing what would be the shape position and size (but for docx, we don't write the size). Second, (poly)polygon shapes used the bounding rectangle of their points as size, which doesn't necessarily match the shape size. Given that the group shape is meant to simply contain its children in LibreOffice (and not have an own size), switch to using the UNO API for polygon shapes as well, that way the two sizes will always match. Change-Id: I4406ddefe5f6105aa2fc74d805359add452936bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114305 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-19 13:27:32 -05:00
test \
unotest \
utl \
UnoApiTest: factor out common code Change-Id: I1d84d8c1e371016a4f4f068af1e9c76635f28cf4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142490 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-11-09 07:22:09 -06:00
tl \
tdf#122962 DOCX drawingML export: fix polygon shape in group shape Regression from commit cfb5b20cdc230320ff9f864d1cfd81aaea221da0 (DocxAttributeOutput::OutputFlyFrame_Impl: enable DML export by default, 2013-12-18), there were two problems here. First, <a:chOff> and <a:chExt> was not written for docx group shapes. This can be done for toplevel shapes just by writing what would be the shape position and size (but for docx, we don't write the size). Second, (poly)polygon shapes used the bounding rectangle of their points as size, which doesn't necessarily match the shape size. Given that the group shape is meant to simply contain its children in LibreOffice (and not have an own size), switch to using the UNO API for polygon shapes as well, that way the two sizes will always match. Change-Id: I4406ddefe5f6105aa2fc74d805359add452936bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114305 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-19 13:27:32 -05:00
))
$(eval $(call gb_CppunitTest_use_sdk_api,oox_export))
$(eval $(call gb_CppunitTest_use_ure,oox_export))
$(eval $(call gb_CppunitTest_use_vcl,oox_export))
$(eval $(call gb_CppunitTest_use_rdb,oox_export,services))
$(eval $(call gb_CppunitTest_use_custom_headers,oox_export,\
officecfg/registry \
))
$(eval $(call gb_CppunitTest_use_configuration,oox_export))
CppunitTest_oox_export needs the ASan LD_LIBRARY_PATH hack now too ...for CPPUNIT_TEST_NAME=testReferToTheme::TestBody introduced in f36767fde87191258ea21f3faac0be6ad79328e0 "PPTX export: handle theme colors from the doc model for shape text", > /home/sbergman/lo/core/test/source/bootstrapfixture.cxx:248:(anonymous namespace)::testReferToTheme::TestBody > equality assertion failed > - Expected: 0 > - Actual : 256 > - failed to execute: sh /home/sbergman/lo/core/bin/officeotron.sh /home/sbergman/lo/tmp/libtest_oox_export.so1a9v6q.tmp > /home/sbergman/lo/tmp/_anonymous_namespace___testReferToTheme__TestBody_1a9v6u.tmp 2>&1 > Exception in thread "main" java.lang.UnsatisfiedLinkError: /usr/lib/jvm/java-11-openjdk-11.0.13.0.8-2.fc35.x86_64/lib/libsystemconf.so: /home/sbergman/lo/core/instdir/program/libnspr4.so: undefined symbol: __asan_option_detect_stack_use_after_return Change-Id: If241bc3aa727c56ae7fa69744957690c722fbb1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126281 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-12-03 03:08:05 -06:00
$(eval $(call gb_CppunitTest_add_arguments,oox_export, \
-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
))
tdf#122962 DOCX drawingML export: fix polygon shape in group shape Regression from commit cfb5b20cdc230320ff9f864d1cfd81aaea221da0 (DocxAttributeOutput::OutputFlyFrame_Impl: enable DML export by default, 2013-12-18), there were two problems here. First, <a:chOff> and <a:chExt> was not written for docx group shapes. This can be done for toplevel shapes just by writing what would be the shape position and size (but for docx, we don't write the size). Second, (poly)polygon shapes used the bounding rectangle of their points as size, which doesn't necessarily match the shape size. Given that the group shape is meant to simply contain its children in LibreOffice (and not have an own size), switch to using the UNO API for polygon shapes as well, that way the two sizes will always match. Change-Id: I4406ddefe5f6105aa2fc74d805359add452936bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114305 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-19 13:27:32 -05:00
# vim: set noet sw=4 ts=4:
Reference in a new issue Copy permalink