summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /include/oox
parent17d821af6bb9df93569836a92f6bed975587fc6c (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 'include/oox')
-rw-r--r--include/oox/export/drawingml.hxx4
-rw-r--r--include/oox/export/vmlexport.hxx10
2 files changed, 7 insertions, 7 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 97d8dff58de6..94ccc6aac24d 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -75,7 +75,7 @@ namespace uno {
struct EscherConnectorListEntry;
class OutlinerParaObject;
-class Rectangle;
+namespace tools { class Rectangle; }
namespace tools {
class PolyPolygon;
@@ -190,7 +190,7 @@ public:
void WriteShapeTransformation( const css::uno::Reference< css::drawing::XShape >& rXShape,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false );
- void WriteTransformation( const Rectangle& rRectangle,
+ void WriteTransformation( const tools::Rectangle& rRectangle,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 );
void WriteText( const css::uno::Reference< css::uno::XInterface >& rXIface, const OUString& presetWarp, bool bBodyPr = true, bool bText = true, sal_Int32 nXmlNamespace = 0);
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 37dc577c10c1..222be73aa7bc 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -48,7 +48,7 @@ namespace sax_fastparser {
}
class Point;
-class Rectangle;
+namespace tools { class Rectangle; }
class SdrObject;
namespace oox {
@@ -140,14 +140,14 @@ protected:
///
/// The parameter is just what we got from StartShape().
virtual void EndShape( sal_Int32 nShapeElement );
- virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) override;
+ virtual void Commit( EscherPropertyContainer& rProps, const tools::Rectangle& rRect ) override;
private:
virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ) override;
virtual void CloseContainer() override;
- virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect ) override;
+ virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const tools::Rectangle* pBoundRect ) override;
virtual void LeaveGroup() override;
virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ) override;
@@ -160,10 +160,10 @@ private:
void AddFlipXY( );
/// Add starting and ending point of a line to the m_pShapeAttrList.
- void AddLineDimensions( const Rectangle& rRectangle );
+ void AddLineDimensions( const tools::Rectangle& rRectangle );
/// Add position and size to the OStringBuffer.
- void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle, bool rbAbsolutePos = true );
+ void AddRectangleDimensions( OStringBuffer& rBuffer, const tools::Rectangle& rRectangle, bool rbAbsolutePos = true );
};
} // namespace vml