[Libreoffice-commits] core.git: sw/qa writerfilter/source

[dinesh_mp]

 sw/qa/core/data/ooxml/pass/fdo81380.docx    |binary
 writerfilter/source/dmapper/PropertyMap.cxx |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c73cb50cdd7dffe809d3e66e5acdfab2bd521f62
Author: dinesh_mp <dinesh.patil at synerzip.com>
Date:   Thu Jul 17 18:59:37 2014 +0530

    fdo#81380: LO crashes while opening the document
    
    LO crashes while opening the document because PropertySet interface
    is null and check for this condition was missing, so added the check.
    
    Change-Id: I04dd873ea0923a662e27f9eb2013cde31edc912b
    Reviewed-on: https://gerrit.libreoffice.org/10379
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    Tested-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/sw/qa/core/data/ooxml/pass/fdo81380.docx b/sw/qa/core/data/ooxml/pass/fdo81380.docx
new file mode 100644
index 0000000..5245844
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo81380.docx differ
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index f3d93f8..1fe256f 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -549,7 +549,8 @@ void SectionPropertyMap::ApplyBorderToPageStyles(
             sal_uInt32 nLineWidth = 0;
             if (m_pBorderLines[nBorder])
                 nLineWidth = m_pBorderLines[nBorder]->LineWidth;
-            SetBorderDistance( xFirst, aMarginIds[nBorder], aBorderDistanceIds[nBorder],
+            if(xFirst.is())
+                SetBorderDistance( xFirst, aMarginIds[nBorder], aBorderDistanceIds[nBorder],
                   m_nBorderDistances[nBorder], nOffsetFrom, nLineWidth );
             if(xSecond.is())
                 SetBorderDistance( xSecond, aMarginIds[nBorder], aBorderDistanceIds[nBorder],