merge vosremoval-diagnoses patch

1 files changed, 3 insertions, 17 deletions

diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 0c1ded49694e..f93eb8b67bc2 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -24,24 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//____________________________________________________________________________________________________________
-//  my own include
-//____________________________________________________________________________________________________________
 
 #include "multiplexer.hxx"
 
-//____________________________________________________________________________________________________________
-//  includes of other projects
-//____________________________________________________________________________________________________________
-#include <vos/diagnose.hxx>
-
-//____________________________________________________________________________________________________________
-//  includes of my own project
-//____________________________________________________________________________________________________________
-
-//____________________________________________________________________________________________________________
-//  namespaces
-//____________________________________________________________________________________________________________
+#include <osl/diagnose.h>
 
 using namespace ::cppu                  ;
 using namespace ::osl                   ;
@@ -538,7 +524,7 @@ void OMRCListenerMultiplexerHelper::impl_adviseToPeer(  const   Reference< XWind
     }
     else
     {
-        VOS_ENSHURE( sal_False, "unknown listener" );
+        OSL_ENSURE( sal_False, "unknown listener" );
     }
 }
 
@@ -570,7 +556,7 @@ void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer(  const   Reference< X
     }
     else
     {
-        VOS_ENSHURE( sal_False, "unknown listener" );
+        OSL_ENSURE( sal_False, "unknown listener" );
     }
 }