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

List:       kde-commits
Subject:    branches/work/koffice-essen/filters/libmsooxml
From:       Lassi Taneli Nieminen <lassniem () gmail ! com>
Date:       2010-11-25 15:06:15
Message-ID: 20101125150615.4DC10AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200714 by lassin:

Ooxml marginal fix, which for some reason was never forwarded from trunk to essen.


 M  +12 -9     MsooXmlCommonReaderDrawingMLImpl.h  


--- branches/work/koffice-essen/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h #1200713:1200714
@@ -1935,15 +1935,18 @@
 
     bool ok = false;
 
-    const qreal marginLeft = qreal(EMU_TO_POINT(marL.isEmpty() ? 347663.0 : marL.toDouble(&ok)));
-    m_currentParagraphStyle.addPropertyPt("fo:margin-left", marginLeft);
-
-    const qreal marginRight = qreal(EMU_TO_POINT(marR.isEmpty() ? 0.0 : marR.toDouble(&ok)));
-    m_currentParagraphStyle.addPropertyPt("fo:margin-right", marginRight);
-
-    const qreal textIndent = qreal(EMU_TO_POINT(indent.isEmpty() ? -342900.0 : indent.toDouble(&ok)));
-    m_currentParagraphStyle.addPropertyPt("fo:text-indent", textIndent);
-
+    if (!marL.isEmpty()) {
+        const qreal marginal = qreal(EMU_TO_POINT(marL.toDouble(&ok)));
+        m_currentParagraphStyle.addPropertyPt("fo:margin-left", marginal);
+    }
+    if (!marR.isEmpty()) {
+        const qreal marginal = qreal(EMU_TO_POINT(marR.toDouble(&ok)));
+        m_currentParagraphStyle.addPropertyPt("fo:margin-right", marginal);
+    }
+    if (!indent.isEmpty()) {
+        const qreal firstInd = qreal(EMU_TO_POINT(indent.toDouble(&ok)));
+        m_currentParagraphStyle.addPropertyPt("fo:text-indent", firstInd);
+    }
     if (!defTabSz.isEmpty()) {
         const qreal tabSize = qreal(EMU_TO_POINT(defTabSz.toDouble(&ok)));
         m_currentParagraphStyle.addPropertyPt("style:tab-stop-distance", tabSize);
[prev in list] [next in list] [prev in thread] [next in thread]