From a5a571307fb3306b74ab46b085cde6388270a770 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Mar 2017 20:27:55 +0200 Subject: 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 Tested-by: Jenkins --- sc/source/filter/inc/xeescher.hxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'sc/source/filter/inc/xeescher.hxx') diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index f3a98cfddd6b..24b87a75dc0d 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -54,11 +54,11 @@ public: /** Called from SVX DFF converter. @param rRect The object anchor rectangle to be exported (in twips). */ - virtual void WriteData( EscherEx& rEscherEx, const Rectangle& rRect ) override; + virtual void WriteData( EscherEx& rEscherEx, const tools::Rectangle& rRect ) override; private: virtual void ImplSetFlags( const SdrObject& rSdrObj ); - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ); + virtual void ImplCalcAnchorRect( const tools::Rectangle& rRect, MapUnit eMapUnit ); protected: // for access in derived classes XclObjAnchor maAnchor; /// The client anchor data. @@ -73,7 +73,7 @@ public: private: virtual void ImplSetFlags( const SdrObject& rSdrObj ) override; - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) override; + virtual void ImplCalcAnchorRect( const tools::Rectangle& rRect, MapUnit eMapUnit ) override; private: SCTAB mnScTab; /// Calc sheet index. @@ -88,7 +88,7 @@ public: private: virtual void ImplSetFlags( const SdrObject& rSdrObj ) override; - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) override; + virtual void ImplCalcAnchorRect( const tools::Rectangle& rRect, MapUnit eMapUnit ) override; private: Size maPageSize; @@ -100,7 +100,7 @@ private: class XclExpDffNoteAnchor : public XclExpDffAnchorBase { public: - explicit XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ); + explicit XclExpDffNoteAnchor( const XclExpRoot& rRoot, const tools::Rectangle& rRect ); }; /** Represents the position (anchor) of a cell dropdown object. */ @@ -227,7 +227,7 @@ public: explicit XclExpOcxControlObj( XclExpObjectManager& rObjMgr, css::uno::Reference< css::drawing::XShape > const & xShape, - const Rectangle* pChildAnchor, + const tools::Rectangle* pChildAnchor, const OUString& rClassName, sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ); @@ -249,7 +249,7 @@ public: explicit XclExpTbxControlObj( XclExpObjectManager& rObjMgr, css::uno::Reference< css::drawing::XShape > const & xShape, - const Rectangle* pChildAnchor ); + const tools::Rectangle* pChildAnchor ); /** Sets the name of a macro attached to this control. @return true = The passed event descriptor was valid, macro name has been found. */ @@ -292,7 +292,7 @@ public: explicit XclExpChartObj( XclExpObjectManager& rObjMgr, css::uno::Reference< css::drawing::XShape > const & xShape, - const Rectangle* pChildAnchor ); + const tools::Rectangle* pChildAnchor ); virtual ~XclExpChartObj() override; /** Writes the OBJ record and the entire chart substream. */ @@ -357,8 +357,8 @@ private: bool mbAutoFill; /// Auto Fill Style bool mbColHidden; /// Column containing the comment is hidden bool mbRowHidden; /// Row containing the comment is hidden - Rectangle maCommentFrom; /// From and From Offset - Rectangle maCommentTo; /// To and To Offsets + tools::Rectangle maCommentFrom; /// From and From Offset + tools::Rectangle maCommentTo; /// To and To Offsets }; class XclExpComments : public XclExpRecord -- cgit