vcl/source/gdi/pdfwriter_impl.hxx | 86 +++++++++++++++++++-------------------
1 file changed, 43 insertions(+), 43 deletions(-)
New commits:
commit be3856df54e6a19041312479b8ffa8bd944aadd8
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Dec 30 18:06:34 2019 +0100
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Dec 30 23:14:45 2019 +0100
pdf: move PDFAddStream out of PDFWriterImpl class
Change-Id: I3c96fcb3438f982fa6d40f806c4fc90db5025091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86028
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx
b/vcl/source/gdi/pdfwriter_impl.hxx
index 0ece9135782c..3302c533acfa 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -520,6 +520,16 @@ struct PDFStructureElement
};
+struct PDFAddStream
+{
+ OUString m_aMimeType;
+ PDFOutputStream* m_pStream;
+ sal_Int32 m_nStreamObject;
+ bool m_bCompress;
+
+ PDFAddStream() : m_pStream( nullptr ), m_nStreamObject( 0 ), m_bCompress(
true ) {}
+};
+
}
class PDFWriterImpl : public VirtualDevice
@@ -529,16 +539,6 @@ class PDFWriterImpl : public VirtualDevice
public:
friend struct vcl::pdf::PDFPage;
- struct PDFAddStream
- {
- OUString m_aMimeType;
- PDFOutputStream* m_pStream;
- sal_Int32 m_nStreamObject;
- bool m_bCompress;
-
- PDFAddStream() : m_pStream( nullptr ), m_nStreamObject( 0 ),
m_bCompress( true ) {}
- };
-
// helper structure for drawLayout and friends
struct PDFGlyph
{
commit a8085e5a0765ae078b3125dec7e05eddaecf9a1d
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Dec 30 18:05:15 2019 +0100
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Dec 30 23:14:35 2019 +0100
pdf: move PDFStructureElement out of PDFWriterImpl class
Change-Id: I41b2f314f3eef7b28af7e1592a7167a216c1fd7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86027
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx
b/vcl/source/gdi/pdfwriter_impl.hxx
index eefb11b79d4b..0ece9135782c 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -487,6 +487,39 @@ struct PDFStructureElementKid // for Kids entries
PDFStructureElementKid( sal_Int32 MCID, sal_Int32 nPage ) : nObject( nPage
), nMCID( MCID ) {}
};
+struct PDFStructureElement
+{
+ sal_Int32 m_nObject;
+ PDFWriter::StructElement m_eType;
+ OString m_aAlias;
+ sal_Int32 m_nOwnElement; //
index into structure vector
+ sal_Int32 m_nParentElement; //
index into structure vector
+ sal_Int32 m_nFirstPageObject;
+ bool m_bOpenMCSeq;
+ std::list< sal_Int32 > m_aChildren; //
indexes into structure vector
+ std::list< PDFStructureElementKid > m_aKids;
+ std::map<PDFWriter::StructAttribute, PDFStructureAttribute >
+ m_aAttributes;
+ tools::Rectangle m_aBBox;
+ OUString m_aActualText;
+ OUString m_aAltText;
+ css::lang::Locale m_aLocale;
+
+ // m_aContents contains the element's marked content sequence
+ // as pairs of (page nr, MCID)
+
+ PDFStructureElement()
+ : m_nObject( 0 ),
+ m_eType( PDFWriter::NonStructElement ),
+ m_nOwnElement( -1 ),
+ m_nParentElement( -1 ),
+ m_nFirstPageObject( 0 ),
+ m_bOpenMCSeq( false )
+ {
+ }
+
+};
+
}
class PDFWriterImpl : public VirtualDevice
@@ -496,39 +529,6 @@ class PDFWriterImpl : public VirtualDevice
public:
friend struct vcl::pdf::PDFPage;
- struct PDFStructureElement
- {
- sal_Int32 m_nObject;
- PDFWriter::StructElement m_eType;
- OString m_aAlias;
- sal_Int32 m_nOwnElement; //
index into structure vector
- sal_Int32 m_nParentElement;
// index into structure vector
- sal_Int32 m_nFirstPageObject;
- bool m_bOpenMCSeq;
- std::list< sal_Int32 > m_aChildren; //
indexes into structure vector
- std::list< PDFStructureElementKid > m_aKids;
- std::map<PDFWriter::StructAttribute, PDFStructureAttribute >
- m_aAttributes;
- tools::Rectangle m_aBBox;
- OUString m_aActualText;
- OUString m_aAltText;
- css::lang::Locale m_aLocale;
-
- // m_aContents contains the element's marked content sequence
- // as pairs of (page nr, MCID)
-
- PDFStructureElement()
- : m_nObject( 0 ),
- m_eType( PDFWriter::NonStructElement ),
- m_nOwnElement( -1 ),
- m_nParentElement( -1 ),
- m_nFirstPageObject( 0 ),
- m_bOpenMCSeq( false )
- {
- }
-
- };
-
struct PDFAddStream
{
OUString m_aMimeType;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
