sw/source/core/text/portxt.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54e1e5f597705a1244701c75233a2c3a68a7d844
Author: Mark Hung <mark...@gmail.com>
AuthorDate: Thu Oct 8 21:37:22 2020 +0800
Commit: Mark Hung <mark...@gmail.com>
CommitDate: Fri Oct 9 14:43:23 2020 +0200
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 <mark...@gmail.com>
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 559c3bea0ad8..0959ef314948 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() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
