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

List:       kde-commits
Subject:    Re: branches/work/koffice-essen/filters/libmsooxml
From:       "C. Boemann" <cbo () boemann ! dk>
Date:       2010-11-25 15:10:49
Message-ID: 201011251610.49693.cbo () boemann ! dk
[Download RAW message or body]

On Thursday 25 November 2010 16:06:15 Lassi Taneli Nieminen wrote:
> 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/MsooXmlCommonReaderDrawingM
> LImpl.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);
Sorry, that was my fault. it had a merge conflict and i assumed essen was the 
correct to keep
[prev in list] [next in list] [prev in thread] [next in thread]