156 Commits

Author SHA1 Message Date
Markus Mohrhard
ed6b8a100c remove whitespaces
Change-Id: I9daea42a433b5032931a722878874917cf37f4d1
2014-06-25 05:41:09 +02:00
Matúš Kukan
9388c45c02 bnc#882631: Do not hide top of the first row when editing text in table cells.
This can happen when proportional line spacing is less than 100%
and "FontIndependentLineSpacing" is set, so just keep the height
of the very first line in case of IsFixedCellHeight() too.

Change-Id: Id231fc1f2373645e5420f877e8c2568ce8a1f099
2014-06-24 20:39:24 +02:00
Matúš Kukan
fc577e4f41 Revert "bnc#882631: keep line visible if proportional line spacing is < 100%."
This reverts commit 339e5d44a2afa0f5309a970f1ff11968103e336a
and commit d1987a3eaccfc3add35e6b9f8307ede857c5468e
"fix sd_import_tests after e42c05c1f96832572e525d85d89590f56f5a29dd".

It would need more work and understanding, so just revert.
Also, the problem with bnc#882631 is somewhere else, though this helped too.
2014-06-21 09:40:04 +02:00
Matúš Kukan
5158f5e9fd fix sd_import_tests after e42c05c1f96832572e525d85d89590f56f5a29dd
Change-Id: Ife852a6c7c360c66a7d7d5b144f18898398505dd
2014-06-17 12:49:14 +02:00
Zolnai Tamás
b7f2cad987 Revert "Make glTF support an experimental feature"
Actually make it experimental mode was unecessary on master.

This reverts commit 653bac184f579524bc25a9f40281763a736ae6fd.

Conflicts:
	sd/qa/unit/import-tests.cxx
	xmloff/source/draw/ximpshap.cxx

Change-Id: Ie8747745a9a89ce4d6500a35d15a98e28bda840a
2014-06-16 18:59:25 +02:00
Zolnai Tamás
e38acfa15b Reduce test doc size, use a simpler gltf model
Change-Id: I5bd78343728f8a4d68610397a7be328826a0334c
2014-06-16 14:12:39 +02:00
Zolnai Tamás
04b7b2c72f Fix gltf export: close plugin element before export fallback
Change-Id: I2e1f27e535ee45259f7bdf783ea5224b2ad559ef
2014-06-16 13:55:40 +02:00
Zolnai Tamás
4d8c4e7fe3 glTF import/export: fallback must be the second one inside the frame
The previous solution was good because older LO versions
import the fallback image without changing their code, but
it came out it does not fit to ODF standard so export
fallback image as the second object after the glTF model.

Change-Id: Ib9b2044b1f36b32d980cb79f6dac8dcf94d6209b
2014-06-16 12:59:19 +02:00
Zolnai Tamás
9ee69cbd6f glTF export: Use plural folder names
Change-Id: If17628395ede512c00b666efc5511d9711edfb5a
2014-06-16 12:58:52 +02:00
Zolnai Tamás
634530620e Fix --disable-gltf build
saveAndReload tests export, which is needed only
when gltf support is enabled.

Change-Id: I08152c12db77ad2fc623f2699784b968378686db
2014-06-15 06:05:14 +02:00
Zolnai Tamás
e8fcf1153f Change glTF mime type: {application -> model}/vnd.gltf+json
There is no an accepted mime type for glTF models yet, so
follow collada's mime type: model/vnd.collada+xml.

Change-Id: I1e23a95dbb0caea781dade819f8e08235cb5c1dc
2014-06-12 21:43:36 +02:00
Zolnai Tamás
653bac184f Make glTF support an experimental feature
Change-Id: I75e69ba1acafbab8362536f02f4d39a8fc2deed1
2014-06-12 21:43:36 +02:00
Zolnai Tamás
fe70101856 Introduce HAVE_FEATURE_GLTF to enable/disable gltf related code
When it is a release build then enable it only on Windows and
Linux.

Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
2014-06-12 21:43:35 +02:00
Zolnai Tamás
98dd0f2bb5 Related bnc#862510: extend handling of txXfrm
We don't actually need to check mbAnchorCtr to change
text spacing. This txXfrm workaround works only with rectangles,
because other shapes' text area can be smaller then the shape
size. So add some condition to avoid using it for
other shapes.

Plus fix typos cause regression introduced in:
53c376d35b7223d53e8c9403390afe53d1f69089

