diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-04-16 05:13:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-04-16 05:13:22 +0000 |
| commit | d75c198f839b3f5b61179b5eb1d73eaefbdb918c (patch) | |
| tree | dfdfa2a523e0b039aca41aace39c68d86684e4b2 | |
| parent | a43438263e1463209c4f0a1ef1527c059046f0c9 (diff) | |
CWS-TOOLING: integrate CWS fwk110
2009-04-03 11:16:33 +0200 pl r270467 : fix the vanishing form contro problem
2009-04-03 09:26:00 +0200 cd r270455 : #159523# Use build id to check for showing the registration dialog again
2009-04-03 09:22:55 +0200 od r270454 : #i100732# method <SwTxtFormatter::NewTabPortion(..)>
- correction of condition for applying automatic tab stop at left margin
| -rw-r--r-- | sw/source/core/text/txttab.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index dfa6aaae09..5a3ebd0e30 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -235,16 +235,18 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) } // <-- - // --> OD 2009-02-23 #i99384# + // --> OD 2009-04-03 #i100732# // correction of condition, when a tab stop at the left margin can // be applied: // If the paragraph is not inside a list having a list tab stop following - // the list label or no further tab stop found in such a paragraph, + // the list label or no further tab stop found in such a paragraph or + // the next tab stop position does not equal the list tab stop, // a tab stop at the left margin can be applied. If this condition is // not hold, it is overruled by compatibility option TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST. const bool bTabAtLeftMargin = ( !aLineInf.IsListTabStopIncluded() || - !pTabStop ) || + !pTabStop || + nNextPos != aLineInf.GetListTabStopPosition() ) || // compatibility option TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: pFrm->GetTxtNode()->getIDocumentSettingAccess()-> get(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); |