[Libreoffice-commits] core.git: RepositoryExternal.mk sdext/source

[Caolán McNamara]

 RepositoryExternal.mk                                 |    4 ++++
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    7 +++++++
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |    7 +++++++
 3 files changed, 18 insertions(+)

New commits:
commit 37e4920a310c265848ebbf7205efad26f71d928c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 20 15:48:05 2015 +0000

    continue to implement drawChar for unpatched popplers without drawChar2 hack
    
    Change-Id: Id4ad86f3f563d88777352722e397cd77cfad45e4

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5799da2..1968fe1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2628,6 +2628,10 @@ endif # ENABLE_VALGRIND
 ifneq ($(SYSTEM_POPPLER),)
 
 define gb_LinkTarget__use_poppler
+$(call gb_LinkTarget_add_defs,$(1),\
+    -DSYSTEM_POPPLER_HEADERS \
+)
+
 $(call gb_LinkTarget_set_include,$(1),\
 	$(POPPLER_CFLAGS) \
 	$$(INCLUDE) \
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 838ada5..e785339 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -834,10 +834,17 @@ void PDFOutDev::eoClip(GfxState *state)
     local offset of character (zero for horizontal writing mode). not
     taken into account for output pos updates. Used for vertical writing.
  */
+#ifdef SYSTEM_POPPLER_HEADERS
+void PDFOutDev::drawChar(GfxState *state, double x, double y,
+                         double dx, double dy,
+                         double originX, double originY,
+                         CharCode, int /*nBytes*/, Unicode *u, int uLen)
+#else
 void PDFOutDev::drawChar2(GfxState *state, double x, double y,
                          double dx, double dy,
                          double originX, double originY,
                          CharCode, int /*nBytes*/, Unicode *u, int uLen)
+#endif
 {
     assert(state);
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index a577e5e..b8414c7 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -220,10 +220,17 @@ namespace pdfi
         virtual void eoClip(GfxState *state) SAL_OVERRIDE;
 
         //----- text drawing
+#ifdef SYSTEM_POPPLER_HEADERS
+        virtual void drawChar(GfxState *state, double x, double y,
+                              double dx, double dy,
+                              double originX, double originY,
+                              CharCode code, int nBytes, Unicode *u, int uLen) SAL_OVERRIDE;
+#else
         virtual void drawChar2(GfxState *state, double x, double y,
                               double dx, double dy,
                               double originX, double originY,
                               CharCode code, int nBytes, Unicode *u, int uLen) SAL_OVERRIDE;
+#endif
         virtual void drawString(GfxState *state, GooString *s) SAL_OVERRIDE;
         virtual void endTextObject(GfxState *state) SAL_OVERRIDE;