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

2 files changed, 8 insertions, 14 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
index e8a00e3924f2..5593d55abd1c 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
@@ -4,9 +4,9 @@
  *
  *  $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 terms of GNU Lesser General Public License Version 2.1.
@@ -216,7 +216,6 @@ namespace drawinglayer
             unsigned                                    mbEmphasisMarkAbove : 1;
             unsigned                                    mbEmphasisMarkBelow : 1;
             unsigned                                    mbShadow : 1;
-            unsigned                                    mbOutline : 1;
 
         protected:
             // local decomposition.
@@ -237,8 +236,7 @@ namespace drawinglayer
                 bool bEmphasisMarkAbove = true,
                 bool bEmphasisMarkBelow = false,
                 FontRelief eFontRelief = FONT_RELIEF_NONE,
-                bool bShadow = false,
-                bool bOutline = false);
+                bool bShadow = false);
 
             // get data
             FontUnderline getFontUnderline() const { return meFontUnderline; }
@@ -250,7 +248,6 @@ namespace drawinglayer
             bool getEmphasisMarkAbove() const { return mbEmphasisMarkAbove; }
             bool getEmphasisMarkBelow() const { return mbEmphasisMarkBelow; }
             bool getShadow() const { return mbShadow; }
-            bool getOutline() const { return mbOutline; }
 
             // compare operator
             virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index ebba6af9b51b..dce06c48f97a 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -4,9 +4,9 @@
  *
  *  $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 terms of GNU Lesser General Public License Version 2.1.
@@ -534,8 +534,7 @@ namespace drawinglayer
             bool bEmphasisMarkAbove,
             bool bEmphasisMarkBelow,
             FontRelief eFontRelief,
-            bool bShadow,
-            bool bOutline)
+            bool bShadow)
         :   TextSimplePortionPrimitive2D(rNewTransform, rText, rDXArray, rFontAttributes, rFontColor),
             meFontUnderline(eFontUnderline),
             meFontStrikeout(eFontStrikeout),
@@ -545,8 +544,7 @@ namespace drawinglayer
             mbWordLineMode(bWordLineMode),
             mbEmphasisMarkAbove(bEmphasisMarkAbove),
             mbEmphasisMarkBelow(bEmphasisMarkBelow),
-            mbShadow(bShadow),
-            mbOutline(bOutline)
+            mbShadow(bShadow)
         {
         }
 
@@ -564,8 +562,7 @@ namespace drawinglayer
                     && getEmphasisMarkAbove() == rCompare.getEmphasisMarkAbove()
                     && getEmphasisMarkBelow() == rCompare.getEmphasisMarkBelow()
                     && getFontRelief() == rCompare.getFontRelief()
-                    && getShadow() == rCompare.getShadow()
-                    && getOutline() == rCompare.getOutline());
+                    && getShadow() == rCompare.getShadow());
             }
 
             return false;