summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdfmtf.hxx
diff options
context:
space:
mode:
authorka <kai.ahrens@oracle.com>2011-02-17 21:55:54 +0100
committerka <kai.ahrens@oracle.com>2011-02-17 21:55:54 +0100
commitf5aba9c0bac074d291ddbb7ce75e427c11ae7c39 (patch)
tree7e00fbff348e512d99db5810897a013f9823ddfb /svx/source/svdraw/svdfmtf.hxx
parent591982d2f398724a74383338dd2268d05423130c (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
ka102: rebased to DEV300_m100
Diffstat (limited to 'svx/source/svdraw/svdfmtf.hxx')
-rw-r--r--svx/source/svdraw/svdfmtf.hxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 494e43dbadfc..463915d48096 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -57,11 +57,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); }
};
//************************************************************
@@ -74,7 +74,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;
@@ -130,12 +130,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); }
@@ -143,7 +143,7 @@ protected:
void DoAction(MetaRenderGraphicAction& rAct);
void ImportText( const Point& rPos, const XubString& rStr, const MetaAction& rAct );
- void SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr=FALSE);
+ void SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr=sal_False);
void InsertObj( SdrObject* pObj, sal_Bool bScale = sal_True );
void MapScaling();
@@ -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; }