strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

outline-flag is a font attribute, not a portion attribute

Browse source
This commit is contained in:
Herbert Duerr 2007-02-21 10:28:48 +00:00
parent 6b721d4ecb
commit 345f244a3d
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: textprimitive2d.hxx,v $ * $RCSfile: textprimitive2d.hxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: hdu $ $Date: 2007-02-21 09:00:33 $ * last change: $Author: hdu $ $Date: 2007-02-21 11:28:48 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -216,7 +216,6 @@ namespace drawinglayer
unsigned mbEmphasisMarkAbove : 1; unsigned mbEmphasisMarkAbove : 1;
unsigned mbEmphasisMarkBelow : 1; unsigned mbEmphasisMarkBelow : 1;
unsigned mbShadow : 1; unsigned mbShadow : 1;
unsigned mbOutline : 1;
protected: protected:
// local decomposition. // local decomposition.
@ -237,8 +236,7 @@ namespace drawinglayer
bool bEmphasisMarkAbove = true, bool bEmphasisMarkAbove = true,
bool bEmphasisMarkBelow = false, bool bEmphasisMarkBelow = false,
FontRelief eFontRelief = FONT_RELIEF_NONE, FontRelief eFontRelief = FONT_RELIEF_NONE,
bool bShadow = false, bool bShadow = false);
bool bOutline = false);
// get data // get data
FontUnderline getFontUnderline() const { return meFontUnderline; } FontUnderline getFontUnderline() const { return meFontUnderline; }
@ -250,7 +248,6 @@ namespace drawinglayer
bool getEmphasisMarkAbove() const { return mbEmphasisMarkAbove; } bool getEmphasisMarkAbove() const { return mbEmphasisMarkAbove; }
bool getEmphasisMarkBelow() const { return mbEmphasisMarkBelow; } bool getEmphasisMarkBelow() const { return mbEmphasisMarkBelow; }
bool getShadow() const { return mbShadow; } bool getShadow() const { return mbShadow; }
bool getOutline() const { return mbOutline; }
// compare operator // compare operator
virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;

13
drawinglayer/source/primitive2d/textprimitive2d.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: textprimitive2d.cxx,v $ * $RCSfile: textprimitive2d.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: hdu $ $Date: 2007-02-21 09:00:33 $ * last change: $Author: hdu $ $Date: 2007-02-21 11:28:48 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -534,8 +534,7 @@ namespace drawinglayer
bool bEmphasisMarkAbove, bool bEmphasisMarkAbove,
bool bEmphasisMarkBelow, bool bEmphasisMarkBelow,
FontRelief eFontRelief, FontRelief eFontRelief,
bool bShadow, bool bShadow)
bool bOutline)
: TextSimplePortionPrimitive2D(rNewTransform, rText, rDXArray, rFontAttributes, rFontColor), : TextSimplePortionPrimitive2D(rNewTransform, rText, rDXArray, rFontAttributes, rFontColor),
meFontUnderline(eFontUnderline), meFontUnderline(eFontUnderline),
meFontStrikeout(eFontStrikeout), meFontStrikeout(eFontStrikeout),
@ -545,8 +544,7 @@ namespace drawinglayer
mbWordLineMode(bWordLineMode), mbWordLineMode(bWordLineMode),
mbEmphasisMarkAbove(bEmphasisMarkAbove), mbEmphasisMarkAbove(bEmphasisMarkAbove),
mbEmphasisMarkBelow(bEmphasisMarkBelow), mbEmphasisMarkBelow(bEmphasisMarkBelow),
mbShadow(bShadow), mbShadow(bShadow)
mbOutline(bOutline)
{ {
} }
@ -564,8 +562,7 @@ namespace drawinglayer
&& getEmphasisMarkAbove() == rCompare.getEmphasisMarkAbove() && getEmphasisMarkAbove() == rCompare.getEmphasisMarkAbove()
&& getEmphasisMarkBelow() == rCompare.getEmphasisMarkBelow() && getEmphasisMarkBelow() == rCompare.getEmphasisMarkBelow()
&& getFontRelief() == rCompare.getFontRelief() && getFontRelief() == rCompare.getFontRelief()
&& getShadow() == rCompare.getShadow() && getShadow() == rCompare.getShadow());
&& getOutline() == rCompare.getOutline());
} }
return false; return false;