From kde-commits Mon Nov 29 07:44:22 2010 From: Ganesh Paramasivam Date: Mon, 29 Nov 2010 07:44:22 +0000 To: kde-commits Subject: branches/work/koffice-change-tracking/libs/kotext/opendocument Message-Id: <20101129074422.940EFAC8A3 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129101670505533 SVN commit 1201926 by ganeshp: Remove the handling of insert-around-content under body. This scenario is not possible M +0 -9 KoTextLoader.cpp --- branches/work/koffice-change-tracking/libs/kotext/opendocument/KoTextLoader.cpp #1201925:1201926 @@ -433,7 +433,6 @@ loadDeleteChangeOutsidePorH(id, cursor); usedParagraph = false; } else if (localName == "p") { // text paragraph - if (tag.attributeNS(KoXmlNS::delta, "insertion-type") != "insert-around-content") { if (tag.attributeNS(KoXmlNS::split, "split001-idref") != "") d->splitPositionMap.insert(tag.attributeNS(KoXmlNS::split, "split001-idref"),cursor.position()); @@ -453,11 +452,7 @@ if (tag.attributeNS(KoXmlNS::delta, "insertion-type") != "") d->closeChangeRegion(tag); - } else { - _node = loadTagTypeChanges(tag, cursor); - } } else if (localName == "h") { // heading - if (tag.attributeNS(KoXmlNS::delta, "insertion-type") != "insert-around-content") { if (tag.attributeNS(KoXmlNS::split, "split001-idref") != "") d->splitPositionMap.insert(tag.attributeNS(KoXmlNS::split, "split001-idref"),cursor.position()); @@ -477,9 +472,6 @@ if (tag.attributeNS(KoXmlNS::delta, "insertion-type") != "") d->closeChangeRegion(tag); - } else { - _node = loadTagTypeChanges(tag, cursor); - } } else if (localName == "unordered-list" || localName == "ordered-list" // OOo-1.1 || localName == "list" || localName == "numbered-paragraph") { // OASIS if (tag.attributeNS(KoXmlNS::delta, "insertion-type") != "") @@ -1487,7 +1479,6 @@ cursor.mergeCharFormat(format); cursor.clearSelection(); } - return result; }