summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2020-07-21 10:55:45 +0200
committerAndras Timar <andras.timar@collabora.com>2020-07-21 10:56:00 +0200
commit102520f3f309b7632992a30997d630db1ad9e754 (patch)
treeae61b330eb70ce6d07b7ff9fa9d60954b3066c22
parent12fb7c85de84f573f2aa6705f4fd26e00cf86768 (diff)
Revert "Let's not run on hope"
This reverts commit 6dd8180d046e88f95816d59701f78b2f81e1cb64. We decided not to have this "multiple docs" feature in stable cp-6.2 because it caused regressions that we could not fix quickly. Change-Id: Ib2b6b5196221ef2ec16308cc79b245a2c8d6e7de
-rw-r--r--sc/source/ui/unoobj/docuno.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index b63a5d1cae06..e1efd7ca485e 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -503,14 +503,15 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
int nTilePosX, int nTilePosY,
long nTileWidth, long nTileHeight )
{
- ScTabViewShell* pViewShell = pDocShell->GetBestViewShell(false);
+ // There seems to be no clear way of getting the grid window for this
+ // particular document, hence we need to hope we get the right window.
+ // FIXME: "hope"? Are you kidding me?
+ ScViewData* pViewData = ScDocShell::GetViewData();
- // FIXME: Can this happen? What should we do?
- if (!pViewShell)
+ // FIXME
+ if (!pViewData)
return;
- ScViewData* pViewData = &pViewShell->GetViewData();
-
ScGridWindow* pGridWindow = pViewData->GetActiveWin();
// update the size of the area we are painting