diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:53:10 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:53:10 +0200 |
commit | 0dccc59702c4a30e9aca8251e64678a2588a5513 (patch) | |
tree | 409bd4e48b6efc331baedd0a7a07184ddad03a68 /svl | |
parent | a29efdc0489df61a4ad6b717d93775a7c244596f (diff) |
Use typed MaybeFile Link
Change-Id: Ic9eebca9d8fe3e9173b1873bdc7800e5161f9999
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/misc/urihelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 7103dc8a1c1b..25ba86dd40f2 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star; OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, OUString const & rTheRelURIRef, - Link<> const & rMaybeFileHdl, + Link<OUString *, bool> const & rMaybeFileHdl, bool bCheckFileExists, bool bIgnoreFragment, INetURLObject::EncodeMechanism eEncodeMechanism, @@ -91,7 +91,7 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, if (rMaybeFileHdl.IsSet()) { OUString aFilePath(rTheRelURIRef); - bMaybeFile = rMaybeFileHdl.Call(&aFilePath) != 0; + bMaybeFile = rMaybeFileHdl.Call(&aFilePath); } if (!bMaybeFile) aAbsURIRef = aNonFileURIRef; @@ -101,14 +101,14 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, return aAbsURIRef.GetMainURL(eDecodeMechanism, eCharset); } -namespace { struct MaybeFileHdl : public rtl::Static< Link<>, MaybeFileHdl > {}; } +namespace { struct MaybeFileHdl : public rtl::Static< Link<OUString *, bool>, MaybeFileHdl > {}; } -void URIHelper::SetMaybeFileHdl(Link<> const & rTheMaybeFileHdl) +void URIHelper::SetMaybeFileHdl(Link<OUString *, bool> const & rTheMaybeFileHdl) { MaybeFileHdl::get() = rTheMaybeFileHdl; } -Link<> URIHelper::GetMaybeFileHdl() +Link<OUString *, bool> URIHelper::GetMaybeFileHdl() { return MaybeFileHdl::get(); } |