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/source/controls | |
parent | Use standard '=' comparison operator for test(1). (diff) | |
download | core-53f428d9bf8f9648e21bf89cfbb406747536ed09.tar.gz core-53f428d9bf8f9648e21bf89cfbb406747536ed09.zip |
merge vosremoval-diagnoses patch
Diffstat (limited to 'UnoControls/source/controls')
-rw-r--r-- | UnoControls/source/controls/framecontrol.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 ) ; } } |