[Libreoffice-commits] core.git: include/vcl

[Tor Lillqvist]

 include/vcl/salbtype.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9008c5365581733f3d54ee30ade5e418cd6e694b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Sep 17 08:42:20 2015 +0300

    WaE: this method can be declared static ColorMaskElement::CalcMaskShift
    
    [loplugin:staticmethods].
    
    And then 'const' makes no sense.
    
    Also, fix fallout warning: calling static member function through
    member call syntax, use 'ColorMaskElement::CalcMaskShift' instead
    [loplugin:staticcall].
    
    But actually I wonder if this should be a non-static member function
    that operates on 'this' (and takes no parameter) instead? Also, the
    return value is unused.
    
    Change-Id: I24949b74bd43eb90499e3c881941b102a3622f92

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 4e0b4cd..eb3b6d3 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -194,7 +194,7 @@ struct VCL_DLLPUBLIC ColorMaskElement
         , mnOr(0)
     {
     }
-    bool CalcMaskShift(ColorMaskElement &rElem) const
+    static bool CalcMaskShift(ColorMaskElement &rElem)
     {
         if (rElem.mnMask == 0)
             return true;
@@ -608,9 +608,9 @@ inline ColorMask::ColorMask( sal_uInt32 nRedMask,
     , maB(nBlueMask)
     , mnAlphaChannel(nAlphaChannel)
 {
-    maR.CalcMaskShift(maR);
-    maG.CalcMaskShift(maG);
-    maB.CalcMaskShift(maB);
+    ColorMaskElement::CalcMaskShift(maR);
+    ColorMaskElement::CalcMaskShift(maG);
+    ColorMaskElement::CalcMaskShift(maB);
 }
 
 inline sal_uInt32 ColorMask::GetRedMask() const