[Libreoffice-commits] core.git: 2 commits - editeng/source sfx2/uiconfig

[Heiko Tietze (via logerrit)]

 editeng/source/items/frmitems.cxx |   18 ++++++++++++++++++
 sfx2/uiconfig/ui/startcenter.ui   |    1 +
 2 files changed, 19 insertions(+)

New commits:
commit b7632b68c5398fce8a22ec09414e0075709fbc32
Author:     Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Mon May 8 09:20:12 2023 +0200
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Mon May 8 13:33:16 2023 +0200

    Resolves tdf#155167 - Start center app pane issue under gtk3
    
    Issue introduced with 77ed6380dda73a9716f48f73c3ff730380557a09
    
    Change-Id: I093808b87bca5f93e28239f22886f543a053e62b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151493
    Tested-by: Jenkins
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index d8d27b8fe6ad..4b4cdac6d252 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -106,6 +106,7 @@
               <object class="GtkScrolledWindow" id="scrollapps">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
+                <property name="hscrollbar-policy">never</property>
                 <property name="shadow-type">in</property>
                 <child>
                   <object class="GtkViewport">
commit f31bda6971e6f69e2f0c170df4a0dd206aa2f720
Author:     Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Sun May 7 18:05:56 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon May 8 13:33:11 2023 +0200

    tdf#154282 - Prevent crash for LeftParaMargin and RightParaMargin
    
    Prevent crash for LeftParaMargin and RightParaMargin by returning both
    values for the hardcoded 0 in SfxDispatchController_Impl::StateChanged.
    
    Change-Id: I7705bd5e22d6cd7fbbe702d7ddbf17e2899b851e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151472
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index de1515380ed5..250b61e33753 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -756,6 +756,15 @@ bool SvxTextLeftMarginItem::QueryValue(uno::Any& rVal, 
sal_uInt8 nMemberId) cons
     nMemberId &= ~CONVERT_TWIPS;
     switch (nMemberId)
     {
+        // tdf#154282 - return both values for the hardcoded 0 in 
SfxDispatchController_Impl::StateChanged
+        case 0:
+        {
+            css::frame::status::LeftRightMarginScale aLRSpace;
+            aLRSpace.TextLeft = static_cast<sal_Int32>(bConvert ? 
convertTwipToMm100(GetTextLeft()) : GetTextLeft());
+            aLRSpace.ScaleLeft = static_cast<sal_Int16>(m_nPropLeftMargin);
+            rVal <<= aLRSpace;
+            break;
+        }
         case MID_TXT_LMARGIN :
             rVal <<= static_cast<sal_Int32>(bConvert ? 
convertTwipToMm100(GetTextLeft()) : GetTextLeft());
         break;
@@ -1102,6 +1111,15 @@ bool SvxRightMarginItem::QueryValue(uno::Any& rVal, 
sal_uInt8 nMemberId) const
     nMemberId &= ~CONVERT_TWIPS;
     switch (nMemberId)
     {
+        // tdf#154282 - return both values for the hardcoded 0 in 
SfxDispatchController_Impl::StateChanged
+        case 0:
+        {
+            css::frame::status::LeftRightMarginScale aLRSpace;
+            aLRSpace.Right = static_cast<sal_Int32>(bConvert ? 
convertTwipToMm100(m_nRightMargin) : m_nRightMargin);
+            aLRSpace.ScaleRight = static_cast<sal_Int16>(m_nPropRightMargin);
+            rVal <<= aLRSpace;
+            break;
+        }
         case MID_R_MARGIN:
             rVal <<= static_cast<sal_Int32>(bConvert ? 
convertTwipToMm100(m_nRightMargin) : m_nRightMargin);
             break;