summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
authorRiccardo Magliocchetti <riccardo.magliocchetti@gmail.com>2014-12-22 19:10:59 +0100
committerMichael Stahl <mstahl@redhat.com>2015-02-07 00:01:41 +0000
commitb9a847b78ceaa3b5840429dab1bc50d35c7ef3de (patch)
tree1bcd505077a08a8f24362e35362a0fad54bc9684 /sw/qa
parent7ce1e0e1ecbb1b3ec5e3cc15306a9df7e786c564 (diff)
Fixup --without-x build
Accept gl linkage in hope of future offscreen mesa support. Avoid linking with GLX though. Change-Id: I4e666f60e74fe34075a8da9eeba95807cf8fe38c Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/13452 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/extras/odfimport/odfimport.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index cf24c9a545ec..139e2bc585e5 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -459,7 +459,7 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
// Previously copy&paste failed to copy the table in case it was the document-starting one.
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
-#if !defined(MACOSX) && !defined(ENABLE_HEADLESS) // FIXME
+#if !defined(MACOSX) && !defined(LIBO_HEADLESS) // FIXME
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount());
#endif
}