diff options
| author | ka <kai.ahrens@oracle.com> | 2011-02-17 21:55:54 +0100 |
|---|---|---|
| committer | ka <kai.ahrens@oracle.com> | 2011-02-17 21:55:54 +0100 |
| commit | f5aba9c0bac074d291ddbb7ce75e427c11ae7c39 (patch) | |
| tree | 7e00fbff348e512d99db5810897a013f9823ddfb /svx/inc/svx/svdograf.hxx | |
| parent | 591982d2f398724a74383338dd2268d05423130c (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
ka102: rebased to DEV300_m100
Diffstat (limited to 'svx/inc/svx/svdograf.hxx')
| -rw-r--r-- | svx/inc/svx/svdograf.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index fa095261c3b2..948115dff47e 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -140,7 +140,7 @@ public: void SetGraphic(const Graphic& rGrf); const Graphic& GetGraphic() const; - Graphic GetTransformedGraphic( ULONG nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const; + Graphic GetTransformedGraphic( sal_uIntPtr nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const; GraphicType GetGraphicType() const; @@ -163,7 +163,7 @@ public: void SetGraphicLink(const String& rFileName, const String& rFilterName); void ReleaseGraphicLink(); - sal_Bool IsLinkedGraphic() const { return (BOOL)aFileName.Len(); } + sal_Bool IsLinkedGraphic() const { return (sal_Bool)aFileName.Len(); } void SetFileName(const String& rFileName); const String& GetFileName() const { return aFileName; } @@ -174,7 +174,7 @@ public: void StopAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -203,7 +203,7 @@ public: virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); |