diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 15:25:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 15:28:00 +0100 |
| commit | 3eda8234acf09cd5a31cdcde76f04631a51fcc37 (patch) | |
| tree | f038f1554670fd2ca315c7213ae8d14e84bf5e85 /writerfilter | |
| parent | tdf#47243 tdf#39327 tdf#103639 Proper scaling of SetPageTransform (diff) | |
| download | core-3eda8234acf09cd5a31cdcde76f04631a51fcc37.tar.gz core-3eda8234acf09cd5a31cdcde76f04631a51fcc37.zip | |
Resolves: tdf#107411 LibreOffice hangs at RTF import time
regression from...
commit b993942622897fc64a1f7462189fa0463eb30e1c
Author: Caolán McNamara <caolanm@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
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 )); |