diff options
Diffstat (limited to 'svx/inc/svx/svdundo.hxx')
| -rwxr-xr-x[-rw-r--r--] | svx/inc/svx/svdundo.hxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index a2f1871ff049..07d1c3621123 100644..100755 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -73,7 +73,7 @@ protected: public: TYPEINFO(); - virtual BOOL CanRepeat(SfxRepeatTarget& rView) const; + virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const; virtual void Repeat(SfxRepeatTarget& rView); virtual String GetRepeatComment(SfxRepeatTarget& rView) const; @@ -110,8 +110,8 @@ public: virtual ~SdrUndoGroup(); void Clear(); - ULONG GetActionCount() const { return aBuf.Count(); } - SdrUndoAction* GetAction(ULONG nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); } + sal_uIntPtr GetActionCount() const { return aBuf.Count(); } + SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); } void AddAction(SdrUndoAction* pAct); void push_front( SdrUndoAction* pAct ); @@ -146,7 +146,7 @@ protected: void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, bool bRepeat = false) const; - static void GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, bool bRepeat = false ); + static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -269,7 +269,7 @@ protected: SdrObjList* pObjList; SdrView* pView; // um bei ObjDel, Undo die SdrPageView* pPageView; // Selektion widerherstellen zu koennen - UINT32 nOrdNum; + sal_uInt32 nOrdNum; // Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes // statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE @@ -332,7 +332,7 @@ class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj { public: SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false) - : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(TRUE); } + : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); } virtual void Undo(); virtual void Redo(); @@ -381,7 +381,7 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj protected: SdrObjList* pObjList; - UINT32 nOrdNum; + sal_uInt32 nOrdNum; SdrObject* pNewObj; public: @@ -422,11 +422,11 @@ public: class SdrUndoObjOrdNum : public SdrUndoObj { protected: - UINT32 nOldOrdNum; - UINT32 nNewOrdNum; + sal_uInt32 nOldOrdNum; + sal_uInt32 nNewOrdNum; public: - SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1); + SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1); virtual void Undo(); virtual void Redo(); @@ -460,7 +460,7 @@ protected: OutlinerParaObject* pOldText; OutlinerParaObject* pNewText; bool bNewTextAvailable; - BOOL bEmptyPresObj; + sal_Bool bEmptyPresObj; sal_Int32 mnText; public: @@ -532,11 +532,11 @@ class SdrUndoLayer : public SdrUndoAction protected: SdrLayer* pLayer; SdrLayerAdmin* pLayerAdmin; - USHORT nNum; + sal_uInt16 nNum; bool bItsMine; protected: - SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); + SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); virtual ~SdrUndoLayer(); }; @@ -550,7 +550,7 @@ protected: class SdrUndoNewLayer : public SdrUndoLayer { public: - SdrUndoNewLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) + SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {} virtual void Undo(); @@ -569,8 +569,8 @@ public: class SdrUndoDelLayer : public SdrUndoLayer { public: - SdrUndoDelLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) - : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=TRUE; } + SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) + : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=sal_True; } virtual void Undo(); virtual void Redo(); @@ -587,10 +587,10 @@ public: class SdrUndoMoveLayer : public SdrUndoLayer { - USHORT nNeuPos; + sal_uInt16 nNeuPos; public: - SdrUndoMoveLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, USHORT nNeuPos1) + SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {} virtual void Undo(); @@ -624,14 +624,14 @@ protected: SdrPage& mrPage; protected: - void ImpInsertPage(USHORT nNum); - void ImpRemovePage(USHORT nNum); - void ImpMovePage(USHORT nOldNum, USHORT nNewNum); + void ImpInsertPage(sal_uInt16 nNum); + void ImpRemovePage(sal_uInt16 nNum); + void ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum); protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT n=0, bool bRepeat = false) const; + void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, sal_uInt16 n=0, bool bRepeat = false) const; }; //************************************************************ @@ -645,7 +645,7 @@ protected: class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage { protected: - USHORT nPageNum; + sal_uInt16 nPageNum; // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE @@ -734,11 +734,11 @@ public: class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage { protected: - USHORT nOldPageNum; - USHORT nNewPageNum; + sal_uInt16 nOldPageNum; + sal_uInt16 nNewPageNum; public: - SdrUndoSetPageNum(SdrPage& rNewPg, USHORT nOldPageNum1, USHORT nNewPageNum1) + SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) : SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {} virtual void Undo(); |