mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare for removal of non-const operator[] from Sequence in cppcanvas

Browse Source 
Change-Id: I2a16a8ea7776447592e51a23ce21aac0a156735f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124354
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2021-10-29 08:11:39 +03:00
parent 894b4911ff
commit a9d314b57b
4 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cppcanvas/qa/unit/test.cxx
View File

@@ -62,11 +62,10 @@ void CanvasTest::testComposite()
{ {
// render something // render something
rendering::RenderState aDefaultState; rendering::RenderState aDefaultState;
uno::Sequence< double > aRedTransparent( 4 ); uno::Sequence< double > aRedTransparent{ 1.0, // R
aRedTransparent[0] = 1.0; // R 0.0, // G
aRedTransparent[1] = 0.0; // G 0.0, // B
aRedTransparent[2] = 0.0; // B 0.5 }; // A
aRedTransparent[3] = 0.5; // A
aDefaultState.DeviceColor = aRedTransparent; aDefaultState.DeviceColor = aRedTransparent;
#if 0 #if 0
// words fail me to describe the sheer beauty of allocating a UNO // words fail me to describe the sheer beauty of allocating a UNO

29
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -21,6 +21,7 @@
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <comphelper/propertysequence.hxx> #include <comphelper/propertysequence.hxx>
#include <comphelper/propertyvalue.hxx>
#include <cppcanvas/canvas.hxx> #include <cppcanvas/canvas.hxx>
#include <com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <com/sun/star/rendering/TexturingMode.hpp> #include <com/sun/star/rendering/TexturingMode.hpp>
@@ -545,29 +546,18 @@ namespace cppcanvas::internal
vcl::unotools::colorToDoubleSequence( aVCLEndColor, vcl::unotools::colorToDoubleSequence( aVCLEndColor,
xColorSpace )); xColorSpace ));
uno::Sequence< uno::Sequence < double > > aColors(2); uno::Sequence< uno::Sequence < double > > aColors;
uno::Sequence< double > aStops(2); uno::Sequence< double > aStops;
if( rGradient.GetStyle() == GradientStyle::Axial ) if( rGradient.GetStyle() == GradientStyle::Axial )
{ {
aStops.realloc(3); aStops = { 0.0, 0.5, 1.0 };
aColors.realloc(3); aColors = { aEndColor, aStartColor, aEndColor };
aStops[0] = 0.0;
aStops[1] = 0.5;
aStops[2] = 1.0;
aColors[0] = aEndColor;
aColors[1] = aStartColor;
aColors[2] = aEndColor;
} }
else else
{ {
aStops[0] = 0.0; aStops = { 0.0, 1.0 };
aStops[1] = 1.0; aColors = { aStartColor, aEndColor };
aColors[0] = aStartColor;
aColors[1] = aEndColor;
} }
const ::basegfx::B2DRectangle aBounds( const ::basegfx::B2DRectangle aBounds(
@@ -840,9 +830,8 @@ namespace cppcanvas::internal
if (rFont.GetEmphasisMark() != FontEmphasisMark::NONE) if (rFont.GetEmphasisMark() != FontEmphasisMark::NONE)
{ {
uno::Sequence< beans::PropertyValue > aProperties(1); uno::Sequence< beans::PropertyValue > aProperties{ comphelper::makePropertyValue(
aProperties[0].Name = "EmphasisMark"; "EmphasisMark", sal_uInt32(rFont.GetEmphasisMark())) };
aProperties[0].Value <<= sal_uInt32(rFont.GetEmphasisMark());
return rParms.mrCanvas->getUNOCanvas()->createFont(aFontRequest, return rParms.mrCanvas->getUNOCanvas()->createFont(aFontRequest,
aProperties, aProperties,
aFontMatrix); aFontMatrix);

4
cppcanvas/source/mtfrenderer/polypolyaction.cxx
View File

@@ -122,7 +122,7 @@ namespace cppcanvas::internal
// TODO(F1): Color management // TODO(F1): Color management
// adapt fill color transparency // adapt fill color transparency
maFillColor[3] = 1.0 - nTransparency / 100.0; maFillColor.getArray()[3] = 1.0 - nTransparency / 100.0;
} }
if( bStroke ) if( bStroke )
@@ -134,7 +134,7 @@ namespace cppcanvas::internal
// TODO(F1): Color management // TODO(F1): Color management
// adapt fill color transparency // adapt fill color transparency
maState.DeviceColor[3] = 1.0 - nTransparency / 100.0; maState.DeviceColor.getArray()[3] = 1.0 - nTransparency / 100.0;
} }
} }

13
cppcanvas/source/tools/tools.cxx
View File

@@ -27,13 +27,12 @@ namespace cppcanvas::tools
{ {
uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA aColor ) uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA aColor )
{ {
uno::Sequence< double > aRes( 4 ); uno::Sequence< double > aRes{
getRed(aColor) / 255.0,
aRes[0] = getRed(aColor) / 255.0; getGreen(aColor) / 255.0,
aRes[1] = getGreen(aColor) / 255.0; getBlue(aColor) / 255.0,
aRes[2] = getBlue(aColor) / 255.0; getAlpha(aColor) / 255.0
aRes[3] = getAlpha(aColor) / 255.0; };
return aRes; return aRes;
} }