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

[Caolán McNamara]

 sc/inc/document.hxx              |    6 +++---
 sc/source/core/data/document.cxx |   12 ++++++------
 sc/source/core/data/dpoutput.cxx |    4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 9b56acd6caaf461b18e627ac6bed467d9c3a4287
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 6 13:06:32 2017 +0100

    nullptr never passed to ApplyFrameAreaTab
    
    Change-Id: Iece6c99b6414eb2701af61a64d0ff80f52a0379d

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 9a179808ac10..c55da1b5a4ed 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1596,9 +1596,9 @@ public:
     void            ApplySelectionFrame(const ScMarkData& rMark,
                                         const SvxBoxItem& rLineOuter,
                                         const SvxBoxInfoItem* pLineInner);
-    void            ApplyFrameAreaTab( const ScRange& rRange,
-                                       const SvxBoxItem* pLineOuter,
-                                       const SvxBoxInfoItem* pLineInner );
+    void            ApplyFrameAreaTab(const ScRange& rRange,
+                                      const SvxBoxItem& rLineOuter,
+                                      const SvxBoxInfoItem& rLineInner);
 
     void            ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
     void            ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a72420c4e33f..71c523dd54c6 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5746,17 +5746,17 @@ void ScDocument::ApplySelectionFrame( const ScMarkData& rMark,
     }
 }
 
-void ScDocument::ApplyFrameAreaTab( const ScRange& rRange,
-                                    const SvxBoxItem* pLineOuter,
-                                    const SvxBoxInfoItem* pLineInner )
+void ScDocument::ApplyFrameAreaTab(const ScRange& rRange,
+                                   const SvxBoxItem& rLineOuter,
+                                   const SvxBoxInfoItem& rLineInner)
 {
     SCTAB nStartTab = rRange.aStart.Tab();
     SCTAB nEndTab = rRange.aStart.Tab();
     for (SCTAB nTab=nStartTab; nTab<=nEndTab && nTab < static_cast<SCTAB>(maTabs.size()); nTab++)
         if (maTabs[nTab])
-            maTabs[nTab]->ApplyBlockFrame( pLineOuter, pLineInner,
-                                         rRange.aStart.Col(), rRange.aStart.Row(),
-                                         rRange.aEnd.Col(),   rRange.aEnd.Row() );
+            maTabs[nTab]->ApplyBlockFrame(&rLineOuter, &rLineInner,
+                                          rRange.aStart.Col(), rRange.aStart.Row(),
+                                          rRange.aEnd.Col(),   rRange.aEnd.Row());
 }
 
 void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark, ScEditDataArray* pDataArray )
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index d9fe4a1aaadd..a59eb7430ec3 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -275,7 +275,7 @@ void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL
 
     aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::DISTANCE,false);
 
-    mpDoc->ApplyFrameAreaTab( ScRange(  nStartCol, nStartRow, mnTab, nEndCol, nEndRow , mnTab ), &aBox, &aBoxInfo );
+    mpDoc->ApplyFrameAreaTab(ScRange(nStartCol, nStartRow, mnTab, nEndCol, nEndRow , mnTab), aBox, aBoxInfo);
 
 }
 
@@ -324,7 +324,7 @@ void lcl_SetFrame( ScDocument* pDoc, SCTAB nTab,
     aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::VERT,false);
     aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::DISTANCE,false);
 
-    pDoc->ApplyFrameAreaTab( ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ), &aBox, &aBoxInfo );
+    pDoc->ApplyFrameAreaTab(ScRange(nCol1, nRow1, nTab, nCol2, nRow2, nTab), aBox, aBoxInfo);
 }
 
 void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount,