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

Michael Stahl mstahl at redhat.com
Thu Feb 28 09:20:43 PST 2013


 writerfilter/source/dmapper/NumberingManager.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 0d6df6312d84e1ae2680af78538de94938f94605
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 27 23:20:24 2013 +0100

    fdo#61000: writerfilter: filter out unsupported list tab stops
    
    Change-Id: Ic9d31eba84b1d8d9cf93d8289621a65d43521a8b
    (cherry picked from commit dbb74ee9950dc706ea4fde3397a4c1d19b172fa9)
    Reviewed-on: https://gerrit.libreoffice.org/2464
    Reviewed-by: Niko Rönkkö <ronkko at iki.fi>
    Reviewed-by: Joren De Cuyper <joren.libreoffice at telenet.be>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 23b7225..529a794 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -135,7 +135,13 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
             m_nXChFollow = nValue;
         break;
         case NS_ooxml::LN_CT_TabStop_pos:
-            m_nTabstop = nValue;
+            if (nValue < 0)
+            {
+                SAL_INFO("writerfilter",
+                        "unsupported list tab stop position " << nValue);
+            }
+            else
+                m_nTabstop = nValue;
         break;
         default:
             OSL_FAIL( "this line should never be reached");


More information about the Libreoffice-commits mailing list