Kaydet (Commit) b3acc294 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Fix --disable-pdfimport build

Change-Id: I932f584ef3c054abe738d59e9957c3a40be1d2c9
üst 53cdabd6
...@@ -5,6 +5,8 @@ Settings for poppler header file dection ...@@ -5,6 +5,8 @@ Settings for poppler header file dection
#ifndef CONFIG_POPPLER_H #ifndef CONFIG_POPPLER_H
#define CONFIG_POPPLER_H #define CONFIG_POPPLER_H
#define ENABLE_PDFIMPORT 0
#define HAVE_POPPLER_VERSION_H 0 #define HAVE_POPPLER_VERSION_H 0
#endif #endif
...@@ -10453,6 +10453,7 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_ ...@@ -10453,6 +10453,7 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
BUILD_TYPE="$BUILD_TYPE POPPLER" BUILD_TYPE="$BUILD_TYPE POPPLER"
AC_DEFINE([HAVE_POPPLER_VERSION_H], 1) AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)
fi fi
AC_DEFINE([ENABLE_PDFIMPORT],1)
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <config_poppler.h>
#include "sdmodeltestbase.hxx" #include "sdmodeltestbase.hxx"
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
...@@ -94,8 +96,10 @@ public: ...@@ -94,8 +96,10 @@ public:
void testShapeLineStyle(); void testShapeLineStyle();
void testBnc862510_6(); void testBnc862510_6();
void testBnc862510_7(); void testBnc862510_7();
#if ENABLE_PDFIMPORT
void testPDFImport(); void testPDFImport();
void testPDFImportSkipImages(); void testPDFImportSkipImages();
#endif
void testBulletSuffix(); void testBulletSuffix();
void testBnc910045(); void testBnc910045();
...@@ -130,8 +134,10 @@ public: ...@@ -130,8 +134,10 @@ public:
CPPUNIT_TEST(testShapeLineStyle); CPPUNIT_TEST(testShapeLineStyle);
CPPUNIT_TEST(testBnc862510_6); CPPUNIT_TEST(testBnc862510_6);
CPPUNIT_TEST(testBnc862510_7); CPPUNIT_TEST(testBnc862510_7);
#if ENABLE_PDFIMPORT
CPPUNIT_TEST(testPDFImport); CPPUNIT_TEST(testPDFImport);
CPPUNIT_TEST(testPDFImportSkipImages); CPPUNIT_TEST(testPDFImportSkipImages);
#endif
CPPUNIT_TEST(testBulletSuffix); CPPUNIT_TEST(testBulletSuffix);
CPPUNIT_TEST(testBnc910045); CPPUNIT_TEST(testBnc910045);
...@@ -1081,6 +1087,8 @@ void SdImportTest::testBnc862510_7() ...@@ -1081,6 +1087,8 @@ void SdImportTest::testBnc862510_7()
xDocShRef->DoClose(); xDocShRef->DoClose();
} }
#if ENABLE_PDFIMPORT
void SdImportTest::testPDFImport() void SdImportTest::testPDFImport()
{ {
::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pdf/txtpic.pdf"), PDF); ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pdf/txtpic.pdf"), PDF);
...@@ -1118,6 +1126,8 @@ void SdImportTest::testPDFImportSkipImages() ...@@ -1118,6 +1126,8 @@ void SdImportTest::testPDFImportSkipImages()
xDocShRef->DoClose(); xDocShRef->DoClose();
} }
#endif
void SdImportTest::testBulletSuffix() void SdImportTest::testBulletSuffix()
{ {
::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/pptx/n83889.pptx"), PPTX ); ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/pptx/n83889.pptx"), PPTX );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment