INTEGRATION: CWS dbgmacros1 (1.2.106); FILE MERGED

2003/04/09 10:47:32 kso 1.2.106.1: #108413# - debug macro unification.

desktop/source/app/oinstanceprovider.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: oinstanceprovider.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2001-11-01 17:00:16 $
+ *  last change: $Author: vg $ $Date: 2003-04-15 15:46:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -209,7 +209,7 @@ Reference< XInterface > SAL_CALL OInstanceProvider::getInstance( const OUString&
         But ... look for right testing! See using of this methods!
 -----------------------------------------------------------------------------------------------------------------*/
 
-#ifdef _DEBUG
+#if OSL_DEBUG_LEVEL > 0
 
 //*****************************************************************************************************************
 sal_Bool OInstanceProvider::impldbg_checkParameter_getInstance( const OUString& sInstanceName )
@@ -230,4 +230,4 @@ sal_Bool OInstanceProvider::impldbg_checkParameter_getInstance( const OUString&
     return bOK ;
 }
 
-#endif  //  #ifdef ENABLE_ASSERTIONS
+#endif  //  #ifdef OSL_DEBUG_LEVEL

desktop/source/app/oinstanceprovider.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: oinstanceprovider.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2001-11-01 17:00:16 $
+ *  last change: $Author: vg $ $Date: 2003-04-15 15:46:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -236,13 +236,13 @@ class OInstanceProvider :   public XINSTANCEPROVIDER            ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-    #ifdef _DEBUG
+    #if OSL_DEBUG_LEVEL > 0
 
     private:
 
         sal_Bool impldbg_checkParameter_getInstance( const OUSTRING& sInstanceName );
 
-    #endif  // #ifdef ENABLE_ASSERTIONS
+    #endif  // #ifdef OSL_DEBUG_LEVEL
 
     //-------------------------------------------------------------------------------------------------------------
     //  variables

desktop/source/app/opluginframefactory.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: opluginframefactory.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2001-11-01 17:00:16 $
+ *  last change: $Author: vg $ $Date: 2003-04-15 15:46:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -218,7 +218,7 @@ Reference< XInterface > SAL_CALL OPlugInFrameFactory::createInstanceWithArgument
         But ... look for right testing! See using of this methods!
 -----------------------------------------------------------------------------------------------------------------*/
 
-#ifdef _DEBUG
+#if OSL_DEBUG_LEVEL > 0
 
 //*****************************************************************************************************************
 sal_Bool OPlugInFrameFactory::impldbg_checkParameter_createInstanceWithArguments( const Sequence< Any >& seqArguments )
@@ -237,4 +237,4 @@ sal_Bool OPlugInFrameFactory::impldbg_checkParameter_createInstanceWithArguments
     return bOK ;
 }
 
-#endif  //  #ifdef ENABLE_ASSERTIONS
+#endif  //  #ifdef OSL_DEBUG_LEVEL