summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhz <khz@openoffice.org>2000-12-12 14:35:03 +0000
committerkhz <khz@openoffice.org>2000-12-12 14:35:03 +0000
commit27c03d2350d2f2c6e63a255f9fd6cc2f07b2c405 (patch)
treed8e1e1d2886e8711bd8881ed6b6689b7e5a5d126
parent355850d06a489a6fdb251a70edd9294e6bdf7f30 (diff)
#80856# take into account negative indentation in SetNumLSpace()
-rw-r--r--sw/source/filter/basflt/fltini.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 376813b5aad3..aa37c42cf3a0 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fltini.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: mib $ $Date: 2000-12-02 11:03:48 $
+ * last change: $Author: khz $ $Date: 2000-12-12 15:35:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -712,13 +712,11 @@ void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
aLR.SetTxtLeft( 0 );
else
{
- USHORT nLeft = rFmt.GetAbsLSpace(), nParaLeft = rLR.GetTxtLeft();
+ long nLeft = rFmt.GetAbsLSpace(), nParaLeft = rLR.GetTxtLeft();
if( 0 < rLR.GetTxtFirstLineOfst() )
nParaLeft += rLR.GetTxtFirstLineOfst();
- else if( nLeft < nParaLeft )
- nParaLeft -= nLeft;
else
- nParaLeft = 0;
+ nParaLeft -= nLeft;
aLR.SetTxtLeft( nParaLeft );
}
@@ -1546,6 +1544,9 @@ Color ConvertBrushStyle(const Color& rCol, const Color& rFillCol, BYTE nStyle)
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.5 2000/12/02 11:03:48 mib
+ #80795#: XML package filter
+
Revision 1.4 2000/11/20 14:17:21 jp
ReadFilterFlags removed, use new class SwFilterOptions