mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerfilter: drop remaining 'using' statements from headers in dmapper

Browse Source 
Change-Id: I4c84388b4fae7fe27bcc6266e9978fe9d230435d
This commit is contained in:
Miklos Vajna
2014-05-18 16:22:52 +02:00
parent d8adfa8e85
commit ff3d44d727
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
writerfilter/source/dmapper/WrapPolygonHandler.cxx
View File

@@ -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;

4
writerfilter/source/dmapper/WrapPolygonHandler.hxx
View File

@@ -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;
};

2
writerfilter/source/ooxml/OOXMLFactory.hxx
View File

@@ -32,8 +32,6 @@
namespace writerfilter {
namespace ooxml {
using namespace std;
enum ResourceType_t {
RT_NoResource,
RT_Table,