summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/charatr.hxx8
-rw-r--r--sw/inc/format.hxx5
-rw-r--r--sw/inc/hintids.hxx7
-rw-r--r--sw/inc/swatrset.hxx9
-rw-r--r--sw/inc/txatbase.hxx15
5 files changed, 33 insertions, 11 deletions
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 536216f3fcf1..3fb1e64ad6b3 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: charatr.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: jp $ $Date: 2001-02-15 20:10:39 $
+ * last change: $Author: jp $ $Date: 2001-03-05 13:50:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -142,6 +142,8 @@ inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( BOOL bInP ) const
{ return (const SvxCharScaleWidthItem&)Get( RES_CHRATR_SCALEW, bInP ); }
inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( BOOL bInP ) const
{ return (const SvxCharRotateItem&)Get( RES_CHRATR_ROTATE, bInP ); }
+inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( BOOL bInP ) const
+ { return (const SvxCharReliefItem&)Get( RES_CHRATR_RELIEF, bInP ); }
/******************************************************************************
* Implementierung der Charakter-Attribut Methoden vom SwFmt
@@ -196,5 +198,7 @@ inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( BOOL bInP ) const
{ return aSet.GetCharScaleW(bInP); }
inline const SvxCharRotateItem &SwFmt::GetCharRotate( BOOL bInP ) const
{ return aSet.GetCharRotate(bInP); }
+inline const SvxCharReliefItem &SwFmt::GetCharRelief( BOOL bInP ) const
+ { return aSet.GetCharRelief(bInP); }
#endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 637212ad6d1b..9511a417a21c 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: format.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: jp $ $Date: 2001-02-15 20:10:39 $
+ * last change: $Author: jp $ $Date: 2001-03-05 13:50:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -245,6 +245,7 @@ public:
inline const SvxTwoLinesItem &Get2Lines( BOOL = TRUE ) const;
inline const SvxCharScaleWidthItem &GetCharScaleW( BOOL = TRUE ) const;
inline const SvxCharRotateItem &GetCharRotate( BOOL = TRUE ) const;
+ inline const SvxCharReliefItem &GetCharRelief( 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 7c4f7640065d..12069539686c 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hintids.hxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: jp $ $Date: 2001-02-26 15:33:38 $
+ * last change: $Author: jp $ $Date: 2001-03-05 13:50:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -123,7 +123,7 @@ RES_CHRATR_BEGIN = HINT_BEGIN,
RES_CHRATR_EMPHASIS_MARK, // 33
RES_CHRATR_TWO_LINES, // 34
RES_CHRATR_SCALEW, // 35
- RES_CHRATR_DUMMY5, // 36
+ RES_CHRATR_RELIEF, // 36
RES_CHRATR_DUMMY1, // 37
RES_CHRATR_END
};
@@ -458,6 +458,7 @@ BOOL IsInRange( const USHORT* pRange, const USHORT nId );
#define ITEMID_TWOLINES RES_CHRATR_TWO_LINES
#define ITEMID_CHARSCALE_W RES_CHRATR_SCALEW
#define ITEMID_CHARROTATE RES_CHRATR_ROTATE
+#define ITEMID_CHARRELIEF RES_CHRATR_RELIEF
//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 5b093a4ad28c..3c7f2c33e880 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swatrset.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: jp $ $Date: 2001-02-15 20:10:38 $
+ * last change: $Author: jp $ $Date: 2001-03-05 13:50:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -101,6 +101,7 @@ class SvxEmphasisMarkItem;
class SvxTwoLinesItem;
class SvxCharScaleWidthItem;
class SvxCharRotateItem;
+class SvxCharReliefItem;
// Frame-Attribute
class SwFmtFillOrder;
@@ -281,6 +282,7 @@ public:
inline const SvxTwoLinesItem &Get2Lines( BOOL = TRUE ) const;
inline const SvxCharScaleWidthItem &GetCharScaleW( BOOL = TRUE ) const;
inline const SvxCharRotateItem &GetCharRotate( BOOL = TRUE ) const;
+ inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const;
// Frame-Attribute - impl. steht im frmatr.hxx
inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const;
@@ -356,6 +358,9 @@ public:
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.7 2001/02/15 20:10:38 jp
+ new character attribute: rotate and scalewidth
+
Revision 1.6 2000/11/29 17:18:49 os
#80913# forbidden rules
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index c70b4a5fa216..de19f17ed494 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txatbase.hxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: ama $ $Date: 2001-02-28 11:16:12 $
+ * last change: $Author: jp $ $Date: 2001-03-05 13:50:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -96,6 +96,7 @@ class SvxTwoLinesItem;
class SvxEmphasisMarkItem;
class SvxCharScaleWidthItem;
class SvxCharRotateItem;
+class SvxCharReliefItem;
class SwFmtCharFmt;
class SwFmtINetFmt;
@@ -205,6 +206,7 @@ public:
inline const SvxEmphasisMarkItem &GetEmphasisMark() const;
inline const SvxCharScaleWidthItem &GetCharScaleW() const;
inline const SvxCharRotateItem &GetCharRotate() const;
+ inline const SvxCharReliefItem &GetCharRelief() const;
private:
SwTxtAttr( const SwTxtAttr& );
@@ -459,10 +461,19 @@ inline const SvxCharRotateItem& SwTxtAttr::GetCharRotate() const
return (const SvxCharRotateItem&)*pAttr;
}
+inline const SvxCharReliefItem& SwTxtAttr::GetCharRelief() const
+{
+ ASSERT( pAttr && pAttr->Which() == RES_CHRATR_RELIEF, "Falsche Abfrage" );
+ return (const SvxCharReliefItem&)*pAttr;
+}
+
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.9 2001/02/28 11:16:12 ama
+ New: RedlineAttr-flag public
+
Revision 1.8 2001/02/28 10:58:56 ama
New: RedlineAttr-flag
generated by cgit (git 2.34.1) at 2024-08-09 15:30:24 +0000