writerfilter/inc/dmapper/resourcemodel.hxx | 7 ++++++-
writerfilter/source/dmapper/DomainMapper.cxx | 2 +-
writerfilter/source/dmapper/DomainMapper.hxx | 2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 4 ++--
writerfilter/source/dmapper/LoggedResources.hxx | 2 +-
6 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit ab8333baee56fa20dae644c85fa29a7edb2d55b1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 28 19:51:07 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Dec 29 16:43:40 2021 +0100
be more exact about the type of pDocument
Change-Id: Iab0d23e8ee691ac6ed3381bd7e1ee02bb59dc64f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127661
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx
b/writerfilter/inc/dmapper/resourcemodel.hxx
index 9e980494b09b..65682d78e381 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -178,6 +178,11 @@ const sal_uInt8 cFieldStart = 0x13;
const sal_uInt8 cFieldSep = 0x14;
const sal_uInt8 cFieldEnd = 0x15;
+namespace ooxml
+{
+class OOXMLDocument;
+}
+
/**
Handler for a stream.
*/
@@ -202,7 +207,7 @@ public:
/// The current section is the last one in this body text.
virtual void markLastSectionGroup(){};
- virtual void setDocumentReference(void* pDocument) = 0;
+ virtual void setDocumentReference(writerfilter::ooxml::OOXMLDocument*
pDocument) = 0;
/**
Receives start mark for group with the same paragraph properties.
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index b5e08cfe5bc9..43d134b23805 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -187,7 +187,7 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
catch( const uno::Exception& ) {}
}
-void DomainMapper::setDocumentReference(void* pDocument)
+void DomainMapper::setDocumentReference(writerfilter::ooxml::OOXMLDocument*
pDocument)
{
m_pImpl->setDocumentReference(pDocument);
}
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx
b/writerfilter/source/dmapper/DomainMapper.hxx
index 4ed2cca83526..c0134866537c 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -80,7 +80,7 @@ public:
utl::MediaDescriptor const & rMediaDesc);
virtual ~DomainMapper() override;
- virtual void setDocumentReference(void* pDocument) override;
+ virtual void setDocumentReference(writerfilter::ooxml::OOXMLDocument*
pDocument) override;
// Stream
virtual void markLastParagraphInSection() override;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 96b7b1391877..0bf0834febde 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -405,7 +405,7 @@ DomainMapper_Impl::~DomainMapper_Impl()
writerfilter::ooxml::OOXMLDocument* DomainMapper_Impl::getDocumentReference()
const
{
- return static_cast<writerfilter::ooxml::OOXMLDocument*>(m_pOOXMLDocument);
+ return m_pOOXMLDocument;
}
uno::Reference< container::XNameContainer > const &
DomainMapper_Impl::GetPageStyles()
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index ee6813f9d293..ae267c5c390e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -449,7 +449,7 @@ public:
private:
SourceDocumentType
m_eDocumentType;
DomainMapper&
m_rDMapper;
- void* m_pOOXMLDocument;
+ writerfilter::ooxml::OOXMLDocument* m_pOOXMLDocument;
OUString m_aBaseUrl;
css::uno::Reference<css::text::XTextDocument> m_xTextDocument;
css::uno::Reference<css::beans::XPropertySet> m_xDocumentSettings;
@@ -634,7 +634,7 @@ public:
utl::MediaDescriptor const & rMediaDesc);
~DomainMapper_Impl();
- void setDocumentReference(void* pDocument) { if (!m_pOOXMLDocument)
m_pOOXMLDocument = pDocument; };
+ void setDocumentReference(writerfilter::ooxml::OOXMLDocument* pDocument) {
if (!m_pOOXMLDocument) m_pOOXMLDocument = pDocument; };
writerfilter::ooxml::OOXMLDocument* getDocumentReference() const;
SectionPropertyMap* GetLastSectionContext( )
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx
b/writerfilter/source/dmapper/LoggedResources.hxx
index 848d17b68219..74b7b0b2c9a5 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -72,7 +72,7 @@ public:
void startGlossaryEntry() override;
void endGlossaryEntry() override;
- virtual void setDocumentReference(void* /*pDocument*/) override{};
+ virtual void setDocumentReference(writerfilter::ooxml::OOXMLDocument*
/*pDocument*/) override{};
protected:
virtual void lcl_startSectionGroup() = 0;
