diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /unotools | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 14 | ||||
| -rw-r--r-- | unotools/source/config/confignode.cxx | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 177b506d6457..f74185572544 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -334,7 +334,7 @@ static PathStatus getDerivedPath( aStatus = checkStatusAndNormalizeURL(sDerivedURL); else // the relative appendix must be valid - assert(aStatus != Bootstrap::PATH_VALID || dbgCheckStatusOfURL(sDerivedURL) == Bootstrap::PATH_VALID); + OSL_ASSERT(aStatus != Bootstrap::PATH_VALID || dbgCheckStatusOfURL(sDerivedURL) == Bootstrap::PATH_VALID); _rData.getFrom(_sBootstrapParameter, _rURL, sDerivedURL); @@ -349,7 +349,7 @@ static PathStatus getDerivedPath( _rURL = _aBaseURL; // if we have no data it can't be a valid path - assert( aStatus > Bootstrap::PATH_VALID ); + OSL_ASSERT( aStatus > Bootstrap::PATH_VALID ); } return aStatus; @@ -467,7 +467,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im addUnexpectedError(_rBuf,""); break; - default: assert(false); + default: OSL_ASSERT(false); addUnexpectedError(_rBuf); break; } @@ -513,10 +513,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im eErrCode = Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY; break; - case Bootstrap::DATA_INVALID: - assert(false); - SAL_FALLTHROUGH; - + case Bootstrap::DATA_INVALID: OSL_ASSERT(false); SAL_FALLTHROUGH; case Bootstrap::PATH_VALID: addFileError(_rBuf, _rData.aBootstrapINI_.path, IS_MISSING); eErrCode = Bootstrap::MISSING_BOOTSTRAP_FILE; @@ -530,8 +527,7 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im } break; - default: - assert(false); + default: OSL_ASSERT(false); addUnexpectedError(_rBuf); break; } diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 6638fee7929f..c0dc0043a6e0 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -395,7 +395,7 @@ namespace utl // check if the name refers to a indirect descendant else if (m_xHierarchyAccess.is() && m_xHierarchyAccess->hasByHierarchicalName(_rPath)) { - assert(!_rPath.isEmpty()); + OSL_ASSERT(!_rPath.isEmpty()); OUString sParentPath, sLocalName; |