summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/frmtool.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/layout/frmtool.cxx')
-rw-r--r--sw/source/core/layout/frmtool.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 5c6e6cc4dd44..d62d60d3b44c 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3737,7 +3737,8 @@ SwRect SwPageFrame::PrtWithoutHeaderAndFooter() const
void GetSpacingValuesOfFrame( const SwFrame& rFrame,
SwTwips& onLowerSpacing,
SwTwips& onLineSpacing,
- bool& obIsLineSpacingProportional )
+ bool& obIsLineSpacingProportional,
+ bool bIdenticalStyles )
{
if ( !rFrame.IsFlowFrame() )
{
@@ -3747,7 +3748,11 @@ void GetSpacingValuesOfFrame( const SwFrame& rFrame,
else
{
const SvxULSpaceItem& rULSpace = rFrame.GetAttrSet()->GetULSpace();
- onLowerSpacing = rULSpace.GetLower();
+ // check contextual spacing if the style of actual and next paragraphs are identical
+ if (bIdenticalStyles)
+ onLowerSpacing = (rULSpace.GetContext() ? 0 : rULSpace.GetLower());
+ else
+ onLowerSpacing = rULSpace.GetLower();
onLineSpacing = 0;
obIsLineSpacingProportional = false;