Change-Id: I87917b8e0b2bb97ae1bba773e7dda7f81682736f
2014-06-10 19:08:59 +02:00
Jan Holesovsky
f7d51f43de html export: More standard time specification in <meta/>.
Change-Id: I1a62d12531029cc36fb8aeabecb9d92a8af837f7
2014-06-06 21:55:06 +02:00
Jan Holesovsky
2f54153491 sd html: Unit test for the metadata export.
Change-Id: I1e38e28b57e816a0829d1a56f2ffcb32d8f93718
2014-06-06 18:25:26 +02:00
Zolnai Tamás
46d682eec9 bnc#880763: PPTX import: wrong z-order becuause of wrong import order
importExtDrawings() must be called as soon as possible,
before parser starts to parse the next shape.
Call it when graphicFrame tag is closed. This tag include
the reference to the SmartArt.

Plus fix up import tests.

Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae
2014-06-06 16:50:04 +02:00
Caolán McNamara
e990e4d145 c++03 vs c++11 enum namespacing
Change-Id: I91be0e7d2b013221b1d47a5cd1e4e75eb16c2b67
2014-06-06 10:06:24 +01:00
Zolnai Tamás
639571d52b 2nd part of bnc#870233: import font color from color fragment for SmartArts
SmartArt import ignores some fragments during import if
drawing fragment exists, which seems to be not complete.
In this case font style is blank (white) in data (and drawing)
fragment and the real value is defined in the ignored color fragment.

So first make color fragment parsing work, then apply font
color of "node0" style on nodes of the SmartArt.

Actually, it's a workaround, because "node0" style label
is hardcoded, for a proper solution layout fragment should
be parsed too to get the right style label, but
it interferes with the drawing fragment by now.

Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8
2014-06-06 10:28:18 +02:00
Zolnai Tamás
31650d5b42 1th part of bnc#870233: wrong list style in shapes
Text list styles were copied, without proper
copy constructor and operator. It lad to mix
up list styles and so text font.

Change-Id: Iee7a6c0c1f74322fd7b80e41a262849f948e463a
2014-06-06 10:28:18 +02:00
Zolnai Tamás
53c376d35b bnc#870237: wrong text position in grouped list
In grouped list text area does not cover the whole
shape but just a part of it at the top.
To get the same visual effect modify text distance
attribute.

Change-Id: I32f30d0afbc1975f940c4562ec65f46596e97060
2014-05-30 13:45:36 +02:00
Tomaž Vajngerl
a95c7069c3 sd html test: move local vars on top, clean-up
Change-Id: Iac393561337825e316a974801a6061944b8fd72a
2014-05-15 22:11:00 +02:00
Stephan Bergmann
c8695c6cce Unify utl::TempFile ctors
Change-Id: I0a781a86804808cebf7756506d9299971c13e2ff
2014-05-14 13:38:23 +02:00
Caolán McNamara
1732919a6e coverity#1209803 Dereference before null check
Change-Id: Ie6435770edc709feba2ad191e00e03d637cf6154
2014-05-09 09:43:15 +01:00
Tomaž Vajngerl
dde833575e tests: add XML and HTML test tools to test module
XML and HTML parsing and XPath asserts are used by many test in
sw, sc and sd modules. This commit moves this functionallity to
test module, where it is available to all modules.

Change-Id: I53ad9c45b24f4c9bf106cb58ea619002968bfeda
2014-04-29 23:57:33 +02:00
Noel Grandin
b45a12c37d sd: sal_Bool->bool
Change-Id: I3172a42f6b6abe434ffe0475d1201ff50b6c06ea
2014-04-24 10:53:17 +02:00
Andras Timar
2ea006fb60 fix sd layout unit test
Change-Id: Ica34592788005cc3c96987b1c6c9625dd6359c76
2014-04-23 16:02:04 +02:00
Andras Timar
c79a5f87b1 remove executable bit
Change-Id: I91f6e861f6d0dbea1b57ac73857e0c706b27f681
2014-04-17 15:11:14 +02:00
Michael Stahl
25a2eab227 fdo#77027: ODF import: fix wrong version in check for embedded objects
SvXMLImport::LO_4x does not mean 4.0+ any more.

(regression from 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52)

