summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
authorDennis Francis <dennis.francis@collabora.com>2020-05-23 11:00:19 +0530
committerDennis Francis <dennis.francis@collabora.com>2020-05-25 00:39:58 +0530
commit5ce3e57ba43a45c31b4c8c210b95894fdcdfe42f (patch)
treeeb69d0adb20e9e3cfff314d048b88be82cf72804 /sc/source/ui/view
parentab9a53c4dff622c9ed747cc82c03f67a67f33aed (diff)
use lcl_ExtendTiledDimension() in getRowColumnHeaders()
to avoid code repetitions. Change-Id: If83b42175fb53132174fa33d169806e17a4a5cbe
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/tabview.cxx81
1 files changed, 2 insertions, 79 deletions
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7c0bfa847aba..31119a239bf9 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2669,45 +2669,7 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
/// 2) if we are approaching current max tiled row, signal a size changed event
/// and invalidate the involved area
-
- if (nEndRow > aViewData.GetMaxTiledRow() - nVisibleRows)
- {
- ScDocShell* pDocSh = aViewData.GetDocShell();
- ScModelObj* pModelObj = pDocSh ? comphelper::getUnoTunnelImplementation<ScModelObj>( pDocSh->GetModel() ) : nullptr;
- Size aOldSize(0, 0);
- if (pModelObj)
- aOldSize = pModelObj->getDocumentSize();
-
- aViewData.SetMaxTiledRow(std::min(std::max(nEndRow, aViewData.GetMaxTiledRow()) + nVisibleRows, long(MAXTILEDROW)));
-
- Size aNewSize(0, 0);
- if (pModelObj)
- aNewSize = pModelObj->getDocumentSize();
-
- SAL_INFO("sc.lok.header", "Row Header: a new height: " << aNewSize.Height());
- if (pDocSh)
- {
- // New area extended to the bottom of the sheet after last row
- // excluding overlapping area with aNewColArea
- tools::Rectangle aNewRowArea(0, aOldSize.getHeight(), aOldSize.getWidth(), aNewSize.getHeight());
-
- // Only invalidate if spreadsheet extended to the bottom
- if (aNewRowArea.getHeight())
- {
- UpdateSelectionOverlay();
- SfxLokHelper::notifyInvalidation(aViewData.GetViewShell(), aNewRowArea.toString());
- }
-
- // Provide size in the payload, so clients don't have to
- // call lok::Document::getDocumentSize().
- std::stringstream ss;
- ss << aNewSize.Width() << ", " << aNewSize.Height();
- OString sSize = ss.str().c_str();
- ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(aViewData.GetViewShell()->GetCurrentDocument());
- SfxLokHelper::notifyDocumentSizeChanged(aViewData.GetViewShell(), sSize, pModel, false);
- }
- }
-
+ lcl_ExtendTiledDimension(/* bColumn */ false, nEndRow, nVisibleRows, *this, aViewData);
/// 3) create string data for rows
@@ -2803,46 +2765,7 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
/// 2) if we are approaching current max tiled column, signal a size changed event
/// and invalidate the involved area
-
- if (nEndCol > aViewData.GetMaxTiledCol() - nVisibleCols)
- {
- ScDocShell* pDocSh = aViewData.GetDocShell();
- ScModelObj* pModelObj = pDocSh ? comphelper::getUnoTunnelImplementation<ScModelObj>( pDocSh->GetModel() ) : nullptr;
- Size aOldSize(0, 0);
- if (pModelObj)
- aOldSize = pModelObj->getDocumentSize();
-
- aViewData.SetMaxTiledCol(std::min(std::max(nEndCol, aViewData.GetMaxTiledCol()) + nVisibleCols, long(pDoc->MaxCol())));
-
- Size aNewSize(0, 0);
- if (pModelObj)
- aNewSize = pModelObj->getDocumentSize();
-
- if (pDocSh)
- {
- // New area extended to the right of the sheet after last column
- // including overlapping area with aNewRowArea
- tools::Rectangle aNewColArea(aOldSize.getWidth(), 0, aNewSize.getWidth(), aNewSize.getHeight());
-
- // Only invalidate if spreadsheet extended to the bottom
- if (aNewColArea.getWidth())
- {
- UpdateSelectionOverlay();
- SfxLokHelper::notifyInvalidation(aViewData.GetViewShell(), aNewColArea.toString());
- }
-
- if (aOldSize != aNewSize)
- {
- // Provide size in the payload, so clients don't have to
- // call lok::Document::getDocumentSize().
- std::stringstream ss;
- ss << aNewSize.Width() << ", " << aNewSize.Height();
- OString sSize = ss.str().c_str();
- ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(aViewData.GetViewShell()->GetCurrentDocument());
- SfxLokHelper::notifyDocumentSizeChanged(aViewData.GetViewShell(), sSize, pModel, false);
- }
- }
- }
+ lcl_ExtendTiledDimension(/* bColumn */ true, nEndCol, nVisibleCols, *this, aViewData);
/// 3) create string data for columns