SwFmt2Lines moved to SVX and renamed

6 files changed, 33 insertions, 26 deletions

diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index d2069e4fc101..a98a499e115b 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charatr.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-02 17:26:48 $
+ *  last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -126,9 +126,9 @@ inline const SvxLanguageItem     &SwAttrSet::GetCTLLanguage(BOOL bInP) const
     {   return (const SvxLanguageItem&)Get( RES_CHRATR_CTL_LANGUAGE,bInP); }
 inline const SvxEscapementItem   &SwAttrSet::GetEscapement(BOOL bInP) const
     {   return (const SvxEscapementItem&)Get( RES_CHRATR_ESCAPEMENT,bInP); }
-inline const SvxCaseMapItem      &SwAttrSet::GetCaseMap(BOOL bInP) const
+inline const SvxCaseMapItem     &SwAttrSet::GetCaseMap(BOOL bInP) const
     {   return (const SvxCaseMapItem&)Get( RES_CHRATR_CASEMAP,bInP); }
-inline const SvxNoHyphenItem     &SwAttrSet::GetNoHyphenHere(BOOL bInP) const
+inline const SvxNoHyphenItem    &SwAttrSet::GetNoHyphenHere(BOOL bInP) const
     {   return (const SvxNoHyphenItem&)Get( RES_CHRATR_NOHYPHEN,bInP); }
 inline const SvxBlinkItem  &SwAttrSet::GetBlink(BOOL bInP) const
     {   return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); }
@@ -136,8 +136,8 @@ 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 ); }
-inline const SwFmt2Lines        &SwAttrSet::Get2Lines( BOOL bInP ) const
-    {   return (const SwFmt2Lines&)Get( RES_CHRATR_TWO_LINES, bInP ); }
+inline const SvxTwoLinesItem    &SwAttrSet::Get2Lines( BOOL bInP ) const
+    {   return (const SvxTwoLinesItem&)Get( RES_CHRATR_TWO_LINES, bInP ); }
 
 /******************************************************************************
  *  Implementierung der Charakter-Attribut Methoden vom SwFmt
@@ -186,7 +186,7 @@ inline const SvxBrushItem            &SwFmt::GetChrBackground(BOOL bInP) const
     {   return aSet.GetChrBackground(bInP); }
 inline const SvxEmphasisMarkItem    &SwFmt::GetEmphasisMark( BOOL bInP ) const
     {   return aSet.GetEmphasisMark(bInP); }
-inline const SwFmt2Lines            &SwFmt::Get2Lines( BOOL bInP ) const
+inline const SvxTwoLinesItem        &SwFmt::Get2Lines( BOOL bInP ) const
     {   return aSet.Get2Lines(bInP); }
 
 #endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 827371b1fbee..dd8a9afaed33 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: format.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-02 17:26:48 $
+ *  last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -243,7 +243,7 @@ public:
     inline const SfxBoolItem         &GetWritingDirection( BOOL = TRUE ) const;
 
     inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const;
-    inline const SwFmt2Lines         &Get2Lines( BOOL = TRUE ) const;
+    inline const SvxTwoLinesItem    &Get2Lines( BOOL = TRUE ) const;
 
     // Frame-Attribute  - impl. steht im frmatr.hxx,
     // fuer LINUX, SINIX, HPUX auch in gcc_outl.cxx
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 48049ed85440..e814d8130d58 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hintids.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-15 14:13:59 $
+ *  last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -444,6 +444,7 @@ BOOL IsInRange( const USHORT* pRange, const USHORT nId );
 #define ITEMID_NOLINEBREAK  RES_CHRATR_NOLINEBREAK
 #define ITEMID_WORDLINEMODE RES_CHRATR_WORDLINEMODE
 #define ITEMID_EMPHASISMARK RES_CHRATR_EMPHASIS_MARK
+#define ITEMID_TWOLINES     RES_CHRATR_TWO_LINES
 
 //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 af71ca036e83..fa4fd0637a3f 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swatrset.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-02 17:26:48 $
+ *  last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,7 +98,7 @@ class SvxCaseMapItem;
 class SvxNoHyphenItem;
 class SvxBlinkItem;
 class SvxEmphasisMarkItem;
-class SwFmt2Lines;
+class SvxTwoLinesItem;
 
 // Frame-Attribute
 class SwFmtFillOrder;
@@ -271,7 +271,7 @@ public:
     inline const SvxWeightItem          &GetCTLWeight( BOOL = TRUE ) const;
     inline const SfxBoolItem            &GetWritingDirection( BOOL = TRUE ) const;
     inline const SvxEmphasisMarkItem    &GetEmphasisMark( BOOL = TRUE ) const;
-    inline const SwFmt2Lines            &Get2Lines( BOOL = TRUE ) const;
+    inline const SvxTwoLinesItem        &Get2Lines( BOOL = TRUE ) const;
 
     // Frame-Attribute  - impl. steht im frmatr.hxx
     inline const SwFmtFillOrder         &GetFillOrder( BOOL = TRUE ) const;
@@ -344,6 +344,9 @@ public:
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.3  2000/11/02 17:26:48  jp
+      TwoLines as char and not as text attribute
+
       Revision 1.2  2000/10/30 12:49:30  jp
       new: EmphasisItem
 
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index cc2d0b765d29..73ccd6c9ee5c 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txatbase.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-06 10:46:50 $
+ *  last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,7 +92,7 @@ class SvxColorItem;
 class SvxCharSetColorItem;
 class SvXMLAttrContainerItem;
 class SwFmtRuby;
-class SwFmt2Lines;
+class SvxTwoLinesItem;
 class SvxEmphasisMarkItem;
 class SwFmtCharFmt;
 class SwFmtINetFmt;
@@ -195,7 +195,7 @@ public:
     inline const SwFmtINetFmt           &GetINetFmt() const;
     inline const SvXMLAttrContainerItem &GetXMLAttrContainer() const;
     inline const SwFmtRuby              &GetRuby() const;
-    inline const SwFmt2Lines            &Get2Lines() const;
+    inline const SvxTwoLinesItem        &Get2Lines() const;
     inline const SvxEmphasisMarkItem    &GetEmphasisMark() const;
 
 private:
@@ -426,11 +426,11 @@ inline const SwFmtRuby& SwTxtAttr::GetRuby() const
             "Falsche Abfrage" );
     return (const SwFmtRuby&)*pAttr;
 }
-inline const SwFmt2Lines& SwTxtAttr::Get2Lines() const
+inline const SvxTwoLinesItem& SwTxtAttr::Get2Lines() const
 {
     ASSERT( pAttr && pAttr->Which() == RES_CHRATR_TWO_LINES,
             "Falsche Abfrage" );
-    return (const SwFmt2Lines&)*pAttr;
+    return (const SvxTwoLinesItem&)*pAttr;
 }
 
 inline const SvxEmphasisMarkItem& SwTxtAttr::GetEmphasisMark() const
@@ -442,6 +442,9 @@ inline const SvxEmphasisMarkItem& SwTxtAttr::GetEmphasisMark() const
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.5  2000/11/06 10:46:50  jp
+      new flags for the SwTxtAttr
+
       Revision 1.4  2000/11/02 17:26:48  jp
       TwoLines as char and not as text attribute
 
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 3e3d8015bf00..846d1ca9a63d 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtatr.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-30 12:49:30 $
+ *  last change: $Author: jp $ $Date: 2000-11-16 21:29:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,7 +90,7 @@ class SwCharSetCol;
 class SwImplPrev;
 class SwFmtRuby;
 class SwCharFmt;
-class SwFmt2Lines;
+class SvxTwoLinesItem;
 
 // ATT_FONT ***********************************************************
 
@@ -458,7 +458,7 @@ public:
 class SwTxt2Lines : public SwTxtAttrEnd
 {
 public:
-    SwTxt2Lines( const SwFmt2Lines& rAttr,
+    SwTxt2Lines( const SvxTwoLinesItem& rAttr,
                     xub_StrLen nStart, xub_StrLen nEnd );
 };