diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-02 21:12:43 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-09-20 23:04:36 +0200 |
| commit | 165394dacf610771ec24da12de0f04f2a53c84fe (patch) | |
| tree | 4b2d8d8540ccaaa69cab047aa81c1bfd1d4bc0cf | |
| parent | 4b27f7eb13002607d9238b3893c0cf7ba6c2c85c (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>
(cherry picked from commit ea8be52737f74edb89eb459bcef6d2d697ea48e4)
| -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 09e6d8f22066..5833b9c92bc9 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1307,7 +1307,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 ) |