diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 17:41:47 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 18:34:39 +0200 |
| commit | 31af61ea091cc895b893c849f2130aa35792b7db (patch) | |
| tree | 6c7b63c5b538034bd5d356c5a8667b7e95d59b9c /sw/source/filter/html/htmlflywriter.cxx | |
| parent | e92c0d6f9b7a6251e00dc55219a203a7e53c96e2 (diff) | |
Fraction: Revert "fdo#81356: convert Fraction to boost::rational<long> - wip"
This reverts commit 47a2d7642d249d70b5da0c330a73f3a0032e4bba.
Conflicts:
cui/source/tabpages/transfrm.cxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdibrow.cxx
sw/source/filter/ww1/w1filter.cxx
tools/source/generic/rational.cxx
Change-Id: I4849916f5f277a4afef0e279b0135c76b36b9d15
Diffstat (limited to 'sw/source/filter/html/htmlflywriter.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlflywriter.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 17e207eed8b5..6a0d313b6316 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -1120,8 +1120,8 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con } while (bFound); bool bScale = false; - boost::rational<long> aScaleX(1, 1); - boost::rational<long> aScaleY(1, 1); + Fraction aScaleX(1, 1); + Fraction aScaleY(1, 1); const SwFmtFrmSize& rFrmSize = rFrmFmt.GetFrmSize(); const SvxBoxItem& rBox = rFrmFmt.GetBox(); @@ -1137,7 +1137,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con if (rRealSize.Width() != nWidth) { - aScaleX = boost::rational<long>(nWidth, rRealSize.Width()); + aScaleX = Fraction(nWidth, rRealSize.Width()); bScale = true; } } @@ -1154,7 +1154,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con if (rRealSize.Height() != nHeight) { - aScaleY = boost::rational<long>(nHeight, rRealSize.Height()); + aScaleY = Fraction(nHeight, rRealSize.Height()); bScale = true; } } |