diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 13:13:55 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 13:13:55 +0100 |
| commit | 8dda77692a0a5f78cac1bca5e445f3cc2e616867 (patch) | |
| tree | f7510462a048d78df48c5383f1d430a516f74f9b /slideshow | |
| parent | ad11d85818a1446d1c73954f3eb5e83fc091163e (diff) | |
| parent | bd9fb52d611c146112c1760e65505cf526d63f26 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/impress
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/color.cxx | 13 | ||||
| -rw-r--r-- | slideshow/source/inc/rgbcolor.hxx | 3 |
2 files changed, 0 insertions, 16 deletions
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx index a010ecca2e2b..dfa8b1409706 100644 --- a/slideshow/source/engine/color.cxx +++ b/slideshow/source/engine/color.cxx @@ -228,19 +228,6 @@ namespace slideshow return maHSLTriple.mnLuminance; } - 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(), diff --git a/slideshow/source/inc/rgbcolor.hxx b/slideshow/source/inc/rgbcolor.hxx index 2247123c23cd..fc161f78a87c 100644 --- a/slideshow/source/inc/rgbcolor.hxx +++ b/slideshow/source/inc/rgbcolor.hxx @@ -66,9 +66,6 @@ namespace slideshow */ ::cppcanvas::Color::IntSRGBA getIntegerColor() const; - RGBColor(const RGBColor& rLHS); - RGBColor& operator=( const RGBColor& rLHS); - struct RGBTriple { RGBTriple(); |