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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |    2 -
 vcl/source/gdi/pdfwriter_impl.hxx |   42 +++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

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

    pdf: move PDFStructureAttribute out of PDFWriterImpl class
    
    Change-Id: I4fb49c00fd9298d76b3c562d10115d4e8a04ab42
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86022
    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 372d5e2c15d7..677987d81d97 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1932,7 +1932,7 @@ const char* PDFWriterImpl::getAttributeValueTag( PDFWriter::StructAttributeValue
     return it != aValueStrings.end() ? it->second : "";
 }
 
-static void appendStructureAttributeLine( PDFWriter::StructAttribute i_eAttr, const PDFWriterImpl::PDFStructureAttribute& i_rVal, OStringBuffer& o_rLine, bool i_bIsFixedInt )
+static void appendStructureAttributeLine( PDFWriter::StructAttribute i_eAttr, const PDFStructureAttribute& i_rVal, OStringBuffer& o_rLine, bool i_bIsFixedInt )
 {
     o_rLine.append( "/" );
     o_rLine.append( PDFWriterImpl::getAttributeTag( i_eAttr ) );
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 9c4a527aa5ab..9ca568cbea64 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -456,6 +456,27 @@ struct PDFWidget : public PDFAnnotation
     {}
 };
 
+struct PDFStructureAttribute
+{
+    PDFWriter::StructAttributeValue     eValue;
+    sal_Int32                           nValue;
+
+    PDFStructureAttribute()
+            : eValue( PDFWriter::Invalid ),
+              nValue( 0 )
+    {}
+
+    explicit PDFStructureAttribute( PDFWriter::StructAttributeValue eVal )
+            : eValue( eVal ),
+              nValue( 0 )
+    {}
+
+    explicit PDFStructureAttribute( sal_Int32 nVal )
+            : eValue( PDFWriter::Invalid ),
+              nValue( nVal )
+    {}
+};
+
 }
 
 class PDFWriterImpl : public VirtualDevice
@@ -465,27 +486,6 @@ class PDFWriterImpl : public VirtualDevice
 public:
     friend struct vcl::pdf::PDFPage;
 
-    struct PDFStructureAttribute
-    {
-        PDFWriter::StructAttributeValue     eValue;
-        sal_Int32                           nValue;
-
-        PDFStructureAttribute()
-                : eValue( PDFWriter::Invalid ),
-                  nValue( 0 )
-        {}
-
-        explicit PDFStructureAttribute( PDFWriter::StructAttributeValue eVal )
-                : eValue( eVal ),
-                  nValue( 0 )
-        {}
-
-        explicit PDFStructureAttribute( sal_Int32 nVal )
-                : eValue( PDFWriter::Invalid ),
-                  nValue( nVal )
-        {}
-    };
-
     struct PDFStructureElementKid // for Kids entries
     {
         sal_Int32 const nObject;  // an object number if nMCID is -1,