[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] libs/odf: Don't save diagonal borders on page layouts
From:       Pierre Ducroquet <pinaraf () pinaraf ! info>
Date:       2011-08-31 22:22:32
Message-ID: 20110831222232.E24D7A6078 () git ! kde ! org
[Download RAW message or body]

Git commit d43df9cfb3bc4414e9fb10a9ae9a8c80e356e90a by Pierre Ducroquet.
Committed on 01/09/2011 at 00:21.
Pushed by ducroquet into branch 'master'.

Don't save diagonal borders on page layouts

M  +15   -11   libs/odf/KoBorder.cpp

http://commits.kde.org/calligra/d43df9cfb3bc4414e9fb10a9ae9a8c80e356e90a

diff --git a/libs/odf/KoBorder.cpp b/libs/odf/KoBorder.cpp
index dad3219..8bfa47d 100644
--- a/libs/odf/KoBorder.cpp
+++ b/libs/odf/KoBorder.cpp
@@ -949,12 +949,14 @@ void KoBorder::saveOdf(KoGenStyle &style, KoGenStyle::PropertyType type) const
             style.addProperty("fo:border-bottom", bottomBorderString, type);
     }
 
-    //if (tlbrBorderStyle() != BorderNone) {
-        style.addProperty("style:diagonal-tl-br", tlbrBorderString, type);
-    //}
-    //if (trblBorderStyle() != BorderNone) {
-        style.addProperty("style:diagonal-bl-tr", trblBorderString, type);
-    //}
+    if (style.type() != KoGenStyle::PageLayoutStyle) {
+        //if (tlbrBorderStyle() != BorderNone) {
+            style.addProperty("style:diagonal-tl-br", tlbrBorderString, type);
+        //}
+        //if (trblBorderStyle() != BorderNone) {
+            style.addProperty("style:diagonal-bl-tr", trblBorderString, type);
+        //}
+    }
 
     // Handle double borders
     QString leftBorderLineWidth = QString("%1pt %2pt %3pt")
@@ -1002,10 +1004,12 @@ void KoBorder::saveOdf(KoGenStyle &style, KoGenStyle::PropertyType type) const
             style.addProperty("style:border-line-width-bottom", bottomBorderLineWidth, type);
     }
 
-    if (tlbrBorderStyle() == BorderDouble) {
-        style.addProperty("style:diagonal-tl-br-widths", tlbrBorderLineWidth, type);
-    }
-    if (trblBorderStyle() == BorderDouble) {
-        style.addProperty("style:diagonal-bl-tr-widths", trblBorderLineWidth, type);
+    if (style.type() != KoGenStyle::PageLayoutStyle) {
+        if (tlbrBorderStyle() == BorderDouble) {
+            style.addProperty("style:diagonal-tl-br-widths", tlbrBorderLineWidth, type);
+        }
+        if (trblBorderStyle() == BorderDouble) {
+            style.addProperty("style:diagonal-bl-tr-widths", trblBorderLineWidth, type);
+        }
     }
 }

[prev in list] [next in list] [prev in thread] [next in thread]