[Libreoffice-commits] core.git: sw/source writerfilter/source

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/ww8par6.cxx              |   27 +++++++++++---------------
 writerfilter/source/dmapper/BorderHandler.cxx |    4 ---
 writerfilter/source/dmapper/DomainMapper.cxx  |    2 +
 3 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit f7456777224f95654a179d7320e3e90fe42ce581
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Mon Dec 23 18:56:14 2019 +0300
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jan 9 13:49:50 2020 +0100

    cleanup tdf#129522: indenting
    
    It is much easier to see what has changed if a commit does not
    include formatting changes. Since there were a couple of them,
    I separated it out into a separate patch.
    
    I don't normally do this, but it seems like a good idea,
    so I'm trying out the best way to do it.
    The bad-side would be an extra patch to backport,
    but I'm not expecting much desire to backport here.
    
    Change-Id: Icc0eae1a881af80c0b8230697b235d1901b55fe3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85871
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e33a691f7c7d..fc6a45e129dd 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5056,23 +5056,20 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 nId, const sal_uInt8* pData, sh
 
             SetWW8_BRC(nBrcVer, aBrc, pData, nLen);
 
-            {
-                Set1Border(*aBoxItem, aBrc, SvxBoxItemLine::TOP, 0, nullptr, true);
-                Set1Border(*aBoxItem, aBrc, SvxBoxItemLine::BOTTOM, 0, nullptr, true);
-                Set1Border(*aBoxItem, aBrc, SvxBoxItemLine::LEFT, 0, nullptr, true);
-                Set1Border(*aBoxItem, aBrc, SvxBoxItemLine::RIGHT, 0, nullptr, true);
-                NewAttr( *aBoxItem );
-
-                short aSizeArray[WW8_RIGHT+1]={0}; aSizeArray[WW8_RIGHT] = 1;
-                SvxShadowItem aShadowItem(RES_CHRATR_SHADOW);
-                // Word only allows shadows on visible borders
-                if ( aBoxItem->CalcLineSpace( SvxBoxItemLine::RIGHT ) )
-                   SetShadow( aShadowItem, &aSizeArray[0], aBrc );
-                NewAttr( aShadowItem );
-            }
+            Set1Border(*aBoxItem, aBrc, SvxBoxItemLine::TOP, 0, nullptr, true);
+            Set1Border(*aBoxItem, aBrc, SvxBoxItemLine::BOTTOM, 0, nullptr, true);
+            Set1Border(*aBoxItem, aBrc, SvxBoxItemLine::LEFT, 0, nullptr, true);
+            Set1Border(*aBoxItem, aBrc, SvxBoxItemLine::RIGHT, 0, nullptr, true);
+            NewAttr( *aBoxItem );
+
+            short aSizeArray[WW8_RIGHT+1]={0}; aSizeArray[WW8_RIGHT] = 1;
+            SvxShadowItem aShadowItem(RES_CHRATR_SHADOW);
+            // Word only allows shadows on visible borders
+            if ( aBoxItem->CalcLineSpace( SvxBoxItemLine::RIGHT ) )
+                SetShadow( aShadowItem, &aSizeArray[0], aBrc );
+            NewAttr( aShadowItem );
         }
     }
-
 }
 
 void SwWW8ImplReader::Read_Hyphenation( sal_uInt16, const sal_uInt8* pData, short nLen )
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index ec37f8aa26e3..d1459eb3b162 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -176,9 +176,7 @@ PropertyMapPtr  BorderHandler::getProperties()
     }
     return pPropertyMap;
 }
-/*-------------------------------------------------------------------------
-    used only in OOXML import
-  -----------------------------------------------------------------------*/
+
 table::BorderLine2 BorderHandler::getBorderLine()
 {
     table::BorderLine2 aBorderLine;
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 4093980c3c9e..f5f70e30e725 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3028,9 +3028,11 @@ void DomainMapper::lcl_startShape(uno::Reference<drawing::XShape> const& xShape)
         lcl_startParagraphGroup();
     }
     else
+    {
         // No context? Then this image should not appear directly inside the
         // document, just save it for later usage.
         m_pImpl->PushPendingShape(xShape);
+    }
 
     m_pImpl->SetIsFirstParagraphInShape(true);