[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sfx2/source

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 23 08:12:10 UTC 2020


 sfx2/source/notebookbar/PriorityHBox.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0ab5bfd495cf7ea1cab99321ff031ae390247825
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jun 16 10:37:02 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Jun 23 10:11:40 2020 +0200

    notebookbar: don't hide elements for online
    
    Change-Id: Icbef09e9e012d88372b164d2f69f80b06161772b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96920
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx b/sfx2/source/notebookbar/PriorityHBox.cxx
index cb4a1be51d8c..70ef4c596eb4 100644
--- a/sfx2/source/notebookbar/PriorityHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityHBox.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/viewfrm.hxx>
 #include "DropdownBox.hxx"
 #include "PriorityHBox.hxx"
+#include <comphelper/lok.hxx>
 
 namespace
 {
@@ -115,7 +116,7 @@ void PriorityHBox::Resize()
     if (!m_bInitialized && SfxViewFrame::Current())
         Initialize();
 
-    if (!m_bInitialized)
+    if (!m_bInitialized || comphelper::LibreOfficeKit::isActive())
     {
         return VclHBox::Resize();
     }


More information about the Libreoffice-commits mailing list