[Libreoffice-commits] core.git: compilerplugins/clang include/sfx2 include/vcl sfx2/source vcl/source

[Caolán McNamara (via logerrit)]

 compilerplugins/clang/unusedmethods.results |    4 ----
 include/sfx2/thumbnailview.hxx              |    2 --
 include/vcl/pngread.hxx                     |    2 --
 sfx2/source/control/thumbnailview.cxx       |    5 -----
 vcl/source/filter/png/pngread.cxx           |   10 +---------
 5 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 6842a50a8c33aba554454fc99d1bc40a07585a2c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 2 08:52:57 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 2 20:22:18 2020 +0200

    remove some unused methods
    
    Change-Id: Ie86cc069b9c69087012b15597e548d1d745d6e2e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101941
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index f7c4661dfcbb..333fbb9eebb7 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -592,8 +592,6 @@ include/sfx2/lokhelper.hxx:62
     int SfxLokHelper::getDocumentIdOfView(int)
 include/sfx2/msg.hxx:120
     const class std::type_info * SfxType0::Type() const
-include/sfx2/thumbnailview.hxx:208
-    unsigned short ThumbnailView::getNextItemId() const
 include/sfx2/viewsh.hxx:365
     enum LOKDeviceFormFactor SfxViewShell::GetLOKDeviceFormFactor() const
 include/sfx2/viewsh.hxx:367
@@ -790,8 +788,6 @@ include/vcl/outdev.hxx:1738
     class basegfx::B2DPolyPolygon OutputDevice::LogicToPixel(const class basegfx::B2DPolyPolygon &,const class MapMode &) const
 include/vcl/outdev.hxx:1758
     class basegfx::B2DPolyPolygon OutputDevice::PixelToLogic(const class basegfx::B2DPolyPolygon &,const class MapMode &) const
-include/vcl/pngread.hxx:56
-    void vcl::PNGReader::SetIgnoreGammaChunk(_Bool)
 include/vcl/salnativewidgets.hxx:408
     _Bool TabitemValue::isBothAligned() const
 include/vcl/salnativewidgets.hxx:409
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 45f4a6753286..90ea8e1c1e18 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -205,8 +205,6 @@ public:
 
     sal_uInt16 GetItemId( const Point& rPos ) const;
 
-    sal_uInt16 getNextItemId () const;
-
     virtual bool isDrawMnemonic() const override { return false; }
 
     void setItemMaxTextLength (sal_uInt32 nLength);
diff --git a/include/vcl/pngread.hxx b/include/vcl/pngread.hxx
index 0fda677e2817..fe59bfa1b4a6 100644
--- a/include/vcl/pngread.hxx
+++ b/include/vcl/pngread.hxx
@@ -52,8 +52,6 @@ public:
         std::vector<sal_uInt8> aData;
     };
     const std::vector<ChunkData>& GetChunks() const;
-
-    void SetIgnoreGammaChunk(bool bIgnoreGammaChunk);
 };
 
 } // end namespace vcl
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index f0f31700fb39..1ddba0728521 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -963,11 +963,6 @@ sal_uInt16 ThumbnailView::GetItemId( const Point& rPos ) const
     return 0;
 }
 
-sal_uInt16 ThumbnailView::getNextItemId() const
-{
-    return mItemList.empty() ? 1 : mItemList.back()->mnId + 1;
-}
-
 void ThumbnailView::setItemMaxTextLength(sal_uInt32 nLength)
 {
     mpItemAttrs->nMaxTextLength = nLength;
diff --git a/vcl/source/filter/png/pngread.cxx b/vcl/source/filter/png/pngread.cxx
index ff13402d0605..923588ad7e32 100644
--- a/vcl/source/filter/png/pngread.cxx
+++ b/vcl/source/filter/png/pngread.cxx
@@ -133,7 +133,6 @@ private:
     bool                mbIDATStarted : 1;  // true if IDAT seen
     bool                mbIDATComplete : 1; // true if finished with enough IDAT chunks
     bool                mbpHYs : 1;         // true if physical size of pixel available
-    bool                mbIgnoreGammaChunk : 1;
     bool                mbIgnoreCRC : 1; // skip checking CRCs while fuzzing
 
 #if OSL_DEBUG_LEVEL > 0
@@ -174,7 +173,6 @@ public:
 
     BitmapEx            GetBitmapEx();
     const std::vector<vcl::PNGReader::ChunkData>& GetAllChunks();
-    void                SetIgnoreGammaChunk( bool bIgnore ){ mbIgnoreGammaChunk = bIgnore; };
 };
 
 PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
@@ -212,7 +210,6 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
     mbIDATStarted( false ),
     mbIDATComplete( false ),
     mbpHYs              ( false ),
-    mbIgnoreGammaChunk  ( false ),
     mbIgnoreCRC( utl::ConfigManager::IsFuzzing() )
 #if OSL_DEBUG_LEVEL > 0
     ,mnAllocSizeScanline(0),
@@ -352,7 +349,7 @@ BitmapEx PNGReaderImpl::GetBitmapEx()
 
             case PNGCHUNK_gAMA :                                // the gamma chunk must precede
             {                                                   // the 'IDAT' and also the 'PLTE'(if available )
-                if (!mbIgnoreGammaChunk && !mbIDATComplete)
+                if (!mbIDATComplete)
                     ImplGetGamma();
             }
             break;
@@ -1705,11 +1702,6 @@ const std::vector< vcl::PNGReader::ChunkData >& PNGReader::GetChunks() const
     return mpImpl->GetAllChunks();
 }
 
-void PNGReader::SetIgnoreGammaChunk(bool bIgnoreGammaChunk)
-{
-    mpImpl->SetIgnoreGammaChunk(bIgnoreGammaChunk);
-}
-
 } // namespace vcl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */