summaryrefslogtreecommitdiff
path: root/include/filter
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/filter
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/filter')
-rw-r--r--include/filter/msfilter/escherex.hxx28
-rw-r--r--include/filter/msfilter/msdffimp.hxx50
-rw-r--r--include/filter/msfilter/svdfppt.hxx6
3 files changed, 42 insertions, 42 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 5a2f1d3bd676..63f2a346f306 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -577,7 +577,7 @@ public:
sal_uInt32 GetBlibID(
SvStream& rPicOutStream,
const OString& rGraphicId,
- const Rectangle& rBoundRect,
+ const tools::Rectangle& rBoundRect,
const css::awt::Rectangle* pVisArea = nullptr,
const GraphicAttr* pGrafikAttr = nullptr,
const bool ooxmlExport = false
@@ -648,7 +648,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
{
EscherGraphicProvider* pGraphicProvider;
SvStream* pPicOutStrm;
- Rectangle* pShapeBoundRect;
+ tools::Rectangle* pShapeBoundRect;
sal_uInt32 nSortCount;
sal_uInt32 nSortBufSize;
@@ -670,7 +670,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
SAL_DLLPRIVATE explicit EscherPropertyContainer(
EscherGraphicProvider * pGraphProv, SvStream * pPiOutStrm,
- Rectangle * pBoundRect);
+ tools::Rectangle * pBoundRect);
public:
@@ -678,7 +678,7 @@ public:
EscherPropertyContainer(
EscherGraphicProvider& rGraphicProvider, // the PropertyContainer needs to know
SvStream* pPicOutStrm, // the GraphicProvider to be able to write
- Rectangle& rShapeBoundRect // FillBitmaps or GraphicObjects.
+ tools::Rectangle& rShapeBoundRect // FillBitmaps or GraphicObjects.
); // under some circumstances the ShapeBoundRect
// is adjusted this will happen when rotated
// GraphicObjects are saved to PowerPoint
@@ -883,7 +883,7 @@ public:
/// using rEx.AddAtom(...) followed by
/// record data written to rEx.GetStream()
virtual void WriteData( EscherEx& rEx,
- const Rectangle& rRect ) = 0;
+ const tools::Rectangle& rRect ) = 0;
};
class InteractionInfo
@@ -930,7 +930,7 @@ public:
EscherExClientRecord_Base* GetClientTextbox() const
{ return pClientTextbox; }
- void WriteClientAnchor( EscherEx& rEx, const Rectangle& rRect )
+ void WriteClientAnchor( EscherEx& rEx, const tools::Rectangle& rRect )
{ if( pClientAnchor ) pClientAnchor->WriteData( rEx, rRect ); }
void WriteClientData( EscherEx& rEx )
{ if( pClientData ) pClientData->WriteData( rEx ); }
@@ -1115,20 +1115,20 @@ public:
void BeginAtom();
void EndAtom( sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 );
void AddAtom( sal_uInt32 nAtomSitze, sal_uInt16 nRecType, int nRecVersion = 0, int nRecInstance = 0 );
- void AddChildAnchor( const Rectangle& rRectangle );
- void AddClientAnchor( const Rectangle& rRectangle );
+ void AddChildAnchor( const tools::Rectangle& rRectangle );
+ void AddClientAnchor( const tools::Rectangle& rRectangle );
- virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect );
- sal_uInt32 EnterGroup( const Rectangle* pBoundRect = nullptr );
+ virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const tools::Rectangle* pBoundRect );
+ sal_uInt32 EnterGroup( const tools::Rectangle* pBoundRect = nullptr );
sal_uInt32 GetGroupLevel() const { return mnGroupLevel; };
- void SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rRect );
- void SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& rRect );
+ void SetGroupSnapRect( sal_uInt32 nGroupLevel, const tools::Rectangle& rRect );
+ void SetGroupLogicRect( sal_uInt32 nGroupLevel, const tools::Rectangle& rRect );
virtual void LeaveGroup();
// a ESCHER_Sp is being written ( a ESCHER_DgContainer has to be opened for this purpose!)
virtual void AddShape( sal_uInt32 nShpInstance, sal_uInt32 nFlagIds, sal_uInt32 nShapeID = 0 );
- virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect);
+ virtual void Commit( EscherPropertyContainer& rProps, const tools::Rectangle& rRect);
static sal_uInt32 GetColor( const sal_uInt32 nColor );
static sal_uInt32 GetColor( const Color& rColor, bool bSwap );
@@ -1155,7 +1155,7 @@ public:
/// shape is ignored.
virtual EscherExHostAppData* StartShape(
const css::uno::Reference< css::drawing::XShape >& rShape,
- const Rectangle* pChildAnchor );
+ const tools::Rectangle* pChildAnchor );
/// Called after a shape is written to inform the application
/// of the resulted shape type and ID.
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 9b810357450e..5016902e5994 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -271,10 +271,10 @@ typedef std::set<std::unique_ptr<SvxMSDffImportRec>,
struct SvxMSDffImportData
{
MSDffImportRecords m_Records; ///< Shape pointer, Shape ids and private data
- Rectangle aParentRect;///< Rectangle of the surrounding groups,
+ tools::Rectangle aParentRect;///< Rectangle of the surrounding groups,
///< which might have been provided externally
- explicit SvxMSDffImportData( const Rectangle& rParentRect ) : aParentRect( rParentRect ) {}
+ explicit SvxMSDffImportData( const tools::Rectangle& rParentRect ) : aParentRect( rParentRect ) {}
bool empty() const { return m_Records.empty(); }
size_t size() const { return m_Records.size(); }
MSDffImportRecords::const_iterator begin() const { return m_Records.begin(); }
@@ -285,8 +285,8 @@ struct DffObjData
{
const DffRecordHeader& rSpHd;
- Rectangle aBoundRect;
- Rectangle aChildAnchor;
+ tools::Rectangle aBoundRect;
+ tools::Rectangle aChildAnchor;
sal_uInt32 nShapeId;
sal_uInt32 nSpFlags;
@@ -303,7 +303,7 @@ struct DffObjData
int nCalledByGroup;
DffObjData( const DffRecordHeader& rObjHd,
- const Rectangle& rBoundRect,
+ const tools::Rectangle& rBoundRect,
int nClByGroup ) :
rSpHd( rObjHd ),
aBoundRect( rBoundRect ),
@@ -474,15 +474,15 @@ protected:
// inside groups. Instead a graphic object is created.
virtual SdrObject* ImportOLE( sal_uInt32 nOLEId,
const Graphic& rGraf,
- const Rectangle& rBoundRect,
- const Rectangle& rVisArea,
+ const tools::Rectangle& rBoundRect,
+ const tools::Rectangle& rVisArea,
const int _nCalledByGroup,
sal_Int64 nAspect ) const;
static css::uno::Reference < css::embed::XEmbeddedObject > CheckForConvertToSOObj(
sal_uInt32 nConvertFlags, SotStorage& rSrcStg,
const css::uno::Reference < css::embed::XStorage >& xDestStg,
const Graphic& rGrf,
- const Rectangle& rVisArea,
+ const tools::Rectangle& rVisArea,
OUString const& rBaseURL);
// the following methods need to be overridden for Excel imports
@@ -500,7 +500,7 @@ protected:
virtual SdrObject* ProcessObj( SvStream& rSt,
DffObjData& rData,
void* pData,
- Rectangle& rTextRect,
+ tools::Rectangle& rTextRect,
SdrObject* pObj);
/** Object finalization, used by the Excel filter to correctly
@@ -634,7 +634,7 @@ public:
@return true if successful, false otherwise
*/
- bool GetBLIP( sal_uLong nIdx, Graphic& rData, Rectangle* pVisArea = nullptr );
+ bool GetBLIP( sal_uLong nIdx, Graphic& rData, tools::Rectangle* pVisArea = nullptr );
// TODO: provide proper documentation here
/** read a BLIP out of a already positioned stream
@@ -646,40 +646,40 @@ public:
@return true if successful, false otherwise
*/
- static bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = nullptr );
+ static bool GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, tools::Rectangle* pVisArea = nullptr );
bool GetShape(sal_uLong nId, SdrObject*& rpData, SvxMSDffImportData& rData);
SdrObject* ImportObj( SvStream& rSt,
void* pData,
- Rectangle& rClientRect,
- const Rectangle& rGlobalChildRect,
+ tools::Rectangle& rClientRect,
+ const tools::Rectangle& rGlobalChildRect,
int nCalledByGroup = 0,
sal_Int32* pShapeId = nullptr);
SdrObject* ImportGroup( const DffRecordHeader& rHd,
SvStream& rSt,
void* pData,
- Rectangle& rClientRect,
- const Rectangle& rGlobalChildRect,
+ tools::Rectangle& rClientRect,
+ const tools::Rectangle& rGlobalChildRect,
int nCalledByGroup,
sal_Int32* pShapeId = nullptr );
SdrObject* ImportShape( const DffRecordHeader& rHd,
SvStream& rSt,
void* pData,
- Rectangle& rClientRect,
- const Rectangle& rGlobalChildRect,
+ tools::Rectangle& rClientRect,
+ const tools::Rectangle& rGlobalChildRect,
int nCalledByGroup,
sal_Int32* pShapeId = nullptr);
- Rectangle GetGlobalChildAnchor( const DffRecordHeader& rHd,
+ tools::Rectangle GetGlobalChildAnchor( const DffRecordHeader& rHd,
SvStream& rSt,
- Rectangle& aClientRect );
+ tools::Rectangle& aClientRect );
void GetGroupAnchors( const DffRecordHeader& rHd,
SvStream& rSt,
- Rectangle& rGroupClientAnchor,
- Rectangle& rGroupChildAnchor,
- const Rectangle& rClientRect,
- const Rectangle& rGlobalChildRect );
+ tools::Rectangle& rGroupClientAnchor,
+ tools::Rectangle& rGroupChildAnchor,
+ const tools::Rectangle& rClientRect,
+ const tools::Rectangle& rGlobalChildRect );
const SvxMSDffShapeInfos_ById* GetShapeInfos() const
{ return m_xShapeInfosById.get(); }
@@ -703,8 +703,8 @@ public:
tools::SvRef<SotStorage>& rSrcStorage,
const css::uno::Reference < css::embed::XStorage >& xDestStg,
const Graphic& rGraf,
- const Rectangle& rBoundRect,
- const Rectangle& rVisArea,
+ const tools::Rectangle& rBoundRect,
+ const tools::Rectangle& rVisArea,
SvStream* pDataStrrm,
ErrCode& rError,
sal_uInt32 nConvertFlags,
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index f0a78072b3d8..65aa8a9884d3 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -461,7 +461,7 @@ public:
PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const;
void RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph );
virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPageCapsule pPage ) const;
- virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override;
+ virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, tools::Rectangle& rTextRect, SdrObject* pObj ) override;
virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj ) override;
void ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry );
};
@@ -576,8 +576,8 @@ protected:
virtual SdrObject* ImportOLE(
sal_uInt32 nOLEId,
const Graphic& rGraf,
- const Rectangle& rBoundRect,
- const Rectangle& rVisArea,
+ const tools::Rectangle& rBoundRect,
+ const tools::Rectangle& rVisArea,
const int _nCalledByGroup,
sal_Int64 nAspect
) const override;