[Libreoffice-commits] core.git: 2 commits - sc/source vcl/source

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/app/inputhdl.cxx  |   16 +++++++++++-----
 vcl/source/control/tabctrl.cxx |    2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 6038fa25aa38bb1523ecd9e5adac3b96cbc52ffd
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 19 13:54:18 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Jun 24 10:29:17 2020 +0200

    Fix sending reference marks for current selection
    
    When selecting range on mobile in validation dialog
    the message wasn't sent due to missing ViewShell
    
    Change-Id: Iaab543368469cd363b54b1a89f6983b8c01877ce
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94693
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96933
    Tested-by: Jenkins

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d06e374d0366..693aaceda87e 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -461,10 +461,16 @@ ReferenceMark ScInputHandler::GetReferenceMark( ScViewData& rViewData, ScDocShel
 
 void ScInputHandler::UpdateLokReferenceMarks()
 {
-    if ( !comphelper::LibreOfficeKit::isActive() || !pActiveViewSh )
+    if ( !comphelper::LibreOfficeKit::isActive())
         return;
 
-    ScViewData& rViewData = pActiveViewSh->GetViewData();
+    ScTabViewShell* pShell = pActiveViewSh ? pActiveViewSh
+                                : dynamic_cast<ScTabViewShell*>(SfxViewShell::Current());
+
+    if (!pShell)
+        return;
+
+    ScViewData& rViewData = pShell->GetViewData();
     ScDocShell* pDocSh = rViewData.GetDocShell();
     ScRangeFindList* pRangeFinder = GetRangeFindList();
 
@@ -517,18 +523,18 @@ void ScInputHandler::UpdateLokReferenceMarks()
                                                                           nX1, nX2, nY1, nY2,
                                                                           nTab, rData.nColor );
 
-            ScInputHandler::SendReferenceMarks( pActiveViewSh, aReferenceMarks );
+            ScInputHandler::SendReferenceMarks( pShell, aReferenceMarks );
         }
     }
     else if ( nCount )
     {
-        ScInputHandler::SendReferenceMarks( pActiveViewSh, aReferenceMarks );
+        ScInputHandler::SendReferenceMarks( pShell, aReferenceMarks );
     }
     else
     {
         // Clear
         aReferenceMarks.clear();
-        ScInputHandler::SendReferenceMarks( pActiveViewSh, aReferenceMarks );
+        ScInputHandler::SendReferenceMarks( pShell, aReferenceMarks );
     }
 }
 
commit 2add29393239006da6f6cbd513b41f9a366037b5
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 11 14:45:10 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Jun 24 10:29:05 2020 +0200

    jsdialog: send selected tab and names
    
    Change-Id: I54db09a7a0311b5ed9bc0764c353b82bb99b9e41
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94620
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96932
    Tested-by: Jenkins

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 020944346515..0afb0008c9d3 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2170,10 +2170,12 @@ boost::property_tree::ptree TabControl::DumpAsPropertyTree()
         boost::property_tree::ptree aTab;
         aTab.put("text", GetPageText(id));
         aTab.put("id", id);
+        aTab.put("name", GetPageName(id));
         aTabs.push_back(std::make_pair("", aTab));
     }
 
     aTree.add_child("tabs", aTabs);
+    aTree.put("selected", GetCurPageId());
 
     return aTree;
 }