INTEGRATION: CWS supdremove (1.2.1082); FILE MERGED

2007/11/16 10:23:10 vg 1.2.1082.1: #i83674# cleanup: remove obsolete SUPD macro use

1 files changed, 2 insertions, 20 deletions

diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index e3c9b4ab56aa..64b8ebe7aff7 100644
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sjctrl.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 18:37:57 $
+ *  last change: $Author: obo $ $Date: 2008-01-07 08:35:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -93,11 +93,9 @@ class ImpSjJScriptButtonObject : public SjJScriptButtonObject, ImpSjJScriptContr
 
     // Events (C++ --> Java)
     //----------------------
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnClick_Fct() const;
     virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnClick() const;
     virtual void        setOnClick( const String & aSourceStrg );
             void        onClick();
@@ -162,11 +160,9 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC
 
     // Events (C++ --> Java)
     //----------------------
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnClick_Fct() const;
     virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnClick() const;
     virtual void        setOnClick( const String & aSourceStrg );
             void        onClick();
@@ -218,11 +214,9 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl
     virtual void        click();
 
     // Events (C++ --> Java)
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnClick_Fct() const;
     virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnClick() const;
     virtual void        setOnClick( const String & aSourceStrg );
             void        onClick();
@@ -258,7 +252,6 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
 
     // Events (C++ --> Java)
     //----------------------
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
     virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
@@ -266,7 +259,6 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
     virtual void setOnChange_Fct( SjJScriptFunctionObject* pFunctionObject );
     virtual SjJScriptFunctionObject* getOnFocus_Fct() const;
     virtual void setOnFocus_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnBlur() const;
     virtual void        setOnBlur( const String & aSourceStrg );
             void        onBlur();
@@ -395,7 +387,6 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa
 
     // Events (C++ --> Java)
     //----------------------
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
     virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
@@ -405,7 +396,6 @@ class ImpSjJScriptTextObject : public SjJScriptTextObject, ImpSjJScriptControlBa
     virtual void setOnFocus_Fct( SjJScriptFunctionObject* pFunctionObject );
     virtual SjJScriptFunctionObject* getOnSelect_Fct() const;
     virtual void setOnSelect_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnBlur() const;
     virtual void        setOnBlur( const String & aSourceStrg );
             void        onBlur();
@@ -448,7 +438,6 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC
 
     // Events (C++ --> Java)
     //----------------------
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnBlur_Fct() const;
     virtual void setOnBlur_Fct( SjJScriptFunctionObject* pFunctionObject );
@@ -458,7 +447,6 @@ class ImpSjJScriptTextareaObject : public SjJScriptTextareaObject, ImpSjJScriptC
     virtual void setOnFocus_Fct( SjJScriptFunctionObject* pFunctionObject );
     virtual SjJScriptFunctionObject* getOnSelect_Fct() const;
     virtual void setOnSelect_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnBlur() const;
     virtual void        setOnBlur( const String & aSourceStrg );
             void        onBlur();
@@ -496,11 +484,9 @@ class ImpSjJScriptSubmitObject : public SjJScriptSubmitObject, ImpSjJScriptContr
 
     // Events (C++ --> Java)
     //----------------------
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnClick_Fct() const;
     virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnClick() const;
     virtual void        setOnClick( const String & aSourceStrg );
             void        onClick();
@@ -529,11 +515,9 @@ class ImpSjJScriptResetObject : public SjJScriptResetObject, ImpSjJScriptControl
 
     // Events (C++ --> Java)
     //----------------------
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnClick_Fct() const;
     virtual void setOnClick_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnClick() const;
     virtual void        setOnClick( const String & aSourceStrg );
             void        onClick();
@@ -635,13 +619,11 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
 
     // Events (C++ --> Java)
     //----------------------
-#if SUPD > 356 || defined(AB_EVENT_TEST)
     // Neue Event-Schnittstelle mit Function-Objekten
     virtual SjJScriptFunctionObject* getOnSubmit_Fct() const;
     virtual void setOnSubmit_Fct( SjJScriptFunctionObject* pFunctionObject );
     virtual SjJScriptFunctionObject* getOnReset_Fct() const;
     virtual void setOnReset_Fct( SjJScriptFunctionObject* pFunctionObject );
-#endif
     virtual String      getOnSubmit() const;
     virtual void        setOnSubmit( const String & aSourceStrg );
             void        onSubmit();