diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-22 10:25:32 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-22 11:22:46 +0200 |
| commit | 05fd8cb848ecba425124d61cd76e2f9418d5378c (patch) | |
| tree | f349610ba63d30caa5f3e07cf77de6e9ec9eae92 | |
| parent | 77104ccd7658cb8f3ac142ea9f7fabc15fc08580 (diff) | |
tdf#93970 Outline indents should not affect paragraph indents
Change-Id: I4d9f32becc6e601cd5af64919d93f9580dec738c
| -rw-r--r-- | sw/source/core/doc/DocumentStylePoolManager.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index 9f05e1725833..68844918e9da 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -195,15 +195,21 @@ namespace SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule(); const SwNumFormat& rNFormat = pOutlineRule->Get( nLevel ); - if ( rNFormat.GetPositionAndSpaceMode() == - SvxNumberFormat::LABEL_WIDTH_AND_POSITION && + SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) ); + if ( rNFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION && ( rNFormat.GetAbsLSpace() || rNFormat.GetFirstLineOffset() ) ) { - SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) ); aLR.SetTextFirstLineOfstValue( rNFormat.GetFirstLineOffset() ); aLR.SetTextLeft( rNFormat.GetAbsLSpace() ); - pColl->SetFormatAttr( aLR ); } + else + { + // tdf#93970 The indent set at the associated outline style also affects this paragraph. + // We don't want this here, so override it. This doesn't affect the outline style properties. + aLR.SetTextFirstLineOfstValue( 0 ); + aLR.SetTextLeft( 0 ); + } + pColl->SetFormatAttr( aLR ); // All paragraph styles, which are assigned to a level of the // outline style has to have the outline style set as its list style. |