diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-01-21 04:48:50 +1100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-05 09:00:54 +0100 |
| commit | 01e470f0ab49e458c57b0f28636a517b2bfb1b4a (patch) | |
| tree | e153e55125b3d5682e60425b80568c5e03a3695a /filter/source/msfilter/msdffimp.cxx | |
| parent | sal: remove unnecessary comments in types.h (diff) | |
| download | core-01e470f0ab49e458c57b0f28636a517b2bfb1b4a.tar.gz core-01e470f0ab49e458c57b0f28636a517b2bfb1b4a.zip | |
vcl: remove BitmapColor Color() operator
BitmapColor has a Color() operator. However, this is confusing and
tends to hide that the two classes aren't the same. I have converted this
to GetColor().
Change-Id: I0be2dcb3fc420e7be9c8d04330e7a3fe69a5412a
Reviewed-on: https://gerrit.libreoffice.org/48245
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'filter/source/msfilter/msdffimp.cxx')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index b07351a3389e..04864986d674 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1382,9 +1382,9 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co { Color aReadColor; if (pRead->HasPalette()) - aReadColor = pRead->GetPaletteColor(pRead->GetPixelIndex(y, x)); + aReadColor = pRead->GetPaletteColor(pRead->GetPixelIndex(y, x)).GetColor(); else - aReadColor = pRead->GetPixel(y, x); + aReadColor = pRead->GetPixel(y, x).GetColor(); if (aReadColor.GetColor() == 0) pWrite->SetPixelOnData(pScanline, x, aCol2); |