sc/source/ui/view/tabview.cxx | 81 +-----------------------------------------
1 file changed, 2 insertions(+), 79 deletions(-)
New commits:
commit e6eeecbe72a1d0e305369b103f05da887ca99016
Author: Dennis Francis <dennis.fran...@collabora.com>
AuthorDate: Sat May 23 11:00:19 2020 +0530
Commit: Dennis Francis <dennis.fran...@collabora.com>
CommitDate: Sat Jul 4 16:37:14 2020 +0200
use lcl_ExtendTiledDimension() in getRowColumnHeaders()
to avoid code repetitions.
Change-Id: If83b42175fb53132174fa33d169806e17a4a5cbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96973
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Dennis Francis <dennis.fran...@collabora.com>
(cherry picked from commit 3c6c039685870ed23d2f25cbfd984d3b54c4b60d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97959
Tested-by: Jenkins
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 86b1f4e0e46c..f7557ec08c70 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2669,45 +2669,7 @@ void ScTabView::getRowColumnHeaders(const
tools::Rectangle& rRectangle, tools::J
/// 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
@@ -2802,46 +2764,7 @@ void ScTabView::getRowColumnHeaders(const
tools::Rectangle& rRectangle, tools::J
/// 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
OStringBuffer aColGroupsBuffer = "\"columnGroups\": [\n";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
