diff options
Diffstat (limited to 'svx/source/svdraw/svdfmtf.hxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/svdraw/svdfmtf.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index 5bfea33ad849..a38a482c9c12 100644..100755 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -58,11 +58,11 @@ public: {} void Clear() { aList.Clear(); } - ULONG GetObjCount() const { return aList.Count(); } - SdrObject* GetObj(ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); } - SdrObject* operator[](ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); } - void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); } - void RemoveObject(ULONG nPos) { aList.Remove(nPos); } + sal_uLong GetObjCount() const { return aList.Count(); } + SdrObject* GetObj(sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); } + SdrObject* operator[](sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); } + void InsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); } + void RemoveObject(sal_uLong nPos) { aList.Remove(nPos); } }; //************************************************************ @@ -75,7 +75,7 @@ protected: SdrObjRefList aTmpList; VirtualDevice aVD; Rectangle aScaleRect; - ULONG nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet + sal_uLong nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet SfxItemSet* pLineAttr; SfxItemSet* pFillAttr; SfxItemSet* pTextAttr; @@ -131,12 +131,12 @@ protected: void DoAction(MetaFillColorAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaTextColorAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaTextFillColorAction & rAct) { rAct.Execute(&aVD); } - void DoAction(MetaFontAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } - void DoAction(MetaTextAlignAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } + void DoAction(MetaFontAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } + void DoAction(MetaTextAlignAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } void DoAction(MetaClipRegionAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaRasterOpAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaPushAction & rAct) { rAct.Execute(&aVD); } - void DoAction(MetaPopAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } + void DoAction(MetaPopAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } void DoAction(MetaMoveClipRegionAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaISectRectClipRegionAction& rAct) { rAct.Execute(&aVD); } void DoAction(MetaISectRegionClipRegionAction& rAct) { rAct.Execute(&aVD); } @@ -154,7 +154,7 @@ protected: public: ImpSdrGDIMetaFileImport(SdrModel& rModel); ~ImpSdrGDIMetaFileImport(); - ULONG DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, ULONG nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL); + sal_uLong DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, sal_uLong nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL); void SetLayer(SdrLayerID nLay) { nLayer=nLay; } SdrLayerID GetLayer() const { return nLayer; } void SetScaleRect(const Rectangle& rRect) { aScaleRect=rRect; } |