[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - writerfilter/source

[Caolán McNamara]

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

New commits:
commit 29babc3958687a1515eb6f4bb3b61ca0e038a09d
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed May 27 16:20:34 2015 +0100

    Resolves: tdf#89731 numberingChange feature not available in writer
    
    Change-Id: Ie779e78fc3c7ccf717117513d9187697c22cc51a
    (cherry picked from commit 0123bbbc4d07fd7d6c233f67139984ab3cd4555d)
    Reviewed-on: https://gerrit.libreoffice.org/15932
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
    Tested-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3e7e4af..040e228 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4700,8 +4700,10 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( const 
OUString& sAuthor )
 {
     if (!m_xAnnotationField.is())
     {
-        assert( m_currentRedline.get());
-        m_currentRedline->m_sAuthor = sAuthor;
+        if (m_currentRedline.get())
+            m_currentRedline->m_sAuthor = sAuthor;
+        else
+            SAL_INFO("writerfilter.dmapper", "numberingChange not 
implemented");
     }
     else
         m_xAnnotationField->setPropertyValue("Author", uno::makeAny(sAuthor));
@@ -4717,8 +4719,10 @@ void DomainMapper_Impl::SetCurrentRedlineDate( const 
OUString& sDate )
 {
     if (!m_xAnnotationField.is())
     {
-        assert( m_currentRedline.get());
-        m_currentRedline->m_sDate = sDate;
+        if (m_currentRedline.get())
+            m_currentRedline->m_sDate = sDate;
+        else
+            SAL_INFO("writerfilter.dmapper", "numberingChange not 
implemented");
     }
     else
         m_xAnnotationField->setPropertyValue("DateTimeValue", 
uno::makeAny(ConversionHelper::ConvertDateStringToDateTime(sDate)));

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits