diff options
author | Pranav Kant <pranavk@collabora.com> | 2016-05-12 16:40:04 +0530 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2016-05-12 14:59:10 +0000 |
commit | bb51f11cf7b4143123b279fa7c0e6d2345e768b4 (patch) | |
tree | c3709218c2cfa6e48469f2f382f21ef3d42049da | |
parent | fa4c2244122230e90e8e972950a6ef4a5b0c0dc5 (diff) |
sc lok: Invalidate the new extended areacp-5.0-35
Change-Id: I1fa58ca935860ed3c5983f4e6b15c9f7c8feda9b
Reviewed-on: https://gerrit.libreoffice.org/24930
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r-- | sc/source/ui/view/tabview3.cxx | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 2005d914ef20..21a9a6b94d63 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -306,15 +306,41 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew ) { if (nPosX > aViewData.GetMaxTiledCol() - 10 || nPosY > aViewData.GetMaxTiledRow() - 25) { + ScDocShell* pDocSh = aViewData.GetDocShell(); + ScModelObj* pModelObj = pDocSh ? ScModelObj::getImplementation( pDocSh->GetModel() ) : nullptr; + Size aOldSize(0, 0); + if (pModelObj) + aOldSize = pModelObj->getDocumentSize(); + if (nPosX > aViewData.GetMaxTiledCol() - 10) aViewData.SetMaxTiledCol(std::max(nPosX, aViewData.GetMaxTiledCol()) + 10); if (nPosY > aViewData.GetMaxTiledRow() - 25) aViewData.SetMaxTiledRow(std::max(nPosY, aViewData.GetMaxTiledRow()) + 25); - ScDocShell* pDocSh = aViewData.GetDocShell(); + Size aNewSize(0, 0); + if (pModelObj) + aNewSize = pModelObj->getDocumentSize(); + if (pDocSh) + { pDocSh->libreOfficeKitCallback(LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, ""); + + // New area extended to the right of the sheet after last column + // including overlapping area with aNewRowArea + Rectangle aNewColArea(aOldSize.getWidth(), 0, aNewSize.getWidth(), aNewSize.getHeight()); + // New area extended to the bottom of the sheet after last row + // excluding overlapping area with aNewColArea + Rectangle aNewRowArea(0, aOldSize.getHeight(), aOldSize.getWidth(), aNewSize.getHeight()); + + // Only invalidate if spreadsheet extended to the right + if (aNewColArea.getWidth()) + pDocSh->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, aNewColArea.toString().getStr()); + + // Only invalidate if spreadsheet extended to the bottom + if (aNewRowArea.getHeight()) + pDocSh->libreOfficeKitCallback(LOK_CALLBACK_INVALIDATE_TILES, aNewRowArea.toString().getStr()); + } } } } |