diff options
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview3.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/view/viewdata.cxx | 1 |
4 files changed, 6 insertions, 21 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 2e9fcee02f2b..b7f61da9fcc7 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2501,18 +2501,6 @@ void ScInputHandler::UpdateFormulaMode() (rText[0] == '=' || rText[0] == '+' || rText[0] == '-'); } - // formula mode in online is not usable in collaborative mode, - // this is a workaround for disabling formula mode in online - // when there is more than a single view - if (comphelper::LibreOfficeKit::isActive() - && SfxViewShell::GetActiveShells(/*only visible shells*/ false) > 1) - { - // we look for not visible shells, too, since this method can be - // invoked by a TabViewShell ctor and at such a stage the view - // is not yet visible, - bIsFormula = false; - } - if ( bIsFormula ) { if (!bFormulaMode) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index d725651089ed..d8eb515e8eda 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1619,12 +1619,6 @@ bool ScModule::IsFormulaMode() // Just keep function autopilot here for references to other documents bool bIsFormula = false; - // formula mode in online is not usable in collaborative mode, - // this is a workaround for disabling formula mode in online - // when there is more than a single view - if (comphelper::LibreOfficeKit::isActive() && SfxViewShell::GetActiveShells() > 1) - return false; - if ( m_nCurRefDlgId ) { SfxChildWindow* pChildWnd = nullptr; diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index ae81a4254b78..2eb0b5d57089 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -1918,7 +1918,6 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa else { // hide / show inplace client - ScClient* pClient = static_cast<ScClient*>(aViewData.GetViewShell()->GetIPClient()); if ( pClient && pClient->IsObjectInPlaceActive() ) { @@ -2131,9 +2130,14 @@ void ScTabView::UpdateEditView() if (aViewData.HasEditView(eCurrent)) { EditView* pEditView = aViewData.GetEditView(eCurrent); + + long nRefTabNo = GetViewData().GetRefTabNo(); + long nX = GetViewData().GetCurXForTab(nRefTabNo); + long nY = GetViewData().GetCurYForTab(nRefTabNo); + aViewData.SetEditEngine(eCurrent, static_cast<ScEditEngineDefaulter*>(pEditView->GetEditEngine()), - pGridWin[i], GetViewData().GetCurX(), GetViewData().GetCurY() ); + pGridWin[i], nX, nY ); if (eCurrent == eActive) pEditView->ShowCursor( false ); } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index fc9f8d6f818a..7c6bc917543b 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1442,7 +1442,6 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // add windows from other views if (!bWasThere && comphelper::LibreOfficeKit::isActive()) - //if (comphelper::LibreOfficeKit::isActive()) { ScTabViewShell* pThisViewShell = GetViewShell(); SCTAB nThisTabNo = GetTabNo(); |