[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - writerfilter/qa writerfilter/source

[Caolán McNamara]

 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 96e76028ef33e6617d702f07a0ad4a485db50f11
Author: Caolán McNamara <caolanm at redhat.com>
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/28630
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

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 5bc56b8..ac192e6 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1247,7 +1247,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 )