summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-02 21:12:43 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-09-02 21:15:17 +0100
commita42f4aaba352a4d33ce77898e7b7b7bc0c10f1f8 (patch)
tree4542439dd3baf77233b251efcb4b1376f17fdb9a /writerfilter
parent326da3886e6f700ad1fb269df201fae9fa01d5df (diff)
fftester: apparent wrong property tested for existence
Change-Id: I5d208bb2a85d7aa4eea9b1c950eeb6f35493f759
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtfbin0 -> 1560 bytes
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx2
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
new file mode 100644
index 000000000000..130ff3f232f1
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/fail/propheight-1.rtf
Binary files differ
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 6897104b259d..b138a2877fbb 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1276,7 +1276,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 )