summaryrefslogtreecommitdiff
path: root/svx/inc/svx/svdlayer.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/inc/svx/svdlayer.hxx')
-rw-r--r--svx/inc/svx/svdlayer.hxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index 492df9a12212..b38ada9733d7 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -44,7 +44,7 @@ protected:
String maTitle;
String maDescription;
SdrModel* pModel; // zum Broadcasten
- UINT16 nType; // 0=Userdefined,1=Standardlayer
+ sal_uInt16 nType; // 0=Userdefined,1=Standardlayer
SdrLayerID nID;
protected:
SdrLayer(SdrLayerID nNewID, const String& rNewName) { nID=nNewID; aName=rNewName; nType=0; pModel=NULL; }
@@ -69,7 +69,7 @@ public:
// Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll.
// Es wird dann laenderspeziefisch der passende Name gesetzt. SetName()
// setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined".
- void SetStandardLayer(FASTBOOL bStd=TRUE);
+ void SetStandardLayer(FASTBOOL bStd=sal_True);
FASTBOOL IsStandardLayer() const { return nType==1; }
};
@@ -105,30 +105,30 @@ public:
void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; }
void SetModel(SdrModel* pNewModel);
SdrModel* GetModel() const { return pModel; }
- void InsertLayer(SdrLayer* pLayer, USHORT nPos=0xFFFF) { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); }
- SdrLayer* RemoveLayer(USHORT nPos);
+ void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos=0xFFFF) { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); }
+ SdrLayer* RemoveLayer(sal_uInt16 nPos);
// Alle Layer loeschen
void ClearLayer();
// Neuer Layer wird angelegt und eingefuegt
- SdrLayer* NewLayer(const String& rName, USHORT nPos=0xFFFF);
+ SdrLayer* NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
void DeleteLayer(SdrLayer* pLayer) { aLayer.Remove(pLayer); delete pLayer; Broadcast(); }
- void MoveLayer(SdrLayer* pLayer, USHORT nNewPos=0xFFFF);
- SdrLayer* MoveLayer(USHORT nPos, USHORT nNewPos);
+ void MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos=0xFFFF);
+ SdrLayer* MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos);
// Neuer Layer, Name wird aus der Resource geholt
- SdrLayer* NewStandardLayer(USHORT nPos=0xFFFF);
+ SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF);
// Iterieren ueber alle Layer
- USHORT GetLayerCount() const { return USHORT(aLayer.Count()); }
- SdrLayer* GetLayer(USHORT i) { return (SdrLayer*)(aLayer.GetObject(i)); }
- const SdrLayer* GetLayer(USHORT i) const { return (SdrLayer*)(aLayer.GetObject(i)); }
+ sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.Count()); }
+ SdrLayer* GetLayer(sal_uInt16 i) { return (SdrLayer*)(aLayer.GetObject(i)); }
+ const SdrLayer* GetLayer(sal_uInt16 i) const { return (SdrLayer*)(aLayer.GetObject(i)); }
- USHORT GetLayerPos(SdrLayer* pLayer) const;
+ sal_uInt16 GetLayerPos(SdrLayer* pLayer) const;
SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); }
const SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) const;
SdrLayerID GetLayerID(const String& rName, FASTBOOL bInherited) const;
- SdrLayer* GetLayerPerID(USHORT nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
- const SdrLayer* GetLayerPerID(USHORT nID) const;
+ SdrLayer* GetLayerPerID(sal_uInt16 nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
+ const SdrLayer* GetLayerPerID(sal_uInt16 nID) const;
void SetControlLayerName(const String& rNewName) { aControlLayerName=rNewName; }
const String& GetControlLayerName() const { return aControlLayerName; }