diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-09-12 10:30:01 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-09-12 13:26:40 +0200 |
| commit | 41c704a8d6ca225e0ba0b1deb730c2bead66da25 (patch) | |
| tree | e53c8fc20cb3c519c34a8481c25f2ef3a0f1c1b4 /drawinglayer | |
| parent | 7b1fbcb0e0e1f29814c646dbe283fa0eabed099a (diff) | |
tdf#111853 Added TextFillColor to operator==
TextFillColor was added to TextSimplePortionPrimitive2D, but not added to
TextSimplePortionPrimitive2D::operator==, so when this changed it was not
detected. Added this.
Also added was bFilled and nWidthToFill, all defaulted. This is not accessible
for TextDecoratedPortionPrimitive2D and seems to be some special solution
just for one special case in DrawPortionInfo, only used from Outliner::DrawingTab,
so I am not sure if that change to the central TextSimplePortionPrimitive2D is
good and should stay
Change-Id: Ief8da74a8b66281e47c4c8a47131125e30b90e7d
Reviewed-on: https://gerrit.libreoffice.org/42188
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Tested-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/textprimitive2d.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 0cf27bbba440..3dc00a9e1a99 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -225,7 +225,7 @@ namespace drawinglayer const basegfx::BColor& rFontColor, bool bFilled, long nWidthToFill, - const Color& rFillColor) + const Color& rTextFillColor) : BufferedDecompositionPrimitive2D(), maTextTransform(rNewTransform), maText(rText), @@ -235,10 +235,10 @@ namespace drawinglayer maFontAttribute(rFontAttribute), maLocale(rLocale), maFontColor(rFontColor), - maB2DRange(), mbFilled(bFilled), mnWidthToFill(nWidthToFill), - maTextFillColor(rFillColor) + maTextFillColor(rTextFillColor), + maB2DRange() { #if OSL_DEBUG_LEVEL > 0 const sal_Int32 aStringLength(getText().getLength()); @@ -269,7 +269,8 @@ namespace drawinglayer && LocalesAreEqual(getLocale(), rCompare.getLocale()) && getFontColor() == rCompare.getFontColor() && mbFilled == rCompare.mbFilled - && mnWidthToFill == rCompare.mnWidthToFill); + && mnWidthToFill == rCompare.mnWidthToFill + && maTextFillColor == rCompare.maTextFillColor); } return false; |