You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2015/10/30 19:56:14 UTC
svn commit: r1711539 - in
/openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper: makefile.mk
pdfioutdev_gpl.hxx wrapper_gpl.cxx
Author: pfg
Date: Fri Oct 30 18:56:14 2015
New Revision: 1711539
URL: http://svn.apache.org/viewvc?rev=1711539&view=rev
Log:
Cleanup some defines since Poppler can only come from the system.
We don't carry Poppler (PDF rendering library) within AOO,
due to the restrictive licensing, so we can only use it
if it's provided through the system.
For the pdf-import extension we can therefore assume it is
the only option and cleanup the code accordingly.
Modified:
openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk
openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
Modified: openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk?rev=1711539&r1=1711538&r2=1711539&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk (original)
+++ openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/makefile.mk Fri Oct 30 18:56:14 2015
@@ -42,7 +42,7 @@ CFLAGS+=-DSYSTEM_ZLIB
@echo "PDF Import extension disabled."
.ENDIF
-CFLAGS += $(POPPLER_CFLAGS) -DSYSTEM_POPPLER
+CFLAGS += $(POPPLER_CFLAGS)
# --- Files --------------------------------------------------------
UWINAPILIB:=
Modified: openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx?rev=1711539&r1=1711538&r2=1711539&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx (original)
+++ openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx Fri Oct 30 18:56:14 2015
@@ -37,9 +37,6 @@
#include "Object.h"
#include "OutputDev.h"
#include "Stream.h"
-#ifndef SYSTEM_POPPLER
-# include "parseargs.h"
-#endif
#include "GlobalParams.h"
#include "PDFDoc.h"
@@ -55,9 +52,6 @@
class GfxPath;
class GfxFont;
class PDFDoc;
-#ifndef SYSTEM_POPPLER
-typedef GString GooString;
-#endif
namespace pdfi
{
Modified: openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx?rev=1711539&r1=1711538&r2=1711539&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx (original)
+++ openoffice/trunk/main/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx Fri Oct 30 18:56:14 2015
@@ -28,33 +28,12 @@
FILE* g_binary_out=stderr;
-#ifndef SYSTEM_POPPLER
-static char ownerPassword[33] = "\001";
-static char userPassword[33] = "\001";
-static char outputFile[256] = "\001";
-
-static ArgDesc argDesc[] = {
- {(char*)"-f", argString, outputFile, sizeof(outputFile),
- (char*)"output file for binary streams"},
- {(char*)"-opw", argString, ownerPassword, sizeof(ownerPassword),
- (char*)"owner password (for encrypted files)"},
- {(char*)"-upw", argString, userPassword, sizeof(userPassword),
- (char*)"user password (for encrypted files)"},
- {NULL, argString, NULL, 0, NULL }
-};
-#else
static const char *ownerPassword = "\001";
static const char *userPassword = "\001";
static const char *outputFile = "\001";
-#endif
int main(int argc, char **argv)
{
-#ifndef SYSTEM_POPPLER
- // parse args; initialize to defaults
- if( !parseArgs(argDesc, &argc, argv) )
- return 1;
-#else
int k = 0;
while (k < argc)
{
@@ -81,19 +60,15 @@ int main(int argc, char **argv)
}
++k;
}
-#endif
if( argc < 2 )
return 1;
// read config file
globalParams = new GlobalParams(
-#ifndef SYSTEM_POPPLER
- (char*)""
-#endif
);
globalParams->setErrQuiet(gTrue);
-#if !defined(SYSTEM_POPPLER) || defined(_MSC_VER)
+#ifdef _MSC_VER
globalParams->setupBaseFonts(NULL);
#endif