From c2b8e87e6be5597c5ef7f0d0b5fbd127a2d57009 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 6 Jun 2017 13:04:30 +0100
Subject: 2nd arg of ApplySelectionFrame is always not null

Change-Id: I50a5c9c3f0f2b7424fa1b9b27ceeee9ae9348413
---
 sc/source/ui/undo/undoblk.cxx    | 2 +-
 sc/source/ui/undo/undoblk3.cxx   | 2 +-
 sc/source/ui/unoobj/cellsuno.cxx | 2 +-
 sc/source/ui/view/viewfunc.cxx   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sc/source/ui')

diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index a13a3a50f1eb..5afa28553b49 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -2364,7 +2364,7 @@ void ScUndoBorder::Redo()
         aMark.SetMarkArea( aRange );
         aMark.SelectTable( nTab, true );
 
-        rDoc.ApplySelectionFrame(aMark, xOuter.get(), xInner.get());
+        rDoc.ApplySelectionFrame(aMark, *xOuter, xInner.get());
     }
     for (size_t i = 0; i < nCount; ++i)
         pDocShell->PostPaint( *(*xRanges)[i], PaintPartFlags::Grid, SC_PF_LINES | SC_PF_TESTMERGE );
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index a39ceff96ceb..35452714d868 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -414,7 +414,7 @@ void ScUndoSelectionAttr::DoChange( const bool bUndo )
         aMarkData.MarkToSimple();
 
         if (pLineOuter)
-            rDoc.ApplySelectionFrame( aMarkData, pLineOuter, pLineInner );
+            rDoc.ApplySelectionFrame(aMarkData, *pLineOuter, pLineInner);
     }
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 32f615aef1b2..d741224fe558 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1075,7 +1075,7 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r
         aMark.SetMarkArea( aRange );
         aMark.SelectTable( nTab, true );
 
-        rDoc.ApplySelectionFrame( aMark, &rOuter, &rInner );
+        rDoc.ApplySelectionFrame(aMark, rOuter, &rInner);
         // don't need RowHeight if there is only a border
     }
 
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 8e0b13226a15..2c7e7c885242 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1062,7 +1062,7 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem
     sal_uInt16 nExt = SC_PF_TESTMERGE;
     pDocSh->UpdatePaintExt( nExt, aMarkRangeWithEnvelope ); // content before the change
 
-    pDoc->ApplySelectionFrame(aFuncMark, &rNewOuter, pNewInner);
+    pDoc->ApplySelectionFrame(aFuncMark, rNewOuter, pNewInner);
 
     pDocSh->UpdatePaintExt( nExt, aMarkRangeWithEnvelope ); // content after the change
 
-- 
cgit