sw/source/core/layout/flowfrm.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 647fc41763d1310479d59262734caa296f6e558d
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Oct 17 12:17:16 2018 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Oct 17 16:00:18 2018 +0200
Limit variable scope
Change-Id: I42d2e59297a70c977ec2f7782b403c1f79c434de
Reviewed-on: https://gerrit.libreoffice.org/61875
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 90123ceadc0e..e79318a065f3 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1416,9 +1416,9 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs
*pAttrs,
// OD 06.01.2004 #i11859#
{
const IDocumentSettingAccess& rIDSA =
m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess();
- const bool bUseFormerLineSpacing =
rIDSA.get(DocumentSettingId::OLD_LINE_SPACING);
if( pPrevFrame )
{
+ const bool bUseFormerLineSpacing =
rIDSA.get(DocumentSettingId::OLD_LINE_SPACING);
const bool bContextualSpacing = pAttrs->GetULSpace().GetContext()
&&
lcl_getContextualSpacing(pPrevFrame)
&& lcl_IdenticalStyles(pPrevFrame,
&m_rThis);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
