[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 3 commits - sc/source sfx2/source sw/uiconfig

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Tue Apr 6 19:35:52 UTC 2021


 sc/source/ui/app/inputwin.cxx              |    8 +++-----
 sfx2/source/notebookbar/SfxNotebookBar.cxx |    2 +-
 sw/uiconfig/swriter/ui/spellmenu.ui        |    4 ++++
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 349f7605d88dea94a2edda44e411f201eb096cd4
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Nov 10 15:38:52 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Apr 6 21:35:14 2021 +0200

    Expose tracking changes actions in context menu for online
    
    Change-Id: I127be4ed0803b8de25c6fd0dfdc6ee0f931d6922
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105551
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106692
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/uiconfig/swriter/ui/spellmenu.ui b/sw/uiconfig/swriter/ui/spellmenu.ui
index b8fd5ef9d4ee..81383c2aebe7 100644
--- a/sw/uiconfig/swriter/ui/spellmenu.ui
+++ b/sw/uiconfig/swriter/ui/spellmenu.ui
@@ -112,6 +112,7 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="spellmenu|accept">Accept Change</property>
         <property name="use_underline">True</property>
+        <property name="action_name">.uno:AcceptTrackedChange</property>
       </object>
     </child>
     <child>
@@ -120,6 +121,7 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="spellmenu|reject">Reject Change</property>
         <property name="use_underline">True</property>
+        <property name="action_name">.uno:RejectTrackedChange</property>
       </object>
     </child>
     <child>
@@ -128,6 +130,7 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="spellmenu|next">Next Change</property>
         <property name="use_underline">True</property>
+        <property name="action_name">.uno:NextTrackedChange</property>
       </object>
     </child>
     <child>
@@ -136,6 +139,7 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="spellmenu|prev">Previous Change</property>
         <property name="use_underline">True</property>
+        <property name="action_name">.uno:PreviousTrackedChange</property>
       </object>
     </child>
   </object>
commit a294d44b23f4c69881b41f35e377344d34ad3057
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Nov 3 11:59:09 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Apr 6 21:34:50 2021 +0200

    notebookbar: don't block init in calc
    
    Change-Id: I7fdebcf317c8ebd3e322c1f73d9a4e7df30ecd27
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105240
    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/+/106420
    Tested-by: Jenkins

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 39e60f61dfe9..cff228473371 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -360,7 +360,7 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
             //   * in LOK: Paste Special feature was incorrectly initialized
             // Skip first request so Notebookbar will be initialized after document was loaded
             static std::map<const void*, bool> bSkippedFirstInit;
-            if (comphelper::LibreOfficeKit::isActive()
+            if (comphelper::LibreOfficeKit::isActive() && eApp == vcl::EnumContext::Application::Writer
                 && bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end())
             {
                 bSkippedFirstInit[pViewShell] = true;
commit 1985a877cc47cad31da0450b113b8a8343f77e73
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Oct 27 10:41:47 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Apr 6 21:31:42 2021 +0200

    Don't show tooltip for formula bar in online
    
    Change-Id: Ib7608bb31222234ea08c99e76dcd341570d3685b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104861
    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/+/106419
    Tested-by: Jenkins

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2846ca43dc54..bbb4322e4da1 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -201,12 +201,10 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
     {
         aWndPos   ->SetQuickHelpText(ScResId(SCSTR_QHELP_POSWND));
         aWndPos   ->SetHelpId       (HID_INSWIN_POS);
-    }
-    mxTextWindow->SetQuickHelpText(ScResId(SCSTR_QHELP_INPUTWND));
-    mxTextWindow->SetHelpId       (HID_INSWIN_INPUT);
 
-    if (!comphelper::LibreOfficeKit::isActive())
-    {
+        mxTextWindow->SetQuickHelpText(ScResId(SCSTR_QHELP_INPUTWND));
+        mxTextWindow->SetHelpId       (HID_INSWIN_INPUT);
+
         // No SetHelpText: the helptexts come from the Help
         SetItemText (SID_INPUT_FUNCTION, ScResId(SCSTR_QHELP_BTNCALC));
         SetHelpId   (SID_INPUT_FUNCTION, HID_INSWIN_CALC);


More information about the Libreoffice-commits mailing list