diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 20:27:55 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 06:27:11 +0000 |
commit | a5a571307fb3306b74ab46b085cde6388270a770 (patch) | |
tree | 66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /oox/source/export | |
parent | 17d821af6bb9df93569836a92f6bed975587fc6c (diff) |
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using
make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle"
Except some modules have their own foo::tools namespace, so there have
to use ::tools::Rectangle. This commit just moves the class from the
global namespace, it does not update pre/postwin.h yet.
Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2
Reviewed-on: https://gerrit.libreoffice.org/35923
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'oox/source/export')
-rw-r--r-- | oox/source/export/drawingml.cxx | 6 | ||||
-rw-r--r-- | oox/source/export/shapes.cxx | 4 | ||||
-rw-r--r-- | oox/source/export/vmlexport.cxx | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 43b7c0369210..beb7e0ea6ee2 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1154,7 +1154,7 @@ void DrawingML::WriteStretch( const css::uno::Reference< css::beans::XPropertySe mpFS->endElementNS( XML_a, XML_stretch ); } -void DrawingML::WriteTransformation( const Rectangle& rRect, +void DrawingML::WriteTransformation( const tools::Rectangle& rRect, sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, sal_Int32 nRotation ) { mpFS->startElementNS( nXmlNamespace, XML_xfrm, @@ -1214,7 +1214,7 @@ void DrawingML::WriteShapeTransformation( const Reference< XShape >& rXShape, sa if (xPropertySetInfo->hasPropertyByName("RotateAngle")) xPropertySet->getPropertyValue("RotateAngle") >>= nRotation; } - WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) ); + WriteTransformation( tools::Rectangle( Point( aPos.X, aPos.Y ), Size( aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) ); } void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool bIsField, sal_Int32 nElement, bool bCheckDirect, @@ -2630,7 +2630,7 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ) mpFS->startElementNS( XML_a, XML_pathLst, FSEND ); - const Rectangle aRect( rPolyPolygon.GetBoundRect() ); + const tools::Rectangle aRect( rPolyPolygon.GetBoundRect() ); // Put all polygons of rPolyPolygon in the same path elemnt // to subtract the overlapped areas. diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 048e9247adec..82d899ff1078 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -437,7 +437,7 @@ ShapeExport& ShapeExport::WritePolyPolygonShape( const Reference< XShape >& xSha pFS->startElementNS( mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_sp : XML_wsp), FSEND ); tools::PolyPolygon aPolyPolygon = EscherPropertyContainer::GetPolyPolygon( xShape ); - Rectangle aRect( aPolyPolygon.GetBoundRect() ); + tools::Rectangle aRect( aPolyPolygon.GetBoundRect() ); #if OSL_DEBUG_LEVEL > 0 awt::Size size = MapSize( awt::Size( aRect.GetWidth(), aRect.GetHeight() ) ); @@ -1190,7 +1190,7 @@ ShapeExport& ShapeExport::WriteConnectorShape( const Reference< XShape >& xShape } EscherConnectorListEntry aConnectorEntry( xShape, aStartPoint, rXShapeA, aEndPoint, rXShapeB ); - Rectangle aRect( Point( aStartPoint.X, aStartPoint.Y ), Point( aEndPoint.X, aEndPoint.Y ) ); + tools::Rectangle aRect( Point( aStartPoint.X, aStartPoint.Y ), Point( aEndPoint.X, aEndPoint.Y ) ); if( aRect.getWidth() < 0 ) { bFlipH = true; aRect.setX( aEndPoint.X ); diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 274c99b660f5..b68fa6452c73 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -126,7 +126,7 @@ void VMLExport::CloseContainer() EscherEx::CloseContainer(); } -sal_uInt32 VMLExport::EnterGroup( const OUString& rShapeName, const Rectangle* pRect ) +sal_uInt32 VMLExport::EnterGroup( const OUString& rShapeName, const tools::Rectangle* pRect ) { sal_uInt32 nShapeId = GenerateShapeId(); @@ -355,7 +355,7 @@ void VMLExport::AddSdrObjectVMLObject( const SdrObject& rObj) { m_pSdrObject = &rObj; } -void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) +void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& rRect ) { if ( m_nShapeType == ESCHER_ShpInst_Nil ) return; @@ -891,7 +891,7 @@ void VMLExport::AddFlipXY( ) } } -void VMLExport::AddLineDimensions( const Rectangle& rRectangle ) +void VMLExport::AddLineDimensions( const tools::Rectangle& rRectangle ) { // style if (!m_ShapeStyle.isEmpty()) @@ -931,7 +931,7 @@ void VMLExport::AddLineDimensions( const Rectangle& rRectangle ) .makeStringAndClear() ); } -void VMLExport::AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle, bool rbAbsolutePos) +void VMLExport::AddRectangleDimensions( OStringBuffer& rBuffer, const tools::Rectangle& rRectangle, bool rbAbsolutePos) { if ( !rBuffer.isEmpty() ) rBuffer.append( ";" ); |