[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - vcl/source

[Zhe Wang]

 vcl/source/gdi/pdfwriter_impl.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 07d4398a4a3e25ade493aca0e6b3e480c1a14014
Author: Zhe Wang <wangzcdl at apache.org>
Date:   Fri Sep 7 04:33:47 2012 +0000

    fdo#33281, i#120627 [From Symphony]the text on the Y axis is reversed when export ppt file to PDF format.
    
    * subversion/main/vcl/source/gdi/pdfwriter_impl.cxx
    []Change nXOffset value from the distance of axis Y between two points to the distance between two points.
    
    Patch by: Tang Meng<tmyl2010 at gmail.com>
    Suggested by: Wang Zhe <kingwisemmx at gmail.com>
    Found by: Tang Meng <tmyl2010 at gmail.com>
    Review by: Wang Zhe <kingwisemmx at gmail.com>
    (cherry picked from commit 58b6a6161e7edd10d33fdb67510e7d68440128f9)
    
    Signed-off-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 6676cfb..cc22fc8 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7136,7 +7136,12 @@ void PDFWriterImpl::drawVerticalGlyphs(
         }
         aDeltaPos += (m_pReferenceDevice->PixelToLogic( Point( (int)((double)nXOffset/fXScale), 0 ) ) - m_pReferenceDevice->PixelToLogic( Point() ) );
         if( i < rGlyphs.size()-1 )
-            nXOffset += rGlyphs[i+1].m_aPos.Y() - rGlyphs[i].m_aPos.Y();
+        // [Bug 120627] the text on the Y axis is reversed when export ppt file to PDF format
+        {
+            long nOffsetX = rGlyphs[i+1].m_aPos.X() - rGlyphs[i].m_aPos.X();
+            long nOffsetY = rGlyphs[i+1].m_aPos.Y() - rGlyphs[i].m_aPos.Y();
+            nXOffset += (int)sqrt(double(nOffsetX*nOffsetX + nOffsetY*nOffsetY));
+        }
         if( ! rGlyphs[i].m_nGlyphId )
             continue;