mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some OSL_WARN -> SAL_WARN_IF

Browse Source 
Change-Id: I076adcd2f94c38a74f2dce618bc16efec577ed91
This commit is contained in:
Stephan Bergmann
2013-08-31 00:09:48 +02:00
parent 2c6363eb16
commit 11d743af10
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/sal/log-areas.dox
View File

@@ -272,6 +272,7 @@ certain functionality.
@li @c tools.memtools @li @c tools.memtools
@li @c tools.rc - resource manager @li @c tools.rc - resource manager
@li @c tools.stream - SvStream class @li @c tools.stream - SvStream class
@li @c tools.urlobj - INetURLObject class
@section ucb @section ucb

12
tools/source/fsys/urlobj.cxx
View File

@@ -1732,7 +1732,11 @@ bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef,
// Detect cases where a relative input could not be made absolute // Detect cases where a relative input could not be made absolute
// because the given base URL is broken (most probably because it is // because the given base URL is broken (most probably because it is
// empty): // empty):
OSL_ASSERT(!HasError()); SAL_WARN_IF(
HasError(), "tools.urlobj",
"cannot make <" << rTheRelURIRef
<< "> absolute against broken base <"
<< GetMainURL(NO_DECODE) << ">");
rWasAbsolute = false; rWasAbsolute = false;
return false; return false;
} }
@@ -1859,7 +1863,11 @@ bool INetURLObject::convertRelToAbs(OUString const & rTheRelURIRef,
// Detect cases where a relative input could not be made absolute // Detect cases where a relative input could not be made absolute
// because the given base URL is broken (most probably because it is // because the given base URL is broken (most probably because it is
// empty): // empty):
OSL_ASSERT(!HasError()); SAL_WARN_IF(
HasError(), "tools.urlobj",
"cannot make <" << rTheRelURIRef
<< "> absolute against broken base <" << GetMainURL(NO_DECODE)
<< ">");
rWasAbsolute = false; rWasAbsolute = false;
return false; return false;
} }