sw/source/core/unocore/unosett.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
New commits: commit 0520eaf9e661abddadf9a21cfbeab37b0b85dd68 Author: Michael Stahl <mst...@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 diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 4f8e083..31dfa2dd 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1658,8 +1658,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; @@ -1670,8 +1668,6 @@ void SwXNumberingRules::SetNumberingRuleByIndex( bExcept = 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 ) @@ -2090,7 +2086,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( break; case 25: // BulletRelSize - unsupported - only available in Impress break; - case 26: // ignored too + case 26: // BulletColor - ignored too break; } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits