diff options
Diffstat (limited to 'sc/source/filter/inc/xiescher.hxx')
-rw-r--r-- | sc/source/filter/inc/xiescher.hxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index b564a8e26e71..d1a359e4c7b9 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -115,7 +115,7 @@ public: /** Returns the object anchor if existing, null otherwise. */ const XclObjAnchor* GetAnchor() const; /** Returns true, if the passed size is valid for this object. */ - bool IsValidSize( const Rectangle& rAnchorRect ) const; + bool IsValidSize( const tools::Rectangle& rAnchorRect ) const; /** Returns the range in the sheet covered by this object. */ ScRange GetUsedArea( SCTAB nScTab ) const; @@ -127,7 +127,7 @@ public: /** Returns the needed size on the progress bar (calls virtual DoGetProgressSize() function). */ std::size_t GetProgressSize() const; /** Creates and returns an SdrObject from the contained data. Caller takes ownership! */ - SdrObjectPtr CreateSdrObject( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect, bool bIsDff ) const; + SdrObjectPtr CreateSdrObject( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect, bool bIsDff ) const; /** Additional processing for the passed SdrObject before insertion into the drawing page (calls virtual DoPreProcessSdrObj() function). */ void PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; @@ -172,7 +172,7 @@ protected: /** Derived classes may return a progress bar size different from 1. */ virtual std::size_t DoGetProgressSize() const; /** Derived classes create and return a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const; /** Derived classes may perform additional processing for the passed SdrObject before insertion. */ virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; /** Derived classes may perform additional processing for the passed SdrObject after insertion. */ @@ -254,7 +254,7 @@ protected: /** Returns a progress bar size that takes all group children into account. */ virtual std::size_t DoGetProgressSize() const override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; protected: XclImpDrawObjVector maChildren; /// Grouped objects. @@ -275,7 +275,7 @@ protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; protected: XclObjLineData maLineData; /// BIFF5 line formatting. @@ -303,7 +303,7 @@ protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -319,7 +319,7 @@ public: protected: /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; }; /** An arc object. */ @@ -336,7 +336,7 @@ protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -359,7 +359,7 @@ protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; protected: typedef std::vector< Point > PointVector; @@ -396,7 +396,7 @@ protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; /** Inserts the contained text data at the passed object. */ virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; @@ -426,7 +426,7 @@ protected: /** Returns the needed size on the progress bar. */ virtual std::size_t DoGetProgressSize() const override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; /** Converts the chart document. */ virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; @@ -472,7 +472,7 @@ public: /** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */ SdrObjectPtr CreateSdrObjectFromShape( const css::uno::Reference< css::drawing::XShape >& rxShape, - const Rectangle& rAnchorRect ) const; + const tools::Rectangle& rAnchorRect ) const; /** Sets additional properties to the form control model, calls virtual DoProcessControl(). */ void ProcessControl( const XclImpDrawObjBase& rDrawObj ) const; @@ -524,7 +524,7 @@ protected: void ConvertLabel( ScfPropertySet& rPropSet ) const; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; /** Additional processing on the SdrObject, calls new virtual function DoProcessControl(). */ virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; @@ -823,7 +823,7 @@ public: const Graphic& GetGraphic() const { return maGraphic; } /** Returns the visible area of the imported graphic. */ - const Rectangle& GetVisArea() const { return maVisArea; } + const tools::Rectangle& GetVisArea() const { return maVisArea; } /** Returns true, if the OLE object will be shown as symbol. */ bool IsSymbol() const { return mbSymbol; } @@ -847,7 +847,7 @@ protected: /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; /** Override to do additional processing on the SdrObject. */ virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; @@ -861,7 +861,7 @@ private: private: Graphic maGraphic; /// Picture or OLE placeholder graphic. - Rectangle maVisArea; /// Size of graphic. + tools::Rectangle maVisArea; /// Size of graphic. OUString maClassName; /// Class name of embedded OLE object. sal_uInt32 mnStorageId; /// Identifier of the storage for this object. std::size_t mnCtlsStrmPos; /// Position in 'Ctls' stream for this control. @@ -955,9 +955,9 @@ public: void FinalizeDrawing(); /** Creates the SdrObject for the passed Excel TBX form control object. */ - SdrObjectPtr CreateSdrObject( const XclImpTbxObjBase& rTbxObj, const Rectangle& rAnchorRect ); + SdrObjectPtr CreateSdrObject( const XclImpTbxObjBase& rTbxObj, const tools::Rectangle& rAnchorRect ); /** Creates the SdrObject for the passed Excel OLE object or OCX form control object. */ - SdrObjectPtr CreateSdrObject( const XclImpPictureObj& rPicObj, const Rectangle& rAnchorRect ); + SdrObjectPtr CreateSdrObject( const XclImpPictureObj& rPicObj, const tools::Rectangle& rAnchorRect ); /** Returns true, if the conversion of OLE objects is supported. */ bool SupportsOleObjects() const; @@ -978,7 +978,7 @@ private: SvStream& rDffStrm, DffObjData& rDffObjData, void* pClientData, - Rectangle& rTextRect, + tools::Rectangle& rTextRect, SdrObject* pOldSdrObj ) override; /** Finalize a DFF object, sets anchor after nested objs have been loaded. */ @@ -1082,7 +1082,7 @@ public: std::size_t GetProgressSize() const; /** Derived classes calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const = 0; + virtual tools::Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const = 0; /** Called whenever an object has been inserted into the draw page. */ virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) = 0; @@ -1138,7 +1138,7 @@ public: void ConvertObjects( XclImpDffConverter& rDffConv ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const override; + virtual tools::Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const override; /** On call, updates the used area of the sheet. */ virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) override; |