summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel <noel.grandin@collabora.co.uk>2021-01-11 08:54:37 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-01-12 17:38:53 +0100
commitd765ec2295d12ccde1fb25aa92c5d821de748add (patch)
treec2f806389478df23b78319c6043971f92995851c /sd
parenta1d6701105456248f6ff39766a6699f26a8f3d60 (diff)
transparency->alpha in tools::Color
this just changes the Get/Set methods, the constructor and internal representation of Color is not changed. Change-Id: Idb6e07cc08bbaa5bd55b6bd4b585e648aef507b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109074 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/eppt/pptx-stylesheet.cxx2
-rw-r--r--sd/source/filter/pdf/sdpdffilter.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 6acf110c50b2..27fc7f3ac598 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -113,7 +113,7 @@ void PPTExCharSheet::Write( SvStream& rSt, sal_uInt16 nLev, bool bSimpleText,
aAny >>= bIsDark;
nFontColor = bIsDark ? 0xffffff : 0x000000;
}
- nFontColor.SetTransparency(0xfe);
+ nFontColor.SetAlpha(1);
if ( bSimpleText )
{
rSt.WriteUInt16( rLev.mnFontHeight )
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx
index 8a413a7c706f..c34fa1bc78a6 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -159,7 +159,7 @@ bool SdPdfFilter::Import()
else if (rPDFAnnotation.meSubType == vcl::pdf::PDFAnnotationSubType::Highlight)
{
if (!rCustomAnnotationMarker.maLineColor.IsTransparent())
- rCustomAnnotationMarker.maLineColor.SetTransparency(0x90);
+ rCustomAnnotationMarker.maLineColor.SetAlpha(255 - 0x90);
auto* pMarker = static_cast<vcl::pdf::PDFAnnotationMarkerHighlight*>(
rPDFAnnotation.mpMarker.get());
for (auto const& rPolygon : pMarker->maQuads)
@@ -167,7 +167,7 @@ bool SdPdfFilter::Import()
rCustomAnnotationMarker.mnLineWidth = 1;
rCustomAnnotationMarker.maFillColor = rPDFAnnotation.maColor;
if (!rCustomAnnotationMarker.maFillColor.IsTransparent())
- rCustomAnnotationMarker.maFillColor.SetTransparency(0x90);
+ rCustomAnnotationMarker.maFillColor.SetAlpha(255 - 0x90);
}
else if (rPDFAnnotation.meSubType == vcl::pdf::PDFAnnotationSubType::Line)
{