summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-08-31 00:09:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-08-31 00:09:48 +0200
commit11d743af1056b7f48debe2e98900065bb03833c9 (patch)
treeb0decf08bb4d9ad5392f96db0d4afbac376af524 /tools
parent2c6363eb16f50a8cfd81bc8511554af4f9e06478 (diff)
Some OSL_WARN -> SAL_WARN_IF
Change-Id: I076adcd2f94c38a74f2dce618bc16efec577ed91
Diffstat (limited to 'tools')
-rw-r--r--tools/source/fsys/urlobj.cxx12
1 files changed, 10 insertions, 2 deletions
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;
}