[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-7' - sw/source

[Michael Stahl]

 sw/source/core/unocore/unosett.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit ba560864b61fdfee32018751335d638a6affe12f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jul 1 23:48:59 2013 +0200

    fdo#65650: fix Writer ODF import of list style with bullets and color
    
    For such lists xmloff tries to set a BulletColor property but
    SwXNumberingRules::SetNumberingRuleByIndex() throws a RuntimeException
    and does not set any of the list properties on the NumRule.
    
    (regression from abf18610998aa8330f8330f1d769508e47ef5b20)
    
    Change-Id: Id3e80ee1ed67497786258a1096bc5c8dec90ce21
    (cherry picked from commit 0520eaf9e661abddadf9a21cfbeab37b0b85dd68)
    Reviewed-on: https://gerrit.libreoffice.org/4666
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 2b312a3..ed7a5c9 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1670,8 +1670,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
     const sal_uInt16 NotInChapterLast = 23;
     const sal_uInt16 InChapterFirst = 24;
     const sal_uInt16 InChapterLast = 24;
-    const sal_uInt16 IgnoredFirst = 25;
-    const sal_uInt16 IgnoredLast = 26;
 
     const beans::PropertyValue* pPropArray = rProperties.getConstArray();
     PropValDataArr aPropertyValues;
@@ -1682,8 +1680,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
         bExcept = sal_True;
         for(sal_uInt16 j = 0; j < SAL_N_ELEMENTS( aNumPropertyNames ); j++)
         {
-            if( j >= IgnoredFirst && j <= IgnoredLast )
-                continue;
             if( pDocShell && j >= NotInChapterFirst && j <= NotInChapterLast )
                 continue;
             if( !pDocShell && j >= InChapterFirst && j <= InChapterLast )
@@ -2102,7 +2098,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
                 break;
                 case 25: // BulletRelSize - unsupported - only available in Impress
                 break;
-                case 26: // ignored too
+                case 26: // BulletColor - ignored too
                 break;
             }
         }