writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf |binary writerfilter/source/dmapper/PropertyMap.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)
New commits: commit ea8be52737f74edb89eb459bcef6d2d697ea48e4 Author: Caolán McNamara <[email protected]> Date: Fri Sep 2 21:12:43 2016 +0100 fftester: apparent wrong property tested for existence Change-Id: I5d208bb2a85d7aa4eea9b1c950eeb6f35493f759 (cherry picked from commit a42f4aaba352a4d33ce77898e7b7b7bc0c10f1f8) Reviewed-on: https://gerrit.libreoffice.org/28631 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf new file mode 100644 index 0000000..130ff3f Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf differ diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 08c7f56..8544fc9 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1251,7 +1251,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) if( pEntry.get( ) ) { boost::optional<PropertyMap::Property> pPropHeight = pEntry->pProperties->getProperty(PROP_CHAR_HEIGHT_ASIAN); - if(pProp) + if (pPropHeight) { double fHeight = 0; if( pPropHeight->second >>= fHeight )
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
