[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - 3 commits - configure.ac include/sfx2 officecfg/registry sfx2/source

[Andras Timar (via logerrit)]

 configure.ac                                                   |    2 +-
 include/sfx2/sidebar/SidebarController.hxx                     |    1 +
 officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |    7 +++++++
 sfx2/source/sidebar/SidebarController.cxx                      |    5 +++--
 4 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit fa08dbe3d7e674dbce8eb3d0fa4152250b427d48
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Jun 7 09:01:21 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 7 09:01:21 2021 +0200

    Bump version to 7.0.7.0.M3
    
    Change-Id: I655362c64ce7e517ac22c268bdf9be71c76da061

diff --git a/configure.ac b/configure.ac
index 2548cd14336c..c0ea16dff0f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[7.0.7.0.M2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.7.0.M3],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
commit 57fad2769469bbcf5e1399a52aa8e4be84ec95a5
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Jun 7 09:00:47 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 7 09:00:47 2021 +0200

    no MinimumWidth of Sidebar for MIMO
    
    Change-Id: I66fc17b1d791e06debe95248a8952986171a4596

diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index c54c3d6076c0..0fba94791836 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -247,7 +247,7 @@
           <desc>Minimum width the sidebar can have. If true, the minumum width
           is calculated from the largest deck.</desc>
         </info>
-        <value>true</value>
+        <value>false</value>
       </prop>
     </group>
     <group oor:name="Content">
commit 707f69151fc6fc9fbd7d778a82554186904ff4b5
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Fri Jun 4 14:42:58 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 7 08:59:40 2021 +0200

    Resolves tdf#140360 - Provide option to turn off sidebar's minimum width
    
    Boolean option Sidebar:General:MinimumWidth introduced defaulting
    to true; if false the sidebar width is under full user control
    
    Change-Id: Iab1413a83adf90461feb5d6416aad174439392ca
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116715
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index d03576b3416d..a1b7b4e44b11 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -185,6 +185,7 @@ private:
     /// Use a combination of SwitchFlag_* as value.
     sal_Int32 mnRequestedForceFlags;
     sal_Int32 mnMaximumSidebarWidth;
+    bool mbMinimumSidebarWidth;
     OUString msCurrentDeckId;
     AsynchronousCall maPropertyChangeForwarder;
     AsynchronousCall maContextChangeUpdate;
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index 6ed1d79d80cf..c54c3d6076c0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -242,6 +242,13 @@
         </info>
         <value>500</value>
       </prop>
+      <prop oor:name="MinimumWidth" oor:type="xs:boolean" oor:nillable="false">
+        <info>
+          <desc>Minimum width the sidebar can have. If true, the minumum width
+          is calculated from the largest deck.</desc>
+        </info>
+        <value>true</value>
+      </prop>
     </group>
     <group oor:name="Content">
       <info>
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index b890f9950f56..82aed33efcbf 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -135,6 +135,7 @@ SidebarController::SidebarController (
       maRequestedContext(),
       mnRequestedForceFlags(SwitchFlag_NoForce),
       mnMaximumSidebarWidth(officecfg::Office::UI::Sidebar::General::MaximumWidth::get()),
+      mbMinimumSidebarWidth(officecfg::Office::UI::Sidebar::General::MinimumWidth::get()),
       msCurrentDeckId(gsDefaultDeckId),
       maPropertyChangeForwarder([this](){ return this->BroadcastPropertyChange(); }),
       maContextChangeUpdate([this](){ return this->UpdateConfigurations(); }),
@@ -359,7 +360,7 @@ void SAL_CALL SidebarController::requestLayout()
     if (mpCurrentDeck && !mpCurrentDeck->isDisposed())
     {
         mpCurrentDeck->RequestLayout();
-        nMinimalWidth = mpCurrentDeck->GetMinimalWidth();
+        nMinimalWidth = mbMinimumSidebarWidth ? mpCurrentDeck->GetMinimalWidth() : 0;
     }
     RestrictWidth(nMinimalWidth);
 }
@@ -454,7 +455,7 @@ void SidebarController::NotifyResize()
         VclPtr<DeckTitleBar> pTitleBar = mpCurrentDeck->GetTitleBar();
         if (pTitleBar && pTitleBar->IsVisible())
             pTitleBar->SetCloserVisible(CanModifyChildWindowWidth());
-        nMinimalWidth = mpCurrentDeck->GetMinimalWidth();
+        nMinimalWidth = mbMinimumSidebarWidth ? mpCurrentDeck->GetMinimalWidth() : 0;
     }
 
     RestrictWidth(nMinimalWidth);