diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-09-08 13:44:38 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-09-08 13:44:38 +0000 |
commit | aa91dc0ccbe53ffcec9dbfec2265de057775d4e3 (patch) | |
tree | 298b75eef9a2db8b9bf09cbe3d629d1934527866 /sw/inc/doc.hxx | |
parent | 9054ef50665d87331e9150e1b4dcc401c2bbfef5 (diff) |
CWS-TOOLING: integrate CWS sw32numbf01
2009-09-04 10:01:07 +0200 od r275780 : #i95907# method <SwWrtShell::NumOfBulletOn(..)>
- adjust indentation of newly created automatic list style
--> due to MRU add actual paragraph indentation to created automatic list style's indentation
2009-09-02 11:57:40 +0200 od r275703 : #i95907# method <SwTxtMargin::CtorInitTxtMargin(..)>
- correct handling of paragraph indents, when list level indents are applicable.
2009-09-01 16:59:47 +0200 od r275671 : CWS-TOOLING: rebase CWS sw32numbf01 to trunk@275331 (milestone: DEV300:m56)
2009-08-28 16:42:34 +0200 od r275540 : #i102458# method <SwFlowFrm::CalcUpperSpace(..)>
- correct handling of leading line spacing
method <GetSpacingValuesOfFrm(..)>
- add output parameter <obIsLineSpacingProportional>
2009-08-27 17:03:07 +0200 od r275496 : #i101516# method <SwTxtNode::SwTxtNode(..)>
- in case that the paragraph is add to a list, apply paragraph style's assigned
outline style list level as list level, if paragraph has no list level set already.
2009-08-27 15:23:34 +0200 od r275489 : #i101234# method <SwWrtShell::NumOrBulletOn(..)>
- check before activation of certain list level of outline numbering,
a numbering format is already set. In this only continue the outline numbering.
2009-08-27 14:15:07 +0200 od r275483 : #i95907# method <SwWrtShell::NumOrBulletOn(..)>
- consider leading tab stops and intentation of paragraph first text line,
when a new list style is created for its application to the selection.
2009-08-26 09:51:39 +0200 od r275401 : #i86492# Adjust copy of text nodes regarding lists
- copy of part of paragraph in list does not copy list style and list id
- copy of paragraphs in list into another list continues destination list
- copy of paragraphs (at least one not in a list) at empty paragraph following a list
does not continue the destination list.
2009-08-25 10:30:53 +0200 od r275339 : #i101349# method <XMLTextImportHelper::SetStyleAndAttrs(..)
- assure that list style of automatic paragraph style is applied at paragraph.
Diffstat (limited to 'sw/inc/doc.hxx')
-rw-r--r-- | sw/inc/doc.hxx | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index bd452fbaf15c..35656514a4c8 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1510,13 +1510,16 @@ public: // <-- void SetCounted( const SwPaM&, bool bCounted); - /** - Replace numbering rules in a PaM by another numbering rule. + // --> OD 2009-08-25 #i86492# + // no longer needed. + // SwDoc::SetNumRule( rPaM, rNumRule, false, <ListId>, sal_True, true ) have to be used instead. +// /** +// Replace numbering rules in a PaM by another numbering rule. - \param rPaM PaM to replace the numbering rules in - \param rNumRule numbering rule to replace the present numbering rules - */ - void ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule); +// \param rPaM PaM to replace the numbering rules in +// \param rNumRule numbering rule to replace the present numbering rules +// */ +// void ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule); void MakeUniqueNumRules(const SwPaM & rPaM); @@ -1576,8 +1579,8 @@ public: - FALSE: search backward \param bNum - TRUE: search for enumeration - FALSE: search for itemize - \param bOutline - TRUE: search for non-outline numbering rule - - FALSE: search for outline numbering rule + \param bOutline - TRUE: search for outline numbering rule + - FALSE: search for non-outline numbering rule \param nNonEmptyAllowed number of non-empty paragraphs allowed between rPos and found paragraph @@ -1589,13 +1592,13 @@ public: input parameter - boolean, indicating, if start node, determined by given start position has to be investigated or not. */ - const SwNumRule * SearchNumRule(SwPosition & rPos, - BOOL bForward, - BOOL bNum, - BOOL bOutline, + const SwNumRule * SearchNumRule(const SwPosition & rPos, + const bool bForward, + const bool bNum, + const bool bOutline, int nNonEmptyAllowed, String& sListId, - bool bInvestigateStartNode = false ); + const bool bInvestigateStartNode = false ); // Absaetze ohne Numerierung, aber mit Einzuegen sal_Bool NoNum( const SwPaM& ); |