commit 54e1e5f597705a1244701c75233a2c3a68a7d844
author Mark Hung <marklh9@gmail.com> Thu Oct 08 21:37:22 2020 +0800
committer Mark Hung <marklh9@gmail.com> Fri Oct 09 14:43:23 2020 +0200
tree 7d96968aeff3709a0927724e5ad03a805e28a33b
parent 1064ff57880dc6d35deb4ddc9aa83d2a5273aa4a

tdf#130314 fix incorrect logic in last commit

Previous commit ( ac76f9e8ad8b ) contains a logical
mistake. Change && to || there.

Change-Id: Id982ce6f22b0022316b564029f813da9072b71e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104089
Tested-by: Jenkins
Reviewed-by: Mark Hung <marklh9@gmail.com>

sw/source/core/text/portxt.cxx

diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 559c3be..0959ef3 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -582,7 +582,7 @@ TextFrameIndex SwTextPortion::GetSpaceCnt(const SwTextSizeInfo &rInf,
            return TextFrameIndex(0);
    }

    if ( InExpGrp() && PortionType::InputField == GetWhichPor() )
    if ( InExpGrp() || PortionType::InputField == GetWhichPor() )
    {
        if( !IsBlankPortion() && !InNumberGrp() && !IsCombinedPortion() )
        {