summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-11-10 19:20:12 -0500
committerCaolán McNamara <caolanm@redhat.com>2015-11-12 10:47:26 +0000
commitd7801c39826f2f24f7340e1b25809d3bb65d6099 (patch)
tree6acf82af5954e72930272fd62ac37c07664cf937 /drawinglayer
parentb34eab5996c52269360d166815ef15a250627c48 (diff)
Namespace cleanup and disambiguation
Change-Id: Ib6d2f8b4e71436c3a7c26bdfc9847152ebaf0739 Reviewed-on: https://gerrit.libreoffice.org/19900 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx18
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.cxx2
2 files changed, 10 insertions, 10 deletions
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 0f4545aba8f4..86591ac593c8 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -216,7 +216,7 @@ namespace
@return converted tools PolyPolygon, w/o one-point fills
*/
- tools::PolyPolygon getFillPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
+ ::tools::PolyPolygon getFillPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly )
{
// filter input rPoly
basegfx::B2DPolyPolygon aPoly;
@@ -227,7 +227,7 @@ namespace
if( !aCandidate.isClosed() || aCandidate.count() > 1 )
aPoly.append(aCandidate);
}
- return tools::PolyPolygon(aPoly);
+ return ::tools::PolyPolygon(aPoly);
}
} // end of anonymous namespace
@@ -519,9 +519,9 @@ namespace drawinglayer
aEndArrow.transform(maCurrentTransformation);
pRetval = new SvtGraphicStroke(
- tools::Polygon(aLocalPolygon),
- tools::PolyPolygon(aStartArrow),
- tools::PolyPolygon(aEndArrow),
+ ::tools::Polygon(aLocalPolygon),
+ ::tools::PolyPolygon(aStartArrow),
+ ::tools::PolyPolygon(aEndArrow),
mfCurrentUnifiedTransparence,
fLineWidth,
eCap,
@@ -1266,7 +1266,7 @@ namespace drawinglayer
if(aCandidate.count() > 1)
{
- const tools::Polygon aToolsPolygon(aCandidate);
+ const ::tools::Polygon aToolsPolygon(aCandidate);
mpMetaFile->AddAction(new MetaPolyLineAction(aToolsPolygon, aLineInfo));
}
@@ -1540,7 +1540,7 @@ namespace drawinglayer
// #i111954# do NOT use decomposition, but use direct VCL-command
// process(rCandidate.get2DDecomposition(getViewInformation2D()));
- const tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
+ const ::tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
const HatchStyle aHatchStyle(
attribute::HATCHSTYLE_SINGLE == rFillHatchAttribute.getStyle() ? HATCH_SINGLE :
attribute::HATCHSTYLE_DOUBLE == rFillHatchAttribute.getStyle() ? HATCH_DOUBLE :
@@ -1615,7 +1615,7 @@ namespace drawinglayer
// necessary to again remove this subdivision since it decreases possible
// printing quality (not even resolution-dependent for now). THB will tell
// me when that task is fixed in the master
- const tools::PolyPolygon aToolsPolyPolygon(
+ const ::tools::PolyPolygon aToolsPolyPolygon(
getFillPolyPolygon(
basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon)));
@@ -1899,7 +1899,7 @@ namespace drawinglayer
}
mpOutputDevice->DrawTransparent(
- tools::PolyPolygon(aLocalPolyPolygon),
+ ::tools::PolyPolygon(aLocalPolyPolygon),
nTransPercentVcl);
if(bSupportSvtGraphicFill)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 29056685f620..8dcd74e77ac5 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -1146,7 +1146,7 @@ namespace drawinglayer
::Hatch aVCLHatch(eHatchStyle, Color(rFillHatchAttributes.getColor()), nDistance, nAngle10);
// draw hatch using VCL
- mpOutputDevice->DrawHatch(tools::PolyPolygon(tools::Polygon(aHatchPolygon)), aVCLHatch);
+ mpOutputDevice->DrawHatch(::tools::PolyPolygon(::tools::Polygon(aHatchPolygon)), aVCLHatch);
}
break;
}