diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 16:53:43 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 16:53:43 +0000 |
| commit | 2a7ac80ef090d45a42700e9a055ecd70590bfd24 (patch) | |
| tree | 4f4876049dfadcbfffcdbe38cbce42686def554e /ucb/source/regexp | |
| parent | 5b0f5880500efa3eee8c64dc45022eba63804b56 (diff) | |
INTEGRATION: CWS bgdlremove (1.6.40); FILE MERGED
2007/05/18 14:06:49 kso 1.6.40.2: #i77419# - cleanup of ucbhelper namespaces.
2007/05/11 12:59:01 kso 1.6.40.1: #i76911# - ucbhelper no longer uses VOS
Diffstat (limited to 'ucb/source/regexp')
| -rw-r--r-- | ucb/source/regexp/regexp.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 9baee48d0803..e9e3a6cd5332 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: regexp.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 13:44:55 $ + * last change: $Author: ihi $ $Date: 2007-06-05 17:53:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,6 +42,8 @@ #include <cstddef> +#include "osl/diagnose.h" + #ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> #endif @@ -51,15 +53,12 @@ #ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> #endif -#ifndef _VOS_DIAGNOSE_H_ -#include <vos/diagnose.hxx> -#endif namespace unnamed_ucb_regexp {} using namespace unnamed_ucb_regexp; // unnamed namespaces don't work well yet... using namespace com::sun::star; -using namespace ucb; +using namespace ucb_impl; //============================================================================ // @@ -78,9 +77,9 @@ inline Regexp::Regexp(Kind eTheKind, rtl::OUString const & rThePrefix, m_bEmptyDomain(bTheEmptyDomain), m_bTranslation(bTheTranslation) { - VOS_ASSERT(m_eKind == KIND_DOMAIN + OSL_ASSERT(m_eKind == KIND_DOMAIN || !m_bEmptyDomain && m_aInfix.getLength() == 0); - VOS_ASSERT(m_bTranslation || m_aReversePrefix.getLength() == 0); + OSL_ASSERT(m_bTranslation || m_aReversePrefix.getLength() == 0); } //============================================================================ @@ -234,7 +233,7 @@ bool isScheme(rtl::OUString const & rString, bool bColon) void appendStringLiteral(rtl::OUStringBuffer * pBuffer, rtl::OUString const & rString) { - VOS_ASSERT(pBuffer); + OSL_ASSERT(pBuffer); pBuffer->append(sal_Unicode('"')); sal_Unicode const * p = rString.getStr(); |