diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 19:46:48 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 19:46:48 -0500 |
| commit | 88e1f3d8f884c326aaf92ad0e18e96ece244b8da (patch) | |
| tree | 9d6250ad30fc3d9f9ad6280398ca093de7b0b170 /basic | |
| parent | 2811da61adac63e4da78a1d2c5e1f90090e98798 (diff) | |
merge vosremoval-diagnoses patch
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/inc/pch/precompiled_basic.hxx | 2 | ||||
| -rw-r--r-- | basic/source/uno/namecont.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index e8f9e004ca6a..7769a1fb2f5c 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -275,7 +275,7 @@ #include "vcl/wintypes.hxx" #include "vcl/wrkwin.hxx" -#include "vos/diagnose.hxx" +#include "osl/diagnose.h" #include "vos/macros.hxx" #include "vos/mutex.hxx" #include "vos/process.hxx" diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 2e9474c3b94d..511aef367861 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -38,7 +38,7 @@ #include <tools/errinf.hxx> #endif #include <osl/mutex.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <rtl/uri.hxx> #include <rtl/strbuf.hxx> #include <comphelper/processfactory.hxx> @@ -3179,7 +3179,7 @@ rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDia break; } case END_REACHED: - VOS_ENSURE( false, "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" ); + OSL_ENSURE( false, "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" ); break; } } @@ -3374,7 +3374,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript { const Reference< deployment::XPackage >* pUserPackages = m_aUserPackagesSeq.getConstArray(); Reference< deployment::XPackage > xPackage = pUserPackages[ m_iUserPackage ]; - VOS_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextUserScriptPackage(): Invalid package" ); + OSL_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextUserScriptPackage(): Invalid package" ); m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage ); } @@ -3427,7 +3427,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri { const Reference< deployment::XPackage >* pSharedPackages = m_aSharedPackagesSeq.getConstArray(); Reference< deployment::XPackage > xPackage = pSharedPackages[ m_iSharedPackage ]; - VOS_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextSharedScriptPackage(): Invalid package" ); + OSL_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextSharedScriptPackage(): Invalid package" ); m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage ); } @@ -3480,7 +3480,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextBundledScr { const Reference< deployment::XPackage >* pBundledPackages = m_aBundledPackagesSeq.getConstArray(); Reference< deployment::XPackage > xPackage = pBundledPackages[ m_iBundledPackage ]; - VOS_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextBundledScriptPackage(): Invalid package" ); + OSL_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextBundledScriptPackage(): Invalid package" ); m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage ); } |