Change-Id: Ib444762c2d6e4d051e99962eaff1b1ed34af983a
2014-04-16 00:33:22 +02:00
Stephan Bergmann
3e29b0c456 Remove unused code
Change-Id: Ie16056c7e6716831a0ba61c1f22ded978fb5f3c2
2014-04-15 09:47:25 +02:00
Tomaž Vajngerl
e679c101ac sd html: impress html export test
Change-Id: I710868b4cb19cec2820c3cf699dd5d855e3da7e2
2014-04-13 23:13:57 +02:00
Zolnai Tamás
327b0a6cc0 ODP filter test: embedded media and glTF model
Change-Id: I2340fa5a20a5774e5db78940cf7d4dc584f09b82
2014-04-04 19:06:13 +02:00
Zolnai Tamás
7d7e2a01a6 SdFiltersTest: reduce code duplication
Change-Id: I95ddae64001015f911494e11fa15373dfaedd6ba
2014-04-04 19:06:12 +02:00
Stephan Bergmann
362d4f0cd4 Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."

Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
2014-04-01 19:22:54 +02:00
Markus Mohrhard
2aaf9a5c9a prevent leaked tmp files from sd import test
Change-Id: I6365924420f636c8db556d0bce02b2131e540f2c
2014-04-01 01:55:31 +02:00
Muthu Subramanian
186b96dcfb Add unit test for text gradfill import.
Change-Id: I803238fd21d1c73aae8146966a5e62e62ad48c5c
2014-03-28 17:40:49 +05:30
Luboš Luňák
b3b843481d write (no)wrap of text only for custom shapes to .pptx (fdo#71961)
Apparently checking the TextWordWrap property in DrawingML::WriteText()
gives false by default for objects that do not have it set, which happens
to be everything except for custom shapes, which seem to be the only ones
to actually obey it. So all normal text would be exported as nowrap to .pptx
and read back as custom shape that has non-wrapping text.

I tried to make the property return true (which is what it should be in practice),
but that appears to be an exercise in futility, or I'm not mad enough to follow
the complicated property sets and whatnot. So just write it out only for custom
shapes. UNO purists, if any, are welcome to change the dynamic_cast to something
UNO-better if they manage without an ambiguous base class error.

Change-Id: I3ed906285fde88d902ac9c801986a82a7515638b
2014-03-27 22:57:43 +01:00
Stephan Bergmann
567ef6d578 Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
Muthu Subramanian
b566aa7f16 Add unit test for left spacing (anchorCtr)
Change-Id: I8fa347497c9509285c5f0422c618efcb360dbd34
2014-03-27 13:27:29 +05:30
Muthu Subramanian
31b8ce1153 Add unit test for text rotation.
Change-Id: Iba4e002c461f00807f277e6032afcdaaf25ea4a2
2014-03-27 13:27:28 +05:30
David Tardon
1e188aa004 update test files
Change-Id: I937a85fa7bda7df13e79e704973c21bfc732ba66
2014-03-25 09:29:57 +01:00
David Tardon
acd03d7050 fix unit test 2014-03-23 06:57:05 +01:00
Muthu Subramanian
2796aa203c n#862510: Adding unit test case for baseline=0
Change-Id: Ia8281ddc31b653ecf47c6bb5030db74de75b2e8d
2014-03-17 14:08:49 +05:30
Markus Mohrhard
ed3fc457e1 add strict OOXML pptx import test
Change-Id: I2e4f17b7b7ab1e14c5cb0f6ce90e771d7c20a5c8
2014-03-10 18:17:21 +01:00
Muthu Subramanian
e8c00c4091 n#821567: Add unit test case. 2014-03-06 16:00:47 +05:30
Markus Mohrhard
f17c5c77a6 use CPPUNIT_ASSERT_EQUAL to improve error message
Change-Id: I946f4177bef82bbac8058640f216a294582c24a3
2014-03-04 18:43:38 +01:00
Zolnai Tamás
4a25c65fcd Update a hatching import test according to the new values
Change-Id: I2f3504e12be63a326da189e7f69ce87ad2bdb674
2014-02-13 15:25:58 +01:00
Caolán McNamara
68d9649f21 coverity#735822 Unchecked dynamic_cast
Change-Id: I88911159659f765e6f2c2f49d3d3e8313b2c9e8f
2014-02-11 14:33:36 +00:00
Caolán McNamara
ac01fd5182 coverity#1158101 Unchecked dynamic_cast
Change-Id: Ibbe35f67a92dd41d45d2e1b4a3bb240b6b7adc66
2014-02-07 12:24:45 +00:00
Caolán McNamara
c72f099d90 coverity#1158102 Unchecked dynamic_cast
Change-Id: I806e1c4cd768aec0bb5d56449a1692226f20895e
2014-02-07 12:24:45 +00:00