1 files changed, 10 insertions, 6 deletions
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 1d766741cd99..8dcb2cb7e4cc 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -307,7 +307,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
 
 //      additional routines
 
-void ScViewData::setupSizeDeviceProviderForColWidth(ScSizeDeviceProvider& rProv, Fraction& rZoomX, Fraction& rZoomY, double& rPPTX, double &rPPTY)
+void ScViewData::setupSizeDeviceProviderForColWidth(const ScSizeDeviceProvider& rProv, Fraction& rZoomX, Fraction& rZoomY, double& rPPTX, double &rPPTY)
 {
     if (rProv.IsPrinter())
     {
@@ -1019,7 +1019,7 @@ SvtScriptType ScViewFunc::GetSelectionScriptType()
     return nScript;
 }
 
-static void ShrinkToDataArea(ScMarkData& rFuncMark, ScDocument& rDoc);
+static void ShrinkToDataArea(ScMarkData& rFuncMark, const ScDocument& rDoc);
 
 const ScPatternAttr* ScViewFunc::GetSelectionPattern()
 {
@@ -1308,7 +1308,7 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem
 // tdf#147842 if the marked area is the entire sheet, then shrink it to the data area.
 // Otherwise ctrl-A, perform-action, will take a very long time as it tries to modify
 // cells that we are not using.
-static void ShrinkToDataArea(ScMarkData& rFuncMark, ScDocument& rDoc)
+static void ShrinkToDataArea(ScMarkData& rFuncMark, const ScDocument& rDoc)
 {
     // do not make it marked if it is not already marked
     if (!rFuncMark.IsMarked())
@@ -3246,7 +3246,8 @@ void ScViewFunc::InsertNameList()
         pDocSh->UpdateOle(GetViewData());
 }
 
-void ScViewFunc::UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAttr  )
+void ScViewFunc::UpdateSelectionArea(const ScMarkData& rSel, ScPatternAttr* pAttr,
+                                     bool adjustHeight)
 {
     ScDocShell* pDocShell = GetViewData().GetDocShell();
     ScRange aMarkRange;
@@ -3280,8 +3281,11 @@ void ScViewFunc::UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAt
     pDocShell->PostPaint( nStartCol, nStartRow, nStartTab,
         nEndCol,   nEndRow,   nEndTab,
         PaintPartFlags::Grid, nExtFlags | SC_PF_TESTMERGE );
-    ScTabViewShell* pTabViewShell = GetViewData().GetViewShell();
-    pTabViewShell->AdjustBlockHeight(false, const_cast<ScMarkData*>(&rSel));
+    if (adjustHeight)
+    {
+        ScTabViewShell* pTabViewShell = GetViewData().GetViewShell();
+        pTabViewShell->AdjustBlockHeight(false, const_cast<ScMarkData*>(&rSel));
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */