summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2014-01-22 15:43:40 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-23 18:13:04 +0100
commitc4ffca21ff7c020c7df2c6de7cbd16fc20cac989 (patch)
treed3b0c8933d27e7aa76a2bc12ed3add15de2782f0 /sw
parent38e26f75854e299333a731343ba9d81bfb45272f (diff)
Depend unit test on existing font.
Commit 734cf8395 introduced a unit test, which depends on a Calibri metric-compatible font. So this adds a fonctconfig based check to configure and just runs this test, if configure finds a correctly mapped font. Reviewed on: https://gerrit.libreoffice.org/7596 Change-Id: I5255a4366684b115d88adca78ab2002864b63766
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ac5c8c65bf62..4dabefed6acf 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -6,6 +6,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "config_test.h"
+
#include <swmodeltestbase.hxx>
#if !defined(WNT)
@@ -972,9 +974,11 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, "groupshape-child-rotation
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape->getPosition().X);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape->getPosition().Y);
+#if ! TEST_FONTS_MISSING
xShape.set(xGroupShape->getByIndex(4), uno::UNO_QUERY);
// This was 887, i.e. border distances were included in the height.
CPPUNIT_ASSERT_EQUAL(sal_Int32(686), xShape->getSize().Height);
+#endif
uno::Reference<drawing::XShapeDescriptor> xShapeDescriptor(xGroupShape->getByIndex(5), uno::UNO_QUERY);
// This was com.sun.star.drawing.RectangleShape, all shape text in a single line.