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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.hxx |   48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 7cd0a5b1a1b23a7c50b92302511e081703c8ec3a
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Dec 30 17:54:55 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Dec 30 21:14:37 2019 +0100

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

diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 62a6f467adf2..c2145aa8c2de 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -394,6 +394,22 @@ struct PDFNoteEntry : public PDFAnnotation
     {}
 };
 
+/// A PDF Screen annotation.
+struct PDFScreen : public PDFAnnotation
+{
+    /// Linked video.
+    OUString m_aURL;
+    /// Embedded video.
+    OUString m_aTempFileURL;
+    /// ID of the EmbeddedFile object.
+    sal_Int32 m_nTempFileObject;
+
+    PDFScreen()
+        : m_nTempFileObject(0)
+    {
+    }
+};
+
 }
 
 class PDFWriterImpl : public VirtualDevice
@@ -403,22 +419,6 @@ class PDFWriterImpl : public VirtualDevice
 public:
     friend struct vcl::pdf::PDFPage;
 
-    /// A PDF Screen annotation.
-    struct PDFScreen : public PDFAnnotation
-    {
-        /// Linked video.
-        OUString m_aURL;
-        /// Embedded video.
-        OUString m_aTempFileURL;
-        /// ID of the EmbeddedFile object.
-        sal_Int32 m_nTempFileObject;
-
-        PDFScreen()
-            : m_nTempFileObject(0)
-        {
-        }
-    };
-
     struct PDFWidget : public PDFAnnotation
     {
         typedef std::unordered_map<OString, SvMemoryStream*> PDFAppearanceStreams;
commit 7327e9b392124679280921131079d2c4ca2588b7
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Dec 30 17:53:49 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Dec 30 21:14:24 2019 +0100

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

diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 37b2d6762fdc..62a6f467adf2 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -386,6 +386,14 @@ struct PDFEmbeddedFile
     }
 };
 
+struct PDFNoteEntry : public PDFAnnotation
+{
+    PDFNote m_aContents;
+
+    PDFNoteEntry()
+    {}
+};
+
 }
 
 class PDFWriterImpl : public VirtualDevice
@@ -411,14 +419,6 @@ public:
         }
     };
 
-    struct PDFNoteEntry : public PDFAnnotation
-    {
-        PDFNote                     m_aContents;
-
-        PDFNoteEntry()
-        {}
-    };
-
     struct PDFWidget : public PDFAnnotation
     {
         typedef std::unordered_map<OString, SvMemoryStream*> PDFAppearanceStreams;