diff options
| author | Andras Timar <andras.timar@collabora.com> | 2020-07-21 10:59:24 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-07-21 10:59:42 +0200 |
| commit | e94d9c1c346a8b7e58c24bcf554c0a2bab77f59c (patch) | |
| tree | f54fc66d3e5f82ed094eb182ba82819e32e347c7 /sc/source/ui/view/tabvwshc.cxx | |
| parent | 08febf86699fc1a1e69f32fb57f46ad84b8322b2 (diff) | |
Revert "tdf#128502: Try to support multiple documents ...
cp-6.2-20
in LibreOfficeKit-using process"
This reverts commit b0da52d19ed40dd0871f208eb7387ec1d8252de4.
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: Ib9ad6e010935e6a936832c01756700735a8cc6c5
Diffstat (limited to 'sc/source/ui/view/tabvwshc.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwshc.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index aba771e1035a..1f0cd9bf737b 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -572,7 +572,7 @@ css::uno::Reference<css::datatransfer::XTransferable2> ScTabViewShell::GetClipDa return xTransferable; } -void ScTabViewShell::notifyAllViewsHeaderInvalidation(SfxViewShell* pForViewShell, HeaderType eHeaderType, SCTAB nCurrentTabIndex) +void ScTabViewShell::notifyAllViewsHeaderInvalidation(HeaderType eHeaderType, SCTAB nCurrentTabIndex) { if (comphelper::LibreOfficeKit::isActive()) { @@ -595,7 +595,7 @@ void ScTabViewShell::notifyAllViewsHeaderInvalidation(SfxViewShell* pForViewShel while (pViewShell) { ScTabViewShell* pTabViewShell = dynamic_cast<ScTabViewShell*>(pViewShell); - if (pTabViewShell && pViewShell->GetDocId() == pForViewShell->GetDocId() && (nCurrentTabIndex == -1 || pTabViewShell->getPart() == nCurrentTabIndex)) + if (pTabViewShell && (nCurrentTabIndex == -1 || pTabViewShell->getPart() == nCurrentTabIndex)) { pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_HEADER, aPayload.getStr()); } @@ -604,7 +604,13 @@ void ScTabViewShell::notifyAllViewsHeaderInvalidation(SfxViewShell* pForViewShel } } -bool ScTabViewShell::isAnyEditViewInRange(SfxViewShell* pForViewShell, bool bColumns, SCCOLROW nStart, SCCOLROW nEnd) +void ScTabViewShell::notifyAllViewsHeaderInvalidation(bool bColumns, SCTAB nCurrentTabIndex) +{ + HeaderType eHeaderType = bColumns ? COLUMN_HEADER : ROW_HEADER; + ScTabViewShell::notifyAllViewsHeaderInvalidation(eHeaderType, nCurrentTabIndex); +} + +bool ScTabViewShell::isAnyEditViewInRange(bool bColumns, SCCOLROW nStart, SCCOLROW nEnd) { if (comphelper::LibreOfficeKit::isActive()) { @@ -612,7 +618,7 @@ bool ScTabViewShell::isAnyEditViewInRange(SfxViewShell* pForViewShell, bool bCol while (pViewShell) { ScTabViewShell* pTabViewShell = dynamic_cast<ScTabViewShell*>(pViewShell); - if (pTabViewShell && pTabViewShell->GetDocId() == pForViewShell->GetDocId()) + if (pTabViewShell) { ScInputHandler* pInputHandler = pTabViewShell->GetInputHandler(); if (pInputHandler && pInputHandler->GetActiveView()) |