git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@425 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_profile.py

@@ -2402,10 +2402,16 @@ class samba(objShare):
             # Для добавления перевода строки между областями если его нет
             #print self.docObj.body.toprettyxml()
             xmlAreas = xpath.Evaluate("child::area", self.docObj.body)
+            firstArea = True
             for xmlArea in xmlAreas:
                 if xmlArea.previousSibling and\
                 self.docObj.getTypeField(xmlArea.previousSibling) == "br":
+                    # Удаляем перед первой областью перевод строки
+                    if firstArea:
+                        firstArea = False
+                        self.docObj.body.removeChild(xmlArea.previousSibling)
                     continue
+                firstArea = False
                 xmlFields = xpath.Evaluate("child::field", xmlArea)
                 if not (xmlFields and\
                     (self.docObj.getTypeField(xmlFields[-1]) == "br" or\
@@ -3522,20 +3528,24 @@ class kde(samba):
             # Для добавления перевода строки между областями если его нет
             #print self.docObj.body.toprettyxml()
             xmlAreas = xpath.Evaluate("child::area", self.docObj.body)
-            if xmlAreas and len(xmlAreas)>1:
-                for xmlArea in xmlAreas[-1:]:
-                    if xmlArea.previousSibling and\
-                    self.docObj.getTypeField(xmlArea.previousSibling) == "br":
-                        continue
-                    xmlFields = xpath.Evaluate("child::field", xmlArea)
-                    if not (xmlFields and\
-                        (self.docObj.getTypeField(xmlFields[-1])=="br" or\
-                        self.docObj.getTypeField(xmlFields[-1])=="comment")):
-                        if xmlArea.nextSibling:
-                            parentNode = xmlArea.parentNode
-                            nextNode = xmlArea.nextSibling
-                            parentNode.insertBefore(\
-                                                self.docObj.createField("br",
-                                                                [],"",[],
-                                                                False,False),
-                                                                nextNode)
+            firstArea = True
+            for xmlArea in xmlAreas:
+                if xmlArea.previousSibling and\
+                self.docObj.getTypeField(xmlArea.previousSibling) == "br":
+                    # Удаляем перед первой областью перевод строки
+                    if firstArea:
+                        firstArea = False
+                        self.docObj.body.removeChild(xmlArea.previousSibling)
+                    continue
+                firstArea = False
+                xmlFields = xpath.Evaluate("child::field", xmlArea)
+                if not (xmlFields and\
+                    (self.docObj.getTypeField(xmlFields[-1]) == "br" or\
+                     self.docObj.getTypeField(xmlFields[-1]) == "comment")):
+                    if xmlArea.nextSibling:
+                        parentNode = xmlArea.parentNode
+                        nextNode = xmlArea.nextSibling
+                        parentNode.insertBefore(self.docObj.createField("br",
+                                                             [],"",[],
+                                                             False,False),
+                                                             nextNode)