sc/source/ui/app/inputhdl.cxx | 12 ------------
sc/source/ui/app/scmod.cxx | 25 +++++++++++++++++--------
sc/source/ui/view/tabview3.cxx | 8 ++++++--
sc/source/ui/view/viewdata.cxx | 1 -
4 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 713189fbf3d44b1de86b0cabfca61783b287d2ff
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Nov 6 09:43:11 2018 +0100
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Wed Sep 25 17:54:08 2019 +0200
Keep reference mode if only one dialog closed
Change-Id: I9cf7988da7f83c28a0919c69ace131ee93054486
Reviewed-on: https://gerrit.libreoffice.org/79466
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/79531
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 2a5e98baa9c5..8cef9b3ccc5b 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1504,7 +1504,16 @@ void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis,
SfxViewFrame* pViewFrm )
//if ( pViewFrm )
// pViewFrm->GetBindings().Update(); // to avoid trouble in
LockDispatcher
- m_nCurRefDlgId = bVis ? nId : 0 ; // before SetChildWindow
+ // before SetChildWindow
+ if ( comphelper::LibreOfficeKit::isActive() )
+ {
+ if ( bVis )
+ m_nCurRefDlgId = nId;
+ }
+ else
+ {
+ m_nCurRefDlgId = bVis ? nId : 0;
+ }
if ( pViewFrm )
{
@@ -1758,7 +1767,13 @@ void ScModule::EndReference()
//FIXME: ShowRefFrame at InputHdl, if the Function AutoPilot is open?
if ( m_nCurRefDlgId )
{
- SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( m_nCurRefDlgId
);
+ SfxChildWindow* pChildWnd = nullptr;
+
+ if ( comphelper::LibreOfficeKit::isActive() )
+ pChildWnd = lcl_GetChildWinFromCurrentView( m_nCurRefDlgId );
+ else
+ pChildWnd = lcl_GetChildWinFromAnyView( m_nCurRefDlgId );
+
OSL_ENSURE( pChildWnd, "NoChildWin" );
if ( pChildWnd )
{
commit f1261c05215da84e6a3305e9e802590aafbdda7e
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Oct 19 22:33:24 2018 +0200
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Wed Sep 25 17:54:02 2019 +0200
Formula editing when switching tabs
Change-Id: Ia6e1617ee7f02227bf15277cf25865134dfd1f2a
Reviewed-on: https://gerrit.libreoffice.org/79465
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/79530
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f602fc50a808..4396d3381b0b 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2504,18 +2504,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 3324b0225fb0..2a5e98baa9c5 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1633,12 +1633,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 b1e7df6ccce2..ca9c6238dd8e 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1910,7 +1910,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() )
{
@@ -2119,9 +2118,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 c18d9289e1d5..a40a70e3e6a8 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1431,7 +1431,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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
