writerfilter/inc/ooxml/OOXMLDocument.hxx | 1 -
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 14 ++++----------
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 5 +----
3 files changed, 5 insertions(+), 15 deletions(-)
New commits:
commit 57924e5bef323c34e870f111288123887f07378d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 17 12:36:53 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Oct 17 20:32:20 2019 +0200
loplugin:virtualdead unused param in OOXMLDocument::setXNoteType
which means the whole method is dead
Change-Id: Ib3349f5beb8b9bb9fe223bc33aca84a20e581445
Reviewed-on: https://gerrit.libreoffice.org/80954
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 124368ee0bc1..7856a6a4dced 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -213,7 +213,6 @@ public:
virtual css::uno::Reference<css::io::XInputStream>
getInputStreamForId(const OUString & rId) = 0;
virtual void setXNoteId(const sal_Int32 nId) = 0;
virtual sal_Int32 getXNoteId() const = 0;
- virtual void setXNoteType(Id nId) = 0;
virtual const OUString & getTarget() const = 0;
virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler>
getShapeContext( ) = 0;
virtual void setShapeContext(
css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext ) = 0;
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 888f69a2320d..bec04a949ac7 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -237,10 +237,6 @@ sal_Int32 OOXMLDocumentImpl::getXNoteId() const
return mnXNoteId;
}
-void OOXMLDocumentImpl::setXNoteType(Id /*nId*/)
-{
-}
-
const OUString & OOXMLDocumentImpl::getTarget() const
{
return mpStream->getTarget();
@@ -262,15 +258,13 @@ OOXMLDocumentImpl::getSubStream(const OUString & rId)
}
writerfilter::Reference<Stream>::Pointer_t
-OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, Id aType,
- const sal_Int32 nId)
+OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const
sal_Int32 nId)
{
OOXMLStream::Pointer_t pStream =
OOXMLDocumentFactory::createStream(mpStream, nType);
// See above, no status indicator for the note stream, either.
OOXMLDocumentImpl * pDocument = new OOXMLDocumentImpl(pStream,
uno::Reference<task::XStatusIndicator>(), mbSkipImages, maMediaDescriptor);
pDocument->setXNoteId(nId);
- pDocument->setXNoteType(aType);
pDocument->setModel(getModel());
pDocument->setDrawPage(getDrawPage());
@@ -282,7 +276,7 @@ void OOXMLDocumentImpl::resolveFootnote(Stream & rStream,
const sal_Int32 nNoteId)
{
writerfilter::Reference<Stream>::Pointer_t pStream =
- getXNoteStream(OOXMLStream::FOOTNOTES, aType, nNoteId);
+ getXNoteStream(OOXMLStream::FOOTNOTES, nNoteId);
Id nId;
switch (aType)
@@ -304,7 +298,7 @@ void OOXMLDocumentImpl::resolveEndnote(Stream & rStream,
const sal_Int32 nNoteId)
{
writerfilter::Reference<Stream>::Pointer_t pStream =
- getXNoteStream(OOXMLStream::ENDNOTES, aType, nNoteId);
+ getXNoteStream(OOXMLStream::ENDNOTES, nNoteId);
Id nId;
switch (aType)
@@ -325,7 +319,7 @@ void OOXMLDocumentImpl::resolveComment(Stream & rStream,
const sal_Int32 nId)
{
writerfilter::Reference<Stream>::Pointer_t pStream =
- getXNoteStream(OOXMLStream::COMMENTS, 0, nId);
+ getXNoteStream(OOXMLStream::COMMENTS, nId);
resolveFastSubStreamWithId(rStream, pStream, NS_ooxml::LN_annotation);
}
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 059ac1cea601..2bcc1e746ab0 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -82,9 +82,7 @@ private:
getSubStream(const OUString & rId);
writerfilter::Reference<Stream>::Pointer_t
- getXNoteStream(OOXMLStream::StreamType_t nType,
- Id aType,
- const sal_Int32 nNoteId);
+ getXNoteStream(OOXMLStream::StreamType_t nType, const sal_Int32 nNoteId);
void resolveCustomXmlStream(Stream & rStream);
void resolveGlossaryStream(Stream & rStream);
@@ -122,7 +120,6 @@ public:
virtual css::uno::Reference<css::io::XInputStream>
getInputStreamForId(const OUString & rId) override;
virtual void setXNoteId(const sal_Int32 nId) override;
virtual sal_Int32 getXNoteId() const override;
- virtual void setXNoteType(Id aId) override;
virtual const OUString & getTarget() const override;
virtual css::uno::Reference<css::xml::sax::XFastShapeContextHandler>
getShapeContext( ) override;
virtual void setShapeContext(
css::uno::Reference<css::xml::sax::XFastShapeContextHandler> xContext )
override;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
