diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 19:46:46 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 19:46:46 -0500 |
| commit | 53f428d9bf8f9648e21bf89cfbb406747536ed09 (patch) | |
| tree | ff94ef032b339ea4a9aa9c216a2980887f9d2137 /UnoControls | |
| parent | b8c819c04af6e12001dcc069a854cc6221f7e1a0 (diff) | |
merge vosremoval-diagnoses patch
Diffstat (limited to 'UnoControls')
| -rw-r--r-- | UnoControls/source/base/multiplexer.cxx | 20 | ||||
| -rw-r--r-- | UnoControls/source/controls/framecontrol.cxx | 6 |
2 files changed, 6 insertions, 20 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" ); } } diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index 2ae0e27dc56c..1c0c83848453 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/typeprovider.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> //______________________________________________________________________________________________________________ // include of my own project @@ -376,7 +376,7 @@ void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHan case PROPERTYHANDLE_LOADERARGUMENTS : rValue >>= m_seqLoaderArguments ; break ; - default : VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ; + default : OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ; } } @@ -400,7 +400,7 @@ void FrameControl::getFastPropertyValue( Any& rRet , case PROPERTYHANDLE_FRAME : rRet <<= m_xFrame ; break ; - default : VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ; + default : OSL_ENSURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ; } } |