[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3aec127f4db9b9f5beb6289a9177e6c21891c762
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Thu Nov 17 17:18:54 2011 +0100

    Related i#44806: Fix crash in dmapper when importing FILENAME fields

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e6e9ad0..a7f047c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2569,9 +2569,10 @@ void DomainMapper_Impl::CloseFieldCommand()
                     case FIELD_FILENAME:
                     {
                         sal_Int32 nNumberingTypeIndex = pContext->GetCommand().indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\p")));
-                        xFieldProperties->setPropertyValue(
-                                rPropNameSupplier.GetName(PROP_FILE_FORMAT),
-                                uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
+                        if (xFieldProperties.is())
+                            xFieldProperties->setPropertyValue(
+                                    rPropNameSupplier.GetName(PROP_FILE_FORMAT),
+                                    uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
                     }
                     break;
                     case FIELD_FILESIZE     : break;