diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-02 21:12:43 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-09-05 09:18:48 +0000 |
| commit | ea8be52737f74edb89eb459bcef6d2d697ea48e4 (patch) | |
| tree | 89d470c93e1a129ea706654e6c4bfeebd507fe19 | |
| parent | f87b678a40ab73402366f409078f20425f258953 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf | bin | 0 -> 1560 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf Binary files differnew file mode 100644 index 000000000000..130ff3f232f1 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 08c7f56d8f3a..8544fc9beec9 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 ) |