new: EmphasisItem

6 files changed, 58 insertions, 15 deletions

diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 7e65a2d47737..c8a77c2215cc 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charatr.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:24 $
+ *  last change: $Author: jp $ $Date: 2000-10-30 12:49:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,12 @@
 #ifndef _CHARATR_HXX
 #define _CHARATR_HXX
 
-#include "format.hxx"
-#include "hintids.hxx"      // fuer die WhichIds
+#ifndef _FORMAT_HXX
+#include <format.hxx>
+#endif
+#ifndef _HINTIDS_HXX
+#include <hintids.hxx>      // fuer die WhichIds
+#endif
 
 
 /******************************************************************************
@@ -130,6 +134,8 @@ inline const SvxBlinkItem  &SwAttrSet::GetBlink(BOOL bInP) const
     {   return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); }
 inline const SvxBrushItem &SwAttrSet::GetChrBackground( BOOL bInP ) const
     {   return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); }
+inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( BOOL bInP ) const
+    {   return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); }
 
 /******************************************************************************
  *  Implementierung der Charakter-Attribut Methoden vom SwFmt
@@ -176,5 +182,7 @@ inline const SvxBlinkItem            &SwFmt::GetBlink(BOOL bInP) const
     {   return aSet.GetBlink(bInP); }
 inline const SvxBrushItem            &SwFmt::GetChrBackground(BOOL bInP) const
     {   return aSet.GetChrBackground(bInP); }
+inline const SvxEmphasisMarkItem    &SwFmt::GetEmphasisMark( BOOL bInP ) const
+    {   return aSet.GetEmphasisMark(bInP); }
 
 #endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index b31111c3ce1e..87fac94234d0 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: format.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: jp $ $Date: 2000-10-30 12:49:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -242,6 +242,8 @@ public:
     inline const SvxWeightItem       &GetCTLWeight( BOOL = TRUE ) const;
     inline const SfxBoolItem         &GetWritingDirection( BOOL = TRUE ) const;
 
+    inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const;
+
     // Frame-Attribute  - impl. steht im frmatr.hxx,
     // fuer LINUX, SINIX, HPUX auch in gcc_outl.cxx
 #if ( defined GCC && defined C272 && \
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 5ba6e893a966..d1130b5a4a6f 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hintids.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-10-16 10:29:28 $
+ *  last change: $Author: jp $ $Date: 2000-10-30 12:49:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,7 +120,7 @@ RES_CHRATR_BEGIN = HINT_BEGIN,
     RES_CHRATR_CTL_POSTURE,                 // 30
     RES_CHRATR_CTL_WEIGHT,                  // 31
     RES_CHRATR_WRITING_DIRECTION,           // 32
-    RES_CHRATR_DUMMY2,                      // 33
+    RES_CHRATR_EMPHASIS_MARK,               // 33
     RES_CHRATR_DUMMY3,                      // 34
     RES_CHRATR_DUMMY4,                      // 35
     RES_CHRATR_DUMMY5,                      // 36
@@ -442,6 +442,7 @@ BOOL IsInRange( const USHORT* pRange, const USHORT nId );
 #define ITEMID_NOHYPHENHERE RES_CHRATR_NOHYPHEN
 #define ITEMID_NOLINEBREAK  RES_CHRATR_NOLINEBREAK
 #define ITEMID_WORDLINEMODE RES_CHRATR_WORDLINEMODE
+#define ITEMID_EMPHASISMARK RES_CHRATR_EMPHASIS_MARK
 
 //Defines fuer die ehemaligen FrmAttribute, die jetzt in frmitems.hxx
 //von svx zu finden sind.
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 792efce4c2d5..abfc1d4cba9c 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swatrset.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:28 $
+ *  last change: $Author: jp $ $Date: 2000-10-30 12:49:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,6 +97,7 @@ class SvxEscapementItem;
 class SvxCaseMapItem;
 class SvxNoHyphenItem;
 class SvxBlinkItem;
+class SvxEmphasisMarkItem;
 
 // Frame-Attribute
 class SwFmtFillOrder;
@@ -268,6 +269,7 @@ public:
     inline const SvxPostureItem         &GetCTLPosture( BOOL = TRUE ) const;
     inline const SvxWeightItem          &GetCTLWeight( BOOL = TRUE ) const;
     inline const SfxBoolItem            &GetWritingDirection( BOOL = TRUE ) const;
+    inline const SvxEmphasisMarkItem    &GetEmphasisMark( BOOL = TRUE ) const;
 
     // Frame-Attribute  - impl. steht im frmatr.hxx
     inline const SwFmtFillOrder         &GetFillOrder( BOOL = TRUE ) const;
@@ -340,6 +342,9 @@ public:
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:28  hr
+      initial import
+
       Revision 1.48  2000/09/18 16:03:29  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index e376c2a22c47..c9b3a9aa3b60 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txatbase.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-23 11:58:55 $
+ *  last change: $Author: jp $ $Date: 2000-10-30 12:49:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,6 +97,7 @@ class SvxCharSetColorItem;
 class SvXMLAttrContainerItem;
 class SwFmtRuby;
 class SwFmt2Lines;
+class SvxEmphasisMarkItem;
 
 class SwFmtCharFmt;
 class SwFmtINetFmt;
@@ -188,6 +189,8 @@ public:
     inline const SwFmtRuby              &GetRuby() const;
     inline const SwFmt2Lines            &Get2Lines() const;
 
+    inline const SvxEmphasisMarkItem    &GetEmphasisMark() const;
+
 private:
     SwTxtAttr( const SwTxtAttr& );
     SwTxtAttr& operator=( const SwTxtAttr& );
@@ -418,9 +421,18 @@ inline const SwFmt2Lines& SwTxtAttr::Get2Lines() const
     return (const SwFmt2Lines&)*pAttr;
 }
 
+inline const SvxEmphasisMarkItem& SwTxtAttr::GetEmphasisMark() const
+{
+    ASSERT( pAttr && pAttr->Which() == RES_CHRATR_EMPHASIS_MARK, "Falsche Abfrage" );
+    return (const SvxEmphasisMarkItem&)*pAttr;
+}
+
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.2  2000/10/23 11:58:55  jp
+      new attributes Ruby and 2Lines
+
       Revision 1.1.1.1  2000/09/18 17:14:28  hr
       initial import
 
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 3c622cc9255b..3e3d8015bf00 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtatr.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-23 11:58:55 $
+ *  last change: $Author: jp $ $Date: 2000-10-30 12:49:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -462,6 +462,21 @@ public:
                     xub_StrLen nStart, xub_StrLen nEnd );
 };
 
+// EMPHASIS_MARK ************************************************************
+
+class SwTxtEmphasisMark : public SwTxtAttrEnd
+{
+    // Hier merkt es sich das SV-Attribut Weight aus dem Font.
+    FontEmphasisMark ePrevEmphasis;
+public:
+    SwTxtEmphasisMark( const SvxEmphasisMarkItem& rAttr,
+                        xub_StrLen nStart, xub_StrLen nEnd );
+
+    virtual void ChgFnt(SwFont *);
+    virtual void RstFnt(SwFont *);
+    virtual void ChgTxtAttr( SwTxtAttr & );
+    virtual void RstTxtAttr( SwTxtAttr & );
+};
 
 
 // --------------- Inline Implementierungen ------------------------