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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.hxx |   57 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

New commits:
commit dc3e13a83271423302beee1e4060dbc7a1178858
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Dec 30 18:13:23 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Dec 31 00:07:29 2019 +0100

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

diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 4c677e76b119..59fc55aea458 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -560,6 +560,35 @@ struct StreamRedirect
     ResourceDict    m_aResourceDict;
 };
 
+// graphics state
+struct GraphicsState
+{
+    vcl::Font                        m_aFont;
+    MapMode                          m_aMapMode;
+    Color                            m_aLineColor;
+    Color                            m_aFillColor;
+    Color                            m_aTextLineColor;
+    Color                            m_aOverlineColor;
+    basegfx::B2DPolyPolygon          m_aClipRegion;
+    bool                             m_bClipRegion;
+    ComplexTextLayoutFlags            m_nLayoutMode;
+    LanguageType                     m_aDigitLanguage;
+    PushFlags                        m_nFlags;
+    GraphicsStateUpdateFlags         m_nUpdateFlags;
+
+    GraphicsState() :
+            m_aLineColor( COL_TRANSPARENT ),
+            m_aFillColor( COL_TRANSPARENT ),
+            m_aTextLineColor( COL_TRANSPARENT ),
+            m_aOverlineColor( COL_TRANSPARENT ),
+            m_bClipRegion( false ),
+            m_nLayoutMode( ComplexTextLayoutFlags::Default ),
+            m_aDigitLanguage( 0 ),
+            m_nFlags( PushFlags::ALL ),
+            m_nUpdateFlags( GraphicsStateUpdateFlags::All )
+    {}
+};
+
 }
 
 class PDFWriterImpl : public VirtualDevice
@@ -684,34 +713,6 @@ private:
      */
     std::list< StreamRedirect >         m_aOutputStreams;
 
-    // graphics state
-    struct GraphicsState
-    {
-        vcl::Font                        m_aFont;
-        MapMode                          m_aMapMode;
-        Color                            m_aLineColor;
-        Color                            m_aFillColor;
-        Color                            m_aTextLineColor;
-        Color                            m_aOverlineColor;
-        basegfx::B2DPolyPolygon          m_aClipRegion;
-        bool                             m_bClipRegion;
-        ComplexTextLayoutFlags            m_nLayoutMode;
-        LanguageType                     m_aDigitLanguage;
-        PushFlags                        m_nFlags;
-        GraphicsStateUpdateFlags         m_nUpdateFlags;
-
-        GraphicsState() :
-                m_aLineColor( COL_TRANSPARENT ),
-                m_aFillColor( COL_TRANSPARENT ),
-                m_aTextLineColor( COL_TRANSPARENT ),
-                m_aOverlineColor( COL_TRANSPARENT ),
-                m_bClipRegion( false ),
-                m_nLayoutMode( ComplexTextLayoutFlags::Default ),
-                m_aDigitLanguage( 0 ),
-                m_nFlags( PushFlags::ALL ),
-                m_nUpdateFlags( GraphicsStateUpdateFlags::All )
-        {}
-    };
     std::list< GraphicsState >              m_aGraphicsStack;
     GraphicsState                           m_aCurrentPDFState;