diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-12-30 09:28:19 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-12-30 13:56:21 +0100 |
| commit | 283f1fb10a7a1643712e70b46c2ab09a89ac013e (patch) | |
| tree | a7e4f1f80191db275ce3456f6ec4db31f99b164f /vcl | |
| parent | c10d76aac978beb36439512be0a36aac90a4c03f (diff) | |
pdf: remove PDFAppearanceMap typdef, but keep PDFAppearanceStreams
The full declaration would be very long so only remove
PDFAppearanceMap but keep PDFAppearanceStreams and only move it
inside PDFWidget class.
Change-Id: Idd783a37dcb631d63cb4f2cf1ebd6040e0f723ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85991
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.hxx | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 633c40780b7c..4c02c41717af 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -10954,10 +10954,10 @@ void PDFWriterImpl::ensureUniqueRadioOnValues() for (auto const& nKidIndex : rGroupWidget.m_aKidsIndex) { PDFWidget& rKid = m_aWidgets[nKidIndex]; - PDFAppearanceMap::iterator app_it = rKid.m_aAppearances.find( "N" ); + auto app_it = rKid.m_aAppearances.find( "N" ); if( app_it != rKid.m_aAppearances.end() ) { - PDFAppearanceStreams::iterator stream_it = app_it->second.find( "Yes" ); + auto stream_it = app_it->second.find( "Yes" ); if( stream_it != app_it->second.end() ) { SvMemoryStream* pStream = stream_it->second; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index da7ff1d823b4..9651f98801a5 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -409,11 +409,10 @@ public: {} }; - typedef std::unordered_map< OString, SvMemoryStream* > PDFAppearanceStreams; - typedef std::unordered_map< OString, PDFAppearanceStreams > PDFAppearanceMap; - struct PDFWidget : public PDFAnnotation { + typedef std::unordered_map<OString, SvMemoryStream*> PDFAppearanceStreams; + PDFWriter::WidgetType m_eType; OString m_aName; OUString m_aDescription; @@ -441,7 +440,7 @@ public: sal_Int32 m_nDest; std::vector<OUString> m_aListEntries; std::vector<sal_Int32> m_aSelectedEntries; - PDFAppearanceMap m_aAppearances; + std::unordered_map<OString, PDFAppearanceStreams> m_aAppearances; PDFWidget() : m_eType( PDFWriter::PushButton ), m_nTextStyle( DrawTextFlags::NONE ), |