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

[Miklos Vajna]

 sw/qa/core/exportdata/html/pass/cp1000068.odt |binary
 sw/qa/core/filters-test.cxx                   |    8 ++++++++
 sw/source/filter/writer/wrt_fn.cxx            |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 1de73df9cb3fdda3732c5270864bc30e38e63c2f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Apr 30 14:40:16 2014 +0200

    cp#1000068 testcase
    
    Change-Id: I0dbbfd9c82600fbc5c98c5107639e1714b220c71

diff --git a/sw/qa/core/exportdata/html/fail/.gitignore b/sw/qa/core/exportdata/html/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sw/qa/core/exportdata/html/indeterminate/.gitignore b/sw/qa/core/exportdata/html/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/sw/qa/core/exportdata/html/pass/cp1000068.odt b/sw/qa/core/exportdata/html/pass/cp1000068.odt
new file mode 100644
index 0000000..8ae4ad5
Binary files /dev/null and b/sw/qa/core/exportdata/html/pass/cp1000068.odt differ
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 3cbad56..8548616 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -180,6 +180,14 @@ void SwFiltersTest::testCVEs()
             0,
             0,
             /*bExport=*/true);
+
+    testDir("HTML",
+            getURLFromSrc("/sw/qa/core/exportdata/html/"),
+            OUString(sHTML),
+            0,
+            0,
+            0,
+            /*bExport=*/true);
 }
 
 void SwFiltersTest::setUp()
commit 78eadd2f122e072f217137199430f113f41b450a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Apr 30 11:28:40 2014 +0200

    cp#1000068 sw HTML export: fix crash when trying to export new FillAttributes
    
    Change-Id: I588b8f7d953fe6a3e04ad48074e5f3f554449a79

diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 2948160..07dca7f 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -60,7 +60,8 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
         SfxItemIter aIter( *pSet );
         pItem = aIter.GetCurItem();
         do {
-            if( 0 != ( pOut = pTab[ pItem->Which() - RES_CHRATR_BEGIN] ))
+            // pTab only covers POOLATTR_BEGIN..POOLATTR_END.
+            if( pItem->Which() <= POOLATTR_END && 0 != ( pOut = pTab[ pItem->Which() - RES_CHRATR_BEGIN] ))
                     (*pOut)( rWrt, *pItem );
         } while( !aIter.IsAtEnd() && 0 != ( pItem = aIter.NextItem() ) );
     }