summaryrefslogtreecommitdiff
path: root/sw/source/core/inc
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-09-08 13:44:38 +0000
committerOliver Bolte <obo@openoffice.org>2009-09-08 13:44:38 +0000
commitaa91dc0ccbe53ffcec9dbfec2265de057775d4e3 (patch)
tree298b75eef9a2db8b9bf09cbe3d629d1934527866 /sw/source/core/inc
parent9054ef50665d87331e9150e1b4dcc401c2bbfef5 (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/source/core/inc')
-rw-r--r--sw/source/core/inc/frmtool.hxx17
1 files changed, 11 insertions, 6 deletions
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 992ed583ed9d..ed172b310a01 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -518,21 +518,26 @@ inline BOOL SwBorderAttrs::IsLine() const
OD 2004-03-10 #i28701#
Values only provided for flow frames (table, section or text frames)
Note: line spacing value is only determined for text frames
+ OD 2009-08-28 #i102458#
+ Add output parameter <obIsLineSpacingProportional>
- @param _rFrm
+ @param rFrm
input parameter - frame, for which the spacing values are determined.
- @param _roPrevLowerSpacing
+ @param onPrevLowerSpacing
output parameter - lower spacing of the frame in SwTwips
- @param _roPrevLineSpacing
+ @param onPrevLineSpacing
output parameter - line spacing of the frame in SwTwips
+ @param obIsLineSpacingProportional
+
@author OD
*/
-void GetSpacingValuesOfFrm( const SwFrm& _rFrm,
- SwTwips& _roLowerSpacing,
- SwTwips& _roLineSpacing );
+void GetSpacingValuesOfFrm( const SwFrm& rFrm,
+ SwTwips& onLowerSpacing,
+ SwTwips& onLineSpacing,
+ bool& obIsLineSpacingProportional );
/** method to get the content of the table cell