[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - sw/uiconfig vcl/source

[Szymon KÅ‚os (via logerrit)]

 sw/uiconfig/swriter/ui/wordcount-mobile.ui |    4 ++--
 vcl/source/control/tabctrl.cxx             |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5d0833abeb3637f826fd8c3a047d3c6a6b87f98d
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 11 14:45:10 2020 +0100
Commit:     Szymon Kłos <eszkadev at gmail.com>
CommitDate: Fri May 22 09:40:07 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>

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 96ca6dd4f9fc..9990d5ca85dc 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2195,10 +2195,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;
 }
commit 24087b00515c7ae03bcbafe1f9f813ccbd0c6cc8
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Mar 2 09:39:17 2020 +0100
Commit:     Szymon Kłos <eszkadev at gmail.com>
CommitDate: Fri May 22 09:40:00 2020 +0200

    Dont show unnecesary buttons on mobile in wordcount
    
    Change-Id: Id6c58f04d29945c23cdcca0c83bba0141ab87c86
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94619
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/uiconfig/swriter/ui/wordcount-mobile.ui b/sw/uiconfig/swriter/ui/wordcount-mobile.ui
index 37129797d11d..83c63b450b0a 100644
--- a/sw/uiconfig/swriter/ui/wordcount-mobile.ui
+++ b/sw/uiconfig/swriter/ui/wordcount-mobile.ui
@@ -22,7 +22,7 @@
             <child>
               <object class="GtkButton" id="close">
                 <property name="label">gtk-close</property>
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="can_default">True</property>
@@ -39,7 +39,7 @@
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>