[Libreoffice-commits] core.git: 4 commits - sc/source sw/source vcl/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Nov 27 07:59:43 UTC 2019


 sc/source/core/tool/scmatrix.cxx |   26 --------------------------
 sw/source/filter/ww8/ww8par3.cxx |    6 +++---
 sw/source/filter/ww8/ww8scan.cxx |   16 ----------------
 vcl/source/gdi/bmpfast.cxx       |    1 -
 4 files changed, 3 insertions(+), 46 deletions(-)

New commits:
commit 8d23959b9eb014b625e3d7a8ee8aea51cdc6abbf
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Nov 26 21:52:56 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 27 08:58:28 2019 +0100

    Remove unused return_type template
    
    unused since 1c2405ba44c5a146188c19e235f857ab18ea05f0 "tdf#89387 General functor
    and basic operations"
    
    (found by upcoming loplugin:unusedmember, which identified each of the two
    explicit specializations' sole member as unused)
    
    Change-Id: I275137cc70cbe4e58a728779e7e7593c5e11224b
    Reviewed-on: https://gerrit.libreoffice.org/83836
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 3e5bb647db9f..934c14d3159a 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -2196,32 +2196,6 @@ void ScMatrixImpl::MergeDoubleArrayMultiply( std::vector<double>& rArray ) const
     maMat.walk(std::move(aFunc));
 }
 
-namespace Op {
-
-namespace {
-
-template<typename T>
-struct return_type
-{
-    typedef T type;
-};
-
-template<>
-struct return_type<bool>
-{
-    typedef double type;
-};
-
-template<>
-struct return_type<char>
-{
-    typedef svl::SharedString type;
-};
-
-}
-
-}
-
 namespace {
 
 template<typename T, typename U, typename return_type>
commit dc944569bf311981a681b106b87e82d1262ccef2
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Nov 26 21:09:27 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 27 08:58:04 2019 +0100

    Remove unused TrueColorPixelPtr specialization SetAlpha
    
    (found by upcoming loplugin:unusedmember)
    
    Change-Id: I2f2681911893242f67188af2747e0b90090c8e22
    Reviewed-on: https://gerrit.libreoffice.org/83831
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index aa6d724d6a07..cbf72d809490 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -179,7 +179,6 @@ class TrueColorPixelPtr<ScanlineFormat::N8BitTcMask> : public BasePixelPtr
 public:
     void    operator++()                    { mpPixel += 1; }
     PIXBYTE GetAlpha() const                { return mpPixel[0]; }
-    void    SetAlpha( PIXBYTE a ) const     { mpPixel[0] = a; }
 };
 
 // TODO: for some reason many Alpha maps are ScanlineFormat::N8BitPal
commit 30d21f8bcd44b5786c1ee3f362b327bae8fe56d3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Nov 26 21:05:38 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 27 08:57:41 2019 +0100

    Remove unused WW8_FFN_Ver8
    
    unused since bb494d6bd8c5868f34bd8f9444ed3eb401145f10 "check font and list
    lengths"
    
    (found by upcoming loplugin:unusedmember)
    
    Change-Id: I985e8efe4892a28c78e80750cf9957fb02b00fb8
    Reviewed-on: https://gerrit.libreoffice.org/83830
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 5d4d403ec341..9fac7faa0e20 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7047,22 +7047,6 @@ struct WW8_FFN_Ver6
                         // name of an alternate font to use if the first named
                         // font does not exist on this system.
 };
-struct WW8_FFN_Ver8 : public WW8_FFN_BASE
-{
-    // from Ver8 two more fields are present,
-    // we ignore this.
-    sal_Char panose[ 10 ];  //  0x6   PANOSE
-    sal_Char fs[ 24     ];  //  0x10  FONTSIGNATURE
-
-    // from Ver8 as unicode
-    sal_uInt16 szFfn[65];   // 0x6 from 0x40 on Ver8 zero terminated string that
-                        // records name of font.
-                        // Maximal size of szFfn is 65 characters.
-                        // Attention: This array can be smaller!!!
-                        // Possibly followed by a second sz which records the
-                        // name of an alternate font to use if the first named
-                        // font does not exist on this system.
-};
 
 }
 
commit 08c4679eb588aeca8423060157e282c790c9d2ed
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Nov 26 21:02:32 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 27 08:57:14 2019 +0100

    Unused bitfields don't need a name
    
    (found by upcoming loplugin:unusedmember)
    
    Change-Id: I1ca74aa2f4758c34fc1eb25f06615c1001933a39
    Reviewed-on: https://gerrit.libreoffice.org/83829
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index eafe88b8392c..ecdb725c3e76 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -370,12 +370,12 @@ struct WW8LVL   // only THE entries, WE need!
     sal_uInt8   nLenGrpprlChpx; // length, in bytes, of the LVL's grpprlChpx
     sal_uInt8   nLenGrpprlPapx; // length, in bytes, of the LVL's grpprlPapx
     sal_uInt8   nAlign: 2;  // alignment (left, right, centered) of the number
-    sal_uInt8 bLegal:    1;  // doesn't matter
-    sal_uInt8 bNoRest:1; // doesn't matter
+    sal_uInt8:    1;  // doesn't matter ("bLegal")
+    sal_uInt8: 1; // doesn't matter ("bNoRest")
     sal_uInt8 bV6Prev:1; // Ver6-Compatible: number will include previous levels
     sal_uInt8 bV6PrSp:1; // Ver6-Compatible: doesn't matter
     sal_uInt8 bV6:       1;  // if true, pay attention to the V6-Compatible Entries!
-    sal_uInt8   bDummy: 1;  // (fills the byte)
+    sal_uInt8: 1;  // (fills the byte)
 
 };
 


More information about the Libreoffice-commits mailing list