commit 39b25518ce96a50f54459f681edcb95057507251
author Attila Szűcs <attila.szucs@collabora.com> Thu May 04 16:59:54 2023 +0200
committer Szymon Kłos <szymon.klos@collabora.com> Fri May 12 14:02:59 2023 +0200
tree 379ed96391778e959e8fa0f9460197bbd2cd166e
parent 9c8e38ef8c69d519d72737b404d54d6413a98518

LOK: Navi-10 hide not needed controls

Hide controls we dont need in navigator now.

Change-Id: Ibf6843be2976bcd4d90e67130dd0cc08d0988c0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151397
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151702
Tested-by: Jenkins

sc/source/ui/navipi/navipi.cxx

diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 92a6c5f..d7682d9 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -423,6 +423,12 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, weld::Widget* pParent, SfxNaviga
    else
        eNavMode = NAV_LMODE_AREAS;
    SetListMode(eNavMode);

    if(comphelper::LibreOfficeKit::isActive())
    {
        m_xBuilder->weld_container("gridbuttons")->hide();
        m_xLbDocuments->hide();
    }
}

weld::Window* ScNavigatorDlg::GetFrameWeld() const

sc/uiconfig/scalc/ui/navigatorpanel.ui

diff --git a/sc/uiconfig/scalc/ui/navigatorpanel.ui b/sc/uiconfig/scalc/ui/navigatorpanel.ui
index 9e02f0b..a5b9b30 100644
--- a/sc/uiconfig/scalc/ui/navigatorpanel.ui
+++ b/sc/uiconfig/scalc/ui/navigatorpanel.ui
@@ -101,7 +101,7 @@
        <property name="column_spacing">12</property>
        <child>
          <!-- n-columns=1 n-rows=1 -->
          <object class="GtkGrid">
          <object class="GtkGrid" id="gridbuttons">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="hexpand">True</property>

sd/source/ui/dlg/navigatr.cxx

diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index be0f591..2bdfaef 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -48,6 +48,7 @@
#include <utility>

#include <vcl/commandevent.hxx>
#include <comphelper/lok.hxx>

/**
 * SdNavigatorWin - FloatingWindow
@@ -93,6 +94,11 @@ SdNavigatorWin::SdNavigatorWin(weld::Widget* pParent, SfxBindings* pInBindings, 
    mxToolbox->connect_key_press(LINK(this, SdNavigatorWin, KeyInputHdl));
    mxTlbObjects->connect_key_press(LINK(this, SdNavigatorWin, KeyInputHdl));
    mxLbDocs->connect_key_press(LINK(this, SdNavigatorWin, KeyInputHdl));
    if(comphelper::LibreOfficeKit::isActive())
    {
        mxToolbox->hide();
        mxLbDocs->hide();
    }
}

void SdNavigatorWin::FirstFocus()

sw/source/uibase/utlui/navipi.cxx

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index e609aa5..0489f51 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -49,6 +49,8 @@

#include <workctrl.hxx>

#include <comphelper/lok.hxx>

using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;

@@ -682,6 +684,14 @@ SwNavigationPI::SwNavigationPI(weld::Widget* pParent,
    m_xDocListBox->set_accessible_name(m_aStatusArr[3]);

    m_aExpandedSize = m_xContainer->get_preferred_size();

    if(comphelper::LibreOfficeKit::isActive())
    {
        m_xBuilder->weld_container("gridcontent16")->hide();
        m_xDocListBox->hide();
        m_xGlobalBox->hide();
        m_xGlobalToolBox->hide();
    }
}

weld::Window* SwNavigationPI::GetFrameWeld() const
@@ -765,12 +775,15 @@ void SwNavigationPI::NotifyItemUpdate(sal_uInt16 nSID, SfxItemState /*eState*/,
    }
    else if (nSID == FN_STAT_PAGE)
    {
        SwView *pActView = GetCreateView();
        if(pActView)
        if(!comphelper::LibreOfficeKit::isActive())
        {
            SwWrtShell &rSh = pActView->GetWrtShell();
            m_xEdit->set_max(rSh.GetPageCnt());
            m_xEdit->set_width_chars(3);
            SwView *pActView = GetCreateView();
            if(pActView)
            {
                SwWrtShell &rSh = pActView->GetWrtShell();
                m_xEdit->set_max(rSh.GetPageCnt());
                m_xEdit->set_width_chars(3);
            }
        }
    }
}
@@ -1045,6 +1058,12 @@ void SwNavigationPI::SetRegionDropMode(RegionMode nNewMode)

void SwNavigationPI::ToggleTree()
{
    if (comphelper::LibreOfficeKit::isActive())
    {
        m_xGlobalTree->HideTree();
        return;
    }

    bool bGlobalDoc = IsGlobalDoc();
    if (!IsGlobalMode() && bGlobalDoc)
    {

sw/uiconfig/swriter/ui/navigatorpanel.ui

diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index 7c3fd82..d34e58a 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -244,7 +244,7 @@
            <property name="row-spacing">6</property>
            <property name="column-spacing">12</property>
            <child>
              <object class="GtkBox">
              <object class="GtkBox" id="gridcontent16">
                <property name="visible">True</property>
                <property name="can-focus">False</property>
                <property name="hexpand">True</property>