[Libreoffice-commits] .: 3 commits - writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    1 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx    |    2 ++
 writerfilter/source/rtftok/rtftokenizer.cxx       |    5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit ac8782bd51d3e178690f9f6ad942e06f67e808c1
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Nov 12 00:01:51 2011 +0100

    Related: fdo#37716 null pointer check for the unit test

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 96c0add..9cc025c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -754,6 +754,8 @@ bool RTFDocumentImpl::inFrame()
 
 void RTFDocumentImpl::checkChangedFrame()
 {
+    if (!getModelFactory().is())
+        return;
     // Check if this is a frame.
     if (inFrame() && !m_bWasInFrame)
     {
commit 444d04b60b17efb481cd34949e133119f6764845
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Fri Nov 11 23:54:34 2011 +0100

    Related: fdo#37498 don't try to read after the last closing brace

diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 49d5ee0..7dedd40 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -84,9 +84,10 @@ int RTFTokenizer::resolveParse()
                     ret = m_rImport.popState();
                     if (ret)
                         return ret;
-                    if (m_rImport.isSubstream() && m_rImport.getGroup() == 0)
+                    if (m_rImport.getGroup() == 0)
                     {
-                        m_rImport.finishSubstream();
+                        if (m_rImport.isSubstream())
+                            m_rImport.finishSubstream();
                         return 0;
                     }
                     break;
commit 5a212d501ee1c8ae2b7b9517a4ff486e61cac0fd
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Fri Nov 11 23:19:53 2011 +0100

    Related: fdo#33012 null pointer check for the unit test to pass

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0f90573..53bfb1e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2503,6 +2503,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                         handleAuthor(pContext, rPropNameSupplier, xFieldInterface, xFieldProperties, aIt->second.eFieldId  );
                     break;
                     case FIELD_DATE:
+                    if (xFieldProperties.is())
                     {
                         //not fixed,
                         xFieldProperties->setPropertyValue(