commit f31bda6971e6f69e2f0c170df4a0dd206aa2f720
author Andreas Heinisch <andreas.heinisch@yahoo.de> Sun May 07 18:05:56 2023 +0200
committer Michael Stahl <michael.stahl@allotropia.de> Mon May 08 13:33:11 2023 +0200
tree 6a6ac778c577eb7f1f8ec69f679876b1d1308895
parent 63b8e8bda29efbdde0e0bd7f7d2b18d5a9b7b135

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.stahl@allotropia.de>

editeng/source/items/frmitems.cxx

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index de15153..250b61e3 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;