[Libreoffice-commits] core.git: compilerplugins/clang writerfilter/inc writerfilter/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/virtualdead.unusedparams.results   |    6 ------
 writerfilter/inc/dmapper/resourcemodel.hxx               |    4 +---
 writerfilter/source/dmapper/DomainMapper.cxx             |    3 +--
 writerfilter/source/dmapper/DomainMapper.hxx             |    3 +--
 writerfilter/source/dmapper/GraphicImport.cxx            |    2 +-
 writerfilter/source/dmapper/GraphicImport.hxx            |    2 +-
 writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx |    4 +---
 7 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit e872dbd715e8fcc1bfa3b4b79ba82005a2f8a922
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Oct 17 12:40:49 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Oct 17 20:32:35 2019 +0200

    loplugin:virtualdead unused param in BinaryObj::data
    
    Change-Id: I726745b82747f24cc93662bfb0dd381a114fde78
    Reviewed-on: https://gerrit.libreoffice.org/80955
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index 558aac33656e..041439172418 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -433,9 +433,3 @@ vcl/inc/WidgetDrawInterface.hxx:63
 vcl/inc/WidgetDrawInterface.hxx:87
     _Bool vcl::WidgetDrawInterface::getNativeControlRegion(enum ControlType,enum ControlPart,const class tools::Rectangle &,enum ControlState,const class ImplControlValue &,const class rtl::OUString &,class tools::Rectangle &,class tools::Rectangle &,)
     11111011
-writerfilter/inc/dmapper/resourcemodel.hxx:173
-    void writerfilter::BinaryObj::data(const unsigned char *,unsigned long,class tools::SvRef<class writerfilter::Reference<class writerfilter::Properties> >,)
-    110
-writerfilter/inc/ooxml/OOXMLDocument.hxx:216
-    void writerfilter::ooxml::OOXMLDocument::setXNoteType(unsigned int,)
-    0
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
index 728c6ed9a641..bd528d1a1e59 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -168,10 +168,8 @@ public:
 
        @param buf     pointer to buffer containing the data
        @param len     size of buffer
-       @param ref     reference to properties of binary object
      */
-    virtual void data(const sal_uInt8* buf, size_t len,
-                      writerfilter::Reference<Properties>::Pointer_t ref) = 0;
+    virtual void data(const sal_uInt8* buf, size_t len) = 0;
 
 protected:
     ~BinaryObj() {}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 49a040439a48..cb46699fad95 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2838,8 +2838,7 @@ void DomainMapper::lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref)
     ref->resolve(*this);
 }
 
-void DomainMapper::data(const sal_uInt8* /*buf*/, size_t /*len*/,
-                        writerfilter::Reference<Properties>::Pointer_t /*ref*/)
+void DomainMapper::data(const sal_uInt8* /*buf*/, size_t /*len*/)
 {
 }
 
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index c9ef80be2652..0913dd125814 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -86,8 +86,7 @@ public:
     virtual void markLastSectionGroup() override;
 
     // BinaryObj
-    virtual void data(const sal_uInt8* buf, size_t len,
-                      writerfilter::Reference<Properties>::Pointer_t ref) override;
+    virtual void data(const sal_uInt8* buf, size_t len) override;
 
     void sprmWithProps( Sprm& sprm, const PropertyMapPtr& pContext );
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 90b82a89c313..0d673cdc19bd 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1412,7 +1412,7 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer
 }
 
 
-void GraphicImport::data(const sal_uInt8* buf, size_t len, writerfilter::Reference<Properties>::Pointer_t /*ref*/)
+void GraphicImport::data(const sal_uInt8* buf, size_t len)
 {
     beans::PropertyValues aMediaProperties( 1 );
     aMediaProperties[0].Name = getPropertyName(PROP_INPUT_STREAM);
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index a144519690cf..a54a6980ef5f 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -92,7 +92,7 @@ public:
     virtual ~GraphicImport() override;
 
     // BinaryObj
-    virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) override;
+    virtual void data(const sal_uInt8* buffer, size_t len) override;
 
     css::uno::Reference<css::text::XTextContent> GetGraphicObject();
     const css::uno::Reference<css::drawing::XShape>& GetXShapeObject() const { return m_xShape;}
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
index 650b356e7141..429c9ff4c35a 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
@@ -63,10 +63,8 @@ void OOXMLBinaryObjectReference::resolve(BinaryObj & rHandler)
     if (! mbRead)
         read();
 
-    writerfilter::Reference<Properties>::Pointer_t pRef;
-
     rHandler.data(reinterpret_cast<sal_uInt8 *>(mSequence.data()),
-                  mSequence.size(), pRef);
+                  mSequence.size());
 }
 
 }}