diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-10-30 15:52:31 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-07 10:45:14 +0100 |
| commit | 5e52aa124b444a34edbef823a91c63ccd58dc17c (patch) | |
| tree | 6339deb45f262dc7175f67398d294f64d9843d62 /sw/source/filter/ww8/rtfattributeoutput.cxx | |
| parent | More unused swapping related methods / member of SdrPage (diff) | |
| download | core-5e52aa124b444a34edbef823a91c63ccd58dc17c.tar.gz core-5e52aa124b444a34edbef823a91c63ccd58dc17c.zip | |
Make GetTwipSize() call SwapIn() by itself in case of invalid size
Change-Id: I5bc6cf097e61d65007dde531af4a213b19e8ca5b
Diffstat (limited to 'sw/source/filter/ww8/rtfattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index b989b2579d8e..cee683b74844 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3560,7 +3560,7 @@ static OString ExportPICT(const SwFlyFrmFmt* pFlyFrmFmt, const Size& rOrig, cons void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize) { m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT); - Size aSize(sw::util::GetSwappedInSize(rOLENode)); + Size aSize(rOLENode.GetTwipSize()); Size aRendered(aSize); aRendered.Width() = rSize.Width(); aRendered.Height() = rSize.Height(); @@ -3697,7 +3697,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw const SwCropGrf& rCr = (const SwCropGrf&)pGrfNode->GetAttr(RES_GRFATR_CROPGRF); //Get original size in twips - Size aSize(sw::util::GetSwappedInSize(*pGrfNode)); + Size aSize(pGrfNode->GetTwipSize()); Size aRendered(aSize); const SwFmtFrmSize& rS = pFlyFrmFmt->GetFrmSize(); |