diff options
| author | Andreas Martens <ama@openoffice.org> | 2000-11-30 14:13:56 +0000 |
|---|---|---|
| committer | Andreas Martens <ama@openoffice.org> | 2000-11-30 14:13:56 +0000 |
| commit | a17d38186e35f3defabdd282e6fffd4d581edfb4 (patch) | |
| tree | a70fece25854b9c070898da6ff0f28bbc3e8c04c | |
| parent | 27f402f3331b7ae302e47821cc6a780810a5cd4e (diff) | |
#80861#: Tabulator in negativ indent
| -rw-r--r-- | sw/source/core/text/inftxt.hxx | 10 | ||||
| -rw-r--r-- | sw/source/core/text/txttab.cxx | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 225324398479..04ed62e4f629 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: inftxt.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: ama $ $Date: 2000-11-29 13:22:39 $ + * last change: $Author: ama $ $Date: 2000-11-30 15:13:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,9 +131,9 @@ public: inline SwLineInfo( const SwAttrSet& rAttrSet ) { CtorInit( rAttrSet ); } // Liefert den Tabstop, der auf LinePos folgt, oder 0. - const SvxTabStop *GetTabStop( const KSHORT nLinePos, - const KSHORT nLeft, - const KSHORT nRight ) const; + const SvxTabStop *GetTabStop( const SwTwips nLinePos, + const SwTwips nLeft, + const SwTwips nRight ) const; inline const SvxLineSpacingItem *GetLineSpacing() const { return pSpace; } inline KSHORT GetDefTabStop() const { return nDefTabStop; } inline void SetDefTabStop( KSHORT nNew ) const diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 5834ff3503a0..0dcc8c4f9578 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txttab.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:08:26 $ + * last change: $Author: ama $ $Date: 2000-11-30 15:13:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,8 +99,8 @@ -const SvxTabStop *SwLineInfo::GetTabStop( const KSHORT nLinePos, - const KSHORT nLeft, const KSHORT nRight ) const +const SvxTabStop *SwLineInfo::GetTabStop( const SwTwips nLinePos, + const SwTwips nLeft, const SwTwips nRight ) const { // Mit den KSHORTs aufpassen, falls nLinePos < nLeft SwTwips nPos = nLinePos; @@ -153,12 +153,12 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf ) const In dieser Methode wird zwischen beiden Koordinatensystemen konvertiert (vgl. rInf.GetTabPos). */ - const KSHORT nTabLeft = KSHORT(pFrm->Frm().Left()) + - KSHORT(pFrm->GetAttrSet()->GetLRSpace().GetTxtLeft()); + const SwTwips nTabLeft = pFrm->Frm().Left() + + pFrm->GetAttrSet()->GetLRSpace().GetTxtLeft(); // + KSHORT(pFrm->GetTxtNode()->GetLeftMarginWithNum( sal_True )); - const KSHORT nLinePos = KSHORT(GetLeftMargin()); - const KSHORT nLineTab = nLinePos + nTabPos; - const KSHORT nRight = KSHORT(Right()); + const SwTwips nLinePos = GetLeftMargin(); + const SwTwips nLineTab = nLinePos + nTabPos; + const SwTwips nRight = Right(); SwTwips nNextPos; const SvxTabStop* pTabStop = aLineInf.GetTabStop( nLineTab, nTabLeft, nRight ); |