diff options
author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2015-02-02 09:43:51 +0000 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-13 18:23:15 +0100 |
commit | 2c411e4487f24968d6a62958fec85e4e3e1fda93 (patch) | |
tree | 89774ed068920e8e8947e0447c668d0bbc643a26 /sw/CppunitTest_sw_rtfexport.mk | |
parent | d1f38b47c29ef5e2db2cabeb657668637d97e13d (diff) |
tdf#49893 partial fix for blank rentangle problem in RTF
* pib structure in rtf shape is processed always, if exists, not only
for shape #75 (picture frame): it is possible for other shapes, at
least for #1 (rectangle)
* picture inside shape gets width and height from shape: this picture
looks like pib object and should fit shape frame
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Reviewed on:
https://gerrit.libreoffice.org/14396
Change-Id: I5cf2e692940c4ddd8ab8b291ef65c0cc44c45f5d
Diffstat (limited to 'sw/CppunitTest_sw_rtfexport.mk')
-rw-r--r-- | sw/CppunitTest_sw_rtfexport.mk | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk index 33f366b16ff1..48c87589d5ac 100644 --- a/sw/CppunitTest_sw_rtfexport.mk +++ b/sw/CppunitTest_sw_rtfexport.mk @@ -48,36 +48,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\ $(eval $(call gb_CppunitTest_use_ure,sw_rtfexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport)) -$(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - embeddedobj/util/embobj \ - filter/source/config/cache/filterconfig1 \ - filter/source/storagefilterdetect/storagefd \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sfx2/util/sfx \ - starmath/util/sm \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - sw/util/msword \ - sw/util/sw \ - sw/util/swd \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - unoxml/source/service/unoxml \ - uui/util/uui \ - writerfilter/util/writerfilter \ - xmloff/util/xo \ - oox/util/oox \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_rtfexport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport)) |