summaryrefslogtreecommitdiff
path: root/sdext/source
diff options
context:
space:
mode:
authorVort <vvort@yandex.ru>2015-01-20 08:48:39 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-01-20 13:55:04 +0000
commit7818c73445ad8e08e7ee51e2cc3a4b4d5a798ac4 (patch)
tree6dd9c136085f171dabed24e3320f9dbd80c11a37 /sdext/source
parentd8915be647a85e6c20763febc28f015e6e11c688 (diff)
fdo#85174 PDF Import: fix character positions
Change-Id: I0aa75b6cb834341e47bbeeaa15d39387a8cb5240 Reviewed-on: https://gerrit.libreoffice.org/14029 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sdext/source')
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx8
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx2
2 files changed, 4 insertions, 6 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index f25af8661c51..838ada552ef9 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -821,12 +821,10 @@ void PDFOutDev::eoClip(GfxState *state)
@param dx
- horizontal skip for character (already scaled with font size) +
- inter-char space: cursor is shifted by this amount for next char
+ horizontal skip for character
@param dy
- vertical skip for character (zero for horizontal writing mode):
- cursor is shifted by this amount for next char
+ vertical skip for character
@param originX
local offset of character (zero for horizontal writing mode). not
@@ -836,7 +834,7 @@ 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.
*/
-void PDFOutDev::drawChar(GfxState *state, double x, double y,
+void PDFOutDev::drawChar2(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode, int /*nBytes*/, Unicode *u, int uLen)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index daba4454a4d8..a577e5ec9b42 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -220,7 +220,7 @@ namespace pdfi
virtual void eoClip(GfxState *state) SAL_OVERRIDE;
//----- text drawing
- virtual void drawChar(GfxState *state, double x, double y,
+ 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;