INTEGRATION: CWS swnewlistlevelattrs_DEV300 (1.54.76); FILE MERGED

2008/02/05 10:59:05 od 1.54.76.1: #i85348# class <swTxtFrm> - enhancements for new list level attributes:
	 - member <mnAdditionalFirstLineOffset>
	 - methods <CalcAdditionalFirstLineOffset()> and <GetAdditionalFirstLineOffset()>

1 files changed, 27 insertions, 2 deletions

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index d024b6a7933e..08bb0a423334 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: txtfrm.hxx,v $
  *
- *  $Revision: 1.54 $
+ *  $Revision: 1.55 $
  *
- *  last change: $Author: ihi $ $Date: 2007-11-22 15:36:53 $
+ *  last change: $Author: kz $ $Date: 2008-03-05 17:02:28 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -96,6 +96,13 @@ class SwTxtFrm: public SwCntntFrm
     // OD 2004-03-17 #i11860# - re-factoring of #i11859#
     // member for height of last line (value needed for proportional line spacing)
     SwTwips mnHeightOfLastLine;
+    // --> OD 2008-01-31 #newlistlevelattrs#
+    // member for the additional first line offset, which is caused by the list
+    // label alignment for list level position and space mode LABEL_ALIGNMENT.
+    // This additional first line offset is used for the text formatting.
+    // It is NOT used for the determination of printing area.
+    SwTwips mnAdditionalFirstLineOffset;
+    // <--
 
 
     xub_StrLen nOfst;           //nOfst gibt den Offset im Cntnt (Anzahl Zeichen) an.
@@ -502,6 +509,24 @@ public:
     // keine Flys oder andere Hindernisse gaebe und liefert die Breite.
     SwTwips CalcFitToContent();
 
+    /** simulate format for a list item paragraph, whose list level attributes
+        are in LABEL_ALIGNMENT mode, in order to determine additional first
+        line offset for the real text formatting due to the value of label
+        adjustment attribute of the list level.
+
+        OD 2008-01-31 #newlistlevelattrs#
+
+        @author OD
+    */
+    void CalcAdditionalFirstLineOffset();
+
+    // --> OD 2008-01-31 #newlistlevelattrs#
+    inline SwTwips GetAdditionalFirstLineOffset() const
+    {
+        return mnAdditionalFirstLineOffset;
+    }
+    // <--
+
     // liefert den zusaetzlichen Zeilenabstand fuer den naechsten Absatz
     // OD 07.01.2004 #i11859# - change return data type;
     //      add default parameter <_bNoPropLineSpacing> to control, if the