[Libreoffice-commits] .: slideshow/source

René Engelhard rene at kemper.freedesktop.org
Sun Jan 2 05:10:56 PST 2011


 slideshow/source/engine/color.cxx |   51 --------------------------------------
 1 file changed, 51 deletions(-)

New commits:
commit 5689ce6e53fd44c9cb38992f6537a8d54a613484
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Jan 2 14:09:11 2011 +0100

    remove methods added by (apparently bogus) merge

diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index 1bb21e3..35f3b4e 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -228,57 +228,6 @@ namespace slideshow
             return maHSLTriple.mnLuminance;
         }
 
-        double HSLColor::getRed() const
-        {
-            if( ::basegfx::fTools::equalZero( getSaturation() ) )
-                return getLuminance();
-
-            return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue,
-                                  mnMagicValue,
-                                  getHue() + 120.0 );
-        }
-
-        double HSLColor::getGreen() const
-        {
-            if( ::basegfx::fTools::equalZero( getSaturation() ) )
-                return getLuminance();
-
-            return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue,
-                                  mnMagicValue,
-                                  getHue() );
-        }
-
-        double HSLColor::getBlue() const
-        {
-            if( ::basegfx::fTools::equalZero( getSaturation() ) )
-                return getLuminance();
-
-            return hsl2rgbHelper( 2.0*getLuminance() - mnMagicValue,
-                                  mnMagicValue,
-                                  getHue() - 120.0 );
-        }
-
-        RGBColor HSLColor::getRGBColor() const
-        {
-            RGBColor::RGBTriple aColor( hsl2rgb( getHue(),
-                                                 getSaturation(),
-                                                 getLuminance() ) );
-            return RGBColor( aColor.mnRed, aColor.mnGreen, aColor.mnBlue );
-        }
-
-        RGBColor::RGBColor(const RGBColor& rLHS)
-            : maRGBTriple( rLHS.maRGBTriple )
-        {
-        }
-
-        RGBColor& RGBColor::operator=( const RGBColor& rLHS ){
-
-            maRGBTriple.mnRed = rLHS.getRed();
-            maRGBTriple.mnGreen = rLHS.getGreen();
-            maRGBTriple.mnBlue = rLHS.getBlue();
-            return *this;
-        }
-
         HSLColor operator+( const HSLColor& rLHS, const HSLColor& rRHS )
         {
             return HSLColor( rLHS.getHue() + rRHS.getHue(),


More information about the Libreoffice-commits mailing list