diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-23 09:03:54 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-23 09:05:05 +0100 |
| commit | 29d2b9fc74fab4216bbf64284833eb1018f33d92 (patch) | |
| tree | 43ac319fafcce52c5a6812dd3c21155b53ed04a3 /sw/source/filter | |
| parent | c5ee08d809bba566ef9ef4bea3c50c901e1c5c19 (diff) | |
sw: nTwipstoEMU -> nPosXEMU and nPosYEMU
It was used for both x and y positions, hard to read.
Change-Id: Ie2461662671405a6348aa24c3946b376c123f699
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 436a4c75240d..0366407d9368 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -490,7 +490,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons else { m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_posOffset, FSEND); - sal_Int64 nTwipstoEMU = TwipsToEMU(aPos.X); + sal_Int64 nPosXEMU = TwipsToEMU(aPos.X); /* Absolute Position Offset Value is of type Int. Hence it should not be greater than * Maximum value for Int OR Less than the Minimum value for Int. @@ -503,32 +503,32 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons * Please refer : http://www.schemacentral.com/sc/xsd/t-xsd_int.html */ - if (nTwipstoEMU > MAX_INTEGER_VALUE) + if (nPosXEMU > MAX_INTEGER_VALUE) { - nTwipstoEMU = MAX_INTEGER_VALUE; + nPosXEMU = MAX_INTEGER_VALUE; } - else if (nTwipstoEMU < MIN_INTEGER_VALUE) + else if (nPosXEMU < MIN_INTEGER_VALUE) { - nTwipstoEMU = MIN_INTEGER_VALUE; + nPosXEMU = MIN_INTEGER_VALUE; } - m_pImpl->m_pSerializer->write(nTwipstoEMU); + m_pImpl->m_pSerializer->write(nPosXEMU); m_pImpl->m_pSerializer->endElementNS(XML_wp, XML_posOffset); } m_pImpl->m_pSerializer->endElementNS(XML_wp, XML_positionH); m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_positionV, XML_relativeFrom, relativeFromV, FSEND); - sal_Int64 nTwipstoEMU = TwipsToEMU(aPos.Y); + sal_Int64 nPosYEMU = TwipsToEMU(aPos.Y); // tdf#93675, 0 below line/paragraph and/or top line/paragraph with // wrap top+bottom or other wraps is affecting the line directly // above the anchor line, which seems odd, but a tiny adjustment // here to bring the top down convinces msoffice to wrap like us - if (nTwipstoEMU == 0 && + if (nPosYEMU == 0 && (strcmp(relativeFromV, "line") == 0 || strcmp(relativeFromV, "paragraph") == 0) && (!alignV || strcmp(alignV, "top") == 0)) { alignV = nullptr; - nTwipstoEMU = 635; + nPosYEMU = 635; } if (alignV != nullptr) @@ -540,15 +540,15 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons else { m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_posOffset, FSEND); - if (nTwipstoEMU > MAX_INTEGER_VALUE) + if (nPosYEMU > MAX_INTEGER_VALUE) { - nTwipstoEMU = MAX_INTEGER_VALUE; + nPosYEMU = MAX_INTEGER_VALUE; } - else if (nTwipstoEMU < MIN_INTEGER_VALUE) + else if (nPosYEMU < MIN_INTEGER_VALUE) { - nTwipstoEMU = MIN_INTEGER_VALUE; + nPosYEMU = MIN_INTEGER_VALUE; } - m_pImpl->m_pSerializer->write(nTwipstoEMU); + m_pImpl->m_pSerializer->write(nPosYEMU); m_pImpl->m_pSerializer->endElementNS(XML_wp, XML_posOffset); } m_pImpl->m_pSerializer->endElementNS(XML_wp, XML_positionV); |