[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/qa

[Zolnai Tamás]

 sd/qa/unit/import-tests.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 489e52ece1f182d43db354594f09312618092ce6
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sun Jun 15 06:05:14 2014 +0200

    Fix --disable-gltf build
    
    saveAndReload tests export, which is needed only
    when gltf support is enabled.
    
    Change-Id: I08152c12db77ad2fc623f2699784b968378686db
    (cherry picked from commit 634530620e6a51c5ea8f1596f6ab51b2a7e2ea9c)

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index b6a6c8c..04af625 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -713,7 +713,10 @@ void SdFiltersTest::testMediaEmbedding()
 {
     SvtMiscOptions().SetExperimentalMode(true);
     ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"));
+
+#if HAVE_FEATURE_GLTF
     xDocShRef = saveAndReload( xDocShRef, ODP );
+#endif
 
     SdDrawDocument *pDoc = xDocShRef->GetDoc();
     CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );