diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 19:46:49 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 19:47:59 -0500 |
commit | 5584c277cb3d7a198b9bd554e5a4dc92b8bea87d (patch) | |
tree | 09786dafdcc103a9aadc2ca4eee83cfec15833a2 /comphelper/source/xml | |
parent | 0ecc627bc01f8ba286f2a4857f0d093df90fe85e (diff) |
merge vosremoval-diagnoses patch
Diffstat (limited to 'comphelper/source/xml')
-rw-r--r-- | comphelper/source/xml/attributelist.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index bcf32b85011f..0ef75094f4ef 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_comphelper.hxx" #include <comphelper/attributelist.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <vector> @@ -135,7 +135,7 @@ void AttributeList::Clear() { m_pImpl->vecAttribute.clear(); - VOS_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!"); + OSL_ENSURE( ! getLength(), "Length > 0 after AttributeList::Clear!"); } void AttributeList::RemoveAttribute( const OUString sName ) @@ -159,7 +159,7 @@ void AttributeList::SetAttributeList( const uno::Reference< ::com::sun::star::xm void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &r ) { - VOS_ENSURE( r.is(), "r isn't!" ); + OSL_ENSURE( r.is(), "r isn't!" ); sal_Int32 nMax = r->getLength(); sal_Int32 nTotalSize = m_pImpl->vecAttribute.size() + nMax; @@ -172,7 +172,7 @@ void AttributeList::AppendAttributeList( const uno::Reference< ::com::sun::star: r->getValueByIndex( i ))); } - VOS_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()"); + OSL_ENSURE( nTotalSize == getLength(), "nTotalSize != getLength()"); } } // namespace comphelper |