[Libreoffice-commits] core.git: vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |    4 +--
 vcl/source/gdi/pdfwriter_impl.hxx |   44 +++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 21aab417b0562a3629aaa8d93c669c62d71049f9
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Dec 30 18:08:45 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Dec 30 23:15:34 2019 +0100

    pdf: move PDFGlyph out of PDFWriterImpl class
    
    Change-Id: Icb536e45f92bd03e7b223d38e40565b0b55462c6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86029
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 677987d81d97..65437464de72 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5808,7 +5808,7 @@ void PDFWriterImpl::drawShadow( SalLayout& rLayout, const OUString& rText, bool
 }
 
 void PDFWriterImpl::drawVerticalGlyphs(
-        const std::vector<PDFWriterImpl::PDFGlyph>& rGlyphs,
+        const std::vector<PDFGlyph>& rGlyphs,
         OStringBuffer& rLine,
         const Point& rAlignOffset,
         const Matrix3& rRotScale,
@@ -5877,7 +5877,7 @@ void PDFWriterImpl::drawVerticalGlyphs(
 }
 
 void PDFWriterImpl::drawHorizontalGlyphs(
-        const std::vector<PDFWriterImpl::PDFGlyph>& rGlyphs,
+        const std::vector<PDFGlyph>& rGlyphs,
         OStringBuffer& rLine,
         const Point& rAlignOffset,
         bool bFirst,
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 3302c533acfa..6e4a99f7bcf2 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -530,6 +530,28 @@ struct PDFAddStream
     PDFAddStream() : m_pStream( nullptr ), m_nStreamObject( 0 ), m_bCompress( true ) {}
 };
 
+// helper structure for drawLayout and friends
+struct PDFGlyph
+{
+    Point const       m_aPos;
+    const GlyphItem* m_pGlyph;
+    sal_Int32 const   m_nNativeWidth;
+    sal_Int32 const   m_nMappedFontId;
+    sal_uInt8 const   m_nMappedGlyphId;
+    int const         m_nCharPos;
+
+    PDFGlyph( const Point& rPos,
+              const GlyphItem* pGlyph,
+              sal_Int32 nNativeWidth,
+              sal_Int32 nFontId,
+              sal_uInt8 nMappedGlyphId,
+              int nCharPos )
+    : m_aPos( rPos ), m_pGlyph(pGlyph), m_nNativeWidth( nNativeWidth ),
+      m_nMappedFontId( nFontId ), m_nMappedGlyphId( nMappedGlyphId ),
+      m_nCharPos(nCharPos)
+    {}
+};
+
 }
 
 class PDFWriterImpl : public VirtualDevice
@@ -539,28 +561,6 @@ class PDFWriterImpl : public VirtualDevice
 public:
     friend struct vcl::pdf::PDFPage;
 
-    // helper structure for drawLayout and friends
-    struct PDFGlyph
-    {
-        Point const       m_aPos;
-        const GlyphItem* m_pGlyph;
-        sal_Int32 const   m_nNativeWidth;
-        sal_Int32 const   m_nMappedFontId;
-        sal_uInt8 const   m_nMappedGlyphId;
-        int const         m_nCharPos;
-
-        PDFGlyph( const Point& rPos,
-                  const GlyphItem* pGlyph,
-                  sal_Int32 nNativeWidth,
-                  sal_Int32 nFontId,
-                  sal_uInt8 nMappedGlyphId,
-                  int nCharPos )
-        : m_aPos( rPos ), m_pGlyph(pGlyph), m_nNativeWidth( nNativeWidth ),
-          m_nMappedFontId( nFontId ), m_nMappedGlyphId( nMappedGlyphId ),
-          m_nCharPos(nCharPos)
-        {}
-    };
-
     static const char* getStructureTag( PDFWriter::StructElement );
     static const char* getAttributeTag( PDFWriter::StructAttribute eAtr );
     static const char* getAttributeValueTag( PDFWriter::StructAttributeValue eVal );