diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-31 00:09:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-31 00:09:48 +0200 |
| commit | 11d743af1056b7f48debe2e98900065bb03833c9 (patch) | |
| tree | b0decf08bb4d9ad5392f96db0d4afbac376af524 | |
| parent | 2c6363eb16f50a8cfd81bc8511554af4f9e06478 (diff) | |
Some OSL_WARN -> SAL_WARN_IF
Change-Id: I076adcd2f94c38a74f2dce618bc16efec577ed91
| -rw-r--r-- | include/sal/log-areas.dox | 1 | ||||
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 83b3ac07950d..99ceb69f7175 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -272,6 +272,7 @@ certain functionality. @li @c tools.memtools @li @c tools.rc - resource manager @li @c tools.stream - SvStream class +@li @c tools.urlobj - INetURLObject class @section ucb diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 136bfb10f63b..fee81b76ff15 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1732,7 +1732,11 @@ bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef, // Detect cases where a relative input could not be made absolute // because the given base URL is broken (most probably because it is // empty): - OSL_ASSERT(!HasError()); + SAL_WARN_IF( + HasError(), "tools.urlobj", + "cannot make <" << rTheRelURIRef + << "> absolute against broken base <" + << GetMainURL(NO_DECODE) << ">"); rWasAbsolute = false; return false; } @@ -1859,7 +1863,11 @@ bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef, // Detect cases where a relative input could not be made absolute // because the given base URL is broken (most probably because it is // empty): - OSL_ASSERT(!HasError()); + SAL_WARN_IF( + HasError(), "tools.urlobj", + "cannot make <" << rTheRelURIRef + << "> absolute against broken base <" << GetMainURL(NO_DECODE) + << ">"); rWasAbsolute = false; return false; } |