diff options
| author | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2010-02-11 17:35:16 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2010-02-11 17:35:16 +0100 |
| commit | c44386b26b233abc19936a99efb3ac7781bdaefc (patch) | |
| tree | 7761d694ac9b50ac7e91d8df64dc59fa54a231c8 /sd/source/ui/inc | |
| parent | 320a65cdff355760da860f5f55689056d39089d6 (diff) | |
aw079 #i99386# cleanup of define and last change from CL
Diffstat (limited to 'sd/source/ui/inc')
| -rw-r--r-- | sd/source/ui/inc/drawview.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/undoback.hxx | 15 |
2 files changed, 0 insertions, 19 deletions
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index fa3d3a13b1e2..37a2608d7390 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -77,10 +77,6 @@ public: void PresPaint(const Region& rRegion); -#ifndef NEWPBG - virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const; -#endif - virtual void DeleteMarked(); // from SdrView protected: virtual void ModelHasChanged(); diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index aac9640a4c46..f99c55adf25d 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -31,18 +31,11 @@ #ifndef _SD_UNDOBACK_HXX #define _SD_UNDOBACK_HXX -#define NEWPBG - #include "sdundo.hxx" class SdDrawDocument; class SdPage; - -#ifdef NEWPBG class SfxItemSet; -#else -class SdrObject; -#endif // ----------------------------- // - SdBackgroundObjUndoAction - @@ -53,11 +46,7 @@ class SdBackgroundObjUndoAction : public SdUndoAction private: SdPage& mrPage; -#ifdef NEWPBG SfxItemSet* mpItemSet; -#else - SdrObject* mpBackgroundObj; -#endif void ImplRestoreBackgroundObj(); @@ -65,14 +54,10 @@ public: TYPEINFO(); -#ifdef NEWPBG SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SfxItemSet& rItenSet); -#else - SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SdrObject* pBackgroundObj ); -#endif virtual ~SdBackgroundObjUndoAction(); virtual void Undo(); |