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

[Tamás Zolnai (via logerrit)]

 sw/source/uibase/shells/tabsh.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 95d12a686065b41abe3840608d3bbfbf284fb7d8
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Oct 30 14:17:37 2019 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Nov 4 18:31:52 2019 +0100

    Table panel: Make sure Row Height spin button works with the default size type
    
    SwFormatFrameSize() object has ATT_VAR_SIZE size type by default, before
    we change it to anything else. We will change ATT_VAR_SIZE to ATT_MIN_SIZE
    when changing the row height on the sidebar panel, similar to the
    row height dialog.
    
    Change-Id: I2520340e023b910549ff2a4b011e9ae3da2b7b11
    Reviewed-on: https://gerrit.libreoffice.org/81897
    Tested-by: Jenkins
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit baf205e91db4356e71002581e46b1bdcc1841319)
    Reviewed-on: https://gerrit.libreoffice.org/82028
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 8a380d6d325c..29c2e320d1d8 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -1114,6 +1114,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 std::unique_ptr<SwFormatFrameSize> pHeight = rSh.GetRowHeight();
                 if ( pHeight )
                 {
+                    if (pHeight->GetHeightSizeType() == ATT_VAR_SIZE)
+                        pHeight->SetHeightSizeType(ATT_MIN_SIZE);
                     pHeight->SetHeight(nNewHeight);
                     rSh.SetRowHeight(*pHeight);
                 }