diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-18 16:22:52 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-18 17:11:24 +0200 |
commit | ff3d44d727d6d34a88e5b53f4b784aa0ac698653 (patch) | |
tree | d8ee5213be7e381ae33e3508da7d414cf489e292 | |
parent | d8adfa8e8564da38ed6914dace33bab73caece94 (diff) |
writerfilter: drop remaining 'using' statements from headers in dmapper
Change-Id: I4c84388b4fae7fe27bcc6266e9978fe9d230435d
-rw-r--r-- | writerfilter/source/dmapper/WrapPolygonHandler.cxx | 16 | ||||
-rw-r--r-- | writerfilter/source/dmapper/WrapPolygonHandler.hxx | 4 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFactory.hxx | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx index e96acd6cf96c..0b25ca2eec3c 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx @@ -88,7 +88,7 @@ WrapPolygon::Pointer_t WrapPolygon::move(const awt::Point & rPoint) return pResult; } -WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fraction & rFractionY) +WrapPolygon::Pointer_t WrapPolygon::scale(const resourcemodel::Fraction & rFractionX, const resourcemodel::Fraction & rFractionY) { WrapPolygon::Pointer_t pResult(new WrapPolygon); @@ -97,7 +97,7 @@ WrapPolygon::Pointer_t WrapPolygon::scale(const Fraction & rFractionX, const Fra while (aIt != aItEnd) { - awt::Point aPoint(Fraction(aIt->X) * rFractionX, Fraction(aIt->Y) * rFractionY); + awt::Point aPoint(resourcemodel::Fraction(aIt->X) * rFractionX, resourcemodel::Fraction(aIt->Y) * rFractionY); pResult->addPoint(aPoint); ++aIt; } @@ -111,17 +111,17 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSr const sal_uInt32 nWrap100Percent = 21600; - Fraction aMove(nWrap100Percent, rSrcSize.Width); - aMove = aMove * Fraction(15, 1); + resourcemodel::Fraction aMove(nWrap100Percent, rSrcSize.Width); + aMove = aMove * resourcemodel::Fraction(15, 1); awt::Point aMovePoint(aMove, 0); pResult = move(aMovePoint); - Fraction aScaleX(nWrap100Percent, Fraction(nWrap100Percent) + aMove); - Fraction aScaleY(nWrap100Percent, Fraction(nWrap100Percent) - aMove); + resourcemodel::Fraction aScaleX(nWrap100Percent, resourcemodel::Fraction(nWrap100Percent) + aMove); + resourcemodel::Fraction aScaleY(nWrap100Percent, resourcemodel::Fraction(nWrap100Percent) - aMove); pResult = pResult->scale(aScaleX, aScaleY); - Fraction aScaleSrcX(rSrcSize.Width, nWrap100Percent); - Fraction aScaleSrcY(rSrcSize.Height, nWrap100Percent); + resourcemodel::Fraction aScaleSrcX(rSrcSize.Width, nWrap100Percent); + resourcemodel::Fraction aScaleSrcY(rSrcSize.Height, nWrap100Percent); pResult = pResult->scale(aScaleSrcX, aScaleSrcY); return pResult; diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx index cd987abb8332..371e310bc567 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx @@ -28,8 +28,6 @@ namespace writerfilter { namespace dmapper { -using resourcemodel::Fraction; - class WrapPolygon { public: @@ -53,7 +51,7 @@ public: size_t size() const; WrapPolygon::Pointer_t move(const css::awt::Point & rMove); - WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY); + WrapPolygon::Pointer_t scale(const resourcemodel::Fraction & rFractionX, const resourcemodel::Fraction & rFractionY); WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize); css::drawing::PointSequenceSequence getPointSequenceSequence() const; }; diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx index a543a9fc2137..dc626795df68 100644 --- a/writerfilter/source/ooxml/OOXMLFactory.hxx +++ b/writerfilter/source/ooxml/OOXMLFactory.hxx @@ -32,8 +32,6 @@ namespace writerfilter { namespace ooxml { -using namespace std; - enum ResourceType_t { RT_NoResource, RT_Table, |