[Libreoffice-commits] core.git: 2 commits - filter/source sc/source

[Markus Mohrhard]

 filter/source/msfilter/msdffimp.cxx |    9 ++++++---
 sc/source/core/data/column.cxx      |   20 ++++++++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 32e9332a218f9e7441df158c81869b924e520193
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Apr 8 19:56:28 2017 +0200

    support normal mark in deletion code
    
    Change-Id: I8fd3ce2c180097546c21399d00337c619c880485
    Reviewed-on: https://gerrit.libreoffice.org/36294
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index c8a450e5aca0..1f081ca09e98 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -469,11 +469,23 @@ void ScColumn::ClearSelectionItems( const sal_uInt16* pWhich,const ScMarkData& r
     SCROW nTop;
     SCROW nBottom;
 
-    if ( pAttrArray && rMark.IsMultiMarked() )
+    if (pAttrArray)
     {
-        ScMultiSelIter aMultiIter( rMark.GetMultiSelData(), nCol );
-        while (aMultiIter.Next( nTop, nBottom ))
-            pAttrArray->ClearItems(nTop, nBottom, pWhich);
+        if (rMark.IsMultiMarked() )
+        {
+            ScMultiSelIter aMultiIter( rMark.GetMultiSelData(), nCol );
+            while (aMultiIter.Next( nTop, nBottom ))
+                pAttrArray->ClearItems(nTop, nBottom, pWhich);
+        }
+        else if (rMark.IsMarked())
+        {
+            ScRange aRange;
+            rMark.GetMarkArea(aRange);
+            if (aRange.aStart.Col() <= nCol && nCol <= aRange.aEnd.Col())
+            {
+                pAttrArray->ClearItems(aRange.aStart.Row(), aRange.aEnd.Row(), pWhich);
+            }
+        }
     }
 }
 
commit 79890a6d1bccbba8c40e42566c3d437d7a1aaace
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 8 20:31:35 2017 +0100

    limit symbol visibility
    
    Change-Id: I54d5fbe1cd9d5ae94cb134f08fc00593c802ebee

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index c3b428655b37..e13d0c317294 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -222,10 +222,13 @@ DffPropertyReader::DffPropertyReader( const SvxMSDffManager& rMan )
     InitializePropSet( DFF_msofbtOPT );
 }
 
-bool checkSeek(SvStream &rSt, sal_uInt32 nOffset)
+namespace
 {
-    const sal_uInt64 nMaxSeek(rSt.Tell() + rSt.remainingSize());
-    return (nOffset <= nMaxSeek && rSt.Seek(nOffset) == nOffset);
+    bool checkSeek(SvStream &rSt, sal_uInt32 nOffset)
+    {
+        const sal_uInt64 nMaxSeek(rSt.Tell() + rSt.remainingSize());
+        return (nOffset <= nMaxSeek && rSt.Seek(nOffset) == nOffset);
+    }
 }
 
 void DffPropertyReader::SetDefaultPropSet( SvStream& rStCtrl, sal_uInt32 nOffsDgg ) const