INTEGRATION: CWS supdremove (1.2.174); FILE MERGED

2007/11/16 10:25:20 vg 1.2.174.1: #i83674# cleanup: remove obsolete SUPD macro use

sfx2/inc/sfx2/dispatch.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dispatch.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:18:08 $
+ *  last change: $Author: obo $ $Date: 2008-01-07 09:02:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -374,9 +374,5 @@ inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell )
 
 //--------------------------------------------------------------------
 
-#if SUPD<606
-#define SFX_DISPATCHER() SfxGetpApp()->GetDispatcher()
-#endif
-
 #endif
 

sfx2/inc/sfx2/msg.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: msg.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:24:37 $
+ *  last change: $Author: obo $ $Date: 2008-01-07 09:02:23 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -276,9 +276,7 @@ public:
     USHORT                      nArgDefCount;   // Anzahl der formalen Argumente
     long                        nDisableFlags;      // DisableFlags, die vorhanden sein
                                                 // m"ussen, damit der Slot enabled ist
-#if SUPD>380
     const char __FAR_DATA*      pUnoName;       // UnoName des Slots
-#endif
 
 public:
 
@@ -292,9 +290,7 @@ public:
     USHORT          GetWhich( const SfxItemPool &rPool ) const;
     USHORT          GetValue() const { return nValue; }
     const SfxType*  GetType() const { return pType; }
-#if SUPD>380
     const char*     GetUnoName() const { return pUnoName; }
-#endif
 
     USHORT          GetFormalArgumentCount() const { return nArgDefCount; }
     const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const

sfx2/inc/sfx2/prnmon.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: prnmon.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:27:15 $
+ *  last change: $Author: obo $ $Date: 2008-01-07 09:02:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -97,9 +97,7 @@ class SfxPrintOptionsDialog : public ModalDialog
 private:
     OKButton                aOkBtn;
     CancelButton            aCancelBtn;
-#if SUPD > 640
     HelpButton              aHelpBtn;
-#endif
     SfxPrintOptDlg_Impl*    pDlgImpl;
     SfxViewShell*           pViewSh;
     SfxItemSet*             pOptions;

sfx2/inc/sfx2/sfxdefs.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sfxdefs.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:28:35 $
+ *  last change: $Author: obo $ $Date: 2008-01-07 09:02:48 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,18 +40,8 @@
 #define MESSAGEFILE_EXT     "smd"   // Extension der Single-Mail/News-Files
 #define MESSAGETEMPFILE_EXT "sd~"   // Extension f"ur Mail/News-TempFiles
 
-#if SUPD > 363
 #define SfxFilterFlags ULONG
-#else
-#define SfxFilterFlags USHORT
-#endif
-
-#if SUPD > 374
 #define PRODUCT_VERSION     "5.0"
-#else
-#define PRODUCT_VERSION     "4.0"
-#endif
-
 
 #endif