writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3eda8234acf09cd5a31cdcde76f04631a51fcc37
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Apr 27 15:25:20 2017 +0100
Resolves: tdf#107411 LibreOffice hangs at RTF import time
regression from...
commit b993942622897fc64a1f7462189fa0463eb30e1c
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Apr 1 16:43:04 2017 +0100
ubsan: use WrapTextMode_MAKE_FIXED_SIZE instead of -1 as unset flag
cause WrapTextMode_MAKE_FIXED_SIZE is >= 0
Change-Id: I6b5adbcc38cc841c5df9a0af9acdf634d3c6c757
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 912bb6672977..a11b10c78844 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -918,9 +918,9 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
pStyleProperties->GetvAnchor() >= 0 ?
pStyleProperties->GetvAnchor() : text::RelOrientation::FRAME )));
aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_SURROUND),
- rAppendContext.pLastParagraphProperties->GetWrap() >=
text::WrapTextMode_NONE
+ rAppendContext.pLastParagraphProperties->GetWrap() !=
text::WrapTextMode::WrapTextMode_MAKE_FIXED_SIZE
? rAppendContext.pLastParagraphProperties->GetWrap()
- : pStyleProperties->GetWrap() >= text::WrapTextMode_NONE
+ : pStyleProperties->GetWrap() !=
text::WrapTextMode::WrapTextMode_MAKE_FIXED_SIZE
? pStyleProperties->GetWrap()
: text::WrapTextMode_NONE ));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
