From 669128178f4697f4fba746f1ece1c18b0056022a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 8 Nov 2013 14:13:54 +0100 Subject: Make INetURLObject-from-OUString ctor explicit ...and clean up call sites. Change-Id: I7219a33652835e82fdc44e9e801a7e62868e4f38 --- filter/source/xsltdialog/xmlfilterjar.cxx | 2 +- filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'filter') diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 0e0dd4cbbde5..edb18f7d4047 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -127,7 +127,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference if( !aFileURL.matchIgnoreAsciiCase( OUString("file://") ) ) { - aFileURL = URIHelper::SmartRel2Abs( sProgPath, aFileURL, Link(), false ); + aFileURL = URIHelper::SmartRel2Abs( INetURLObject(sProgPath), aFileURL, Link(), false ); } INetURLObject aURL( aFileURL ); diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 317dba8a3839..edb9ffe896eb 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -113,7 +113,7 @@ void XMLFilterTabPageXSLT::SetURL( SvtURLBox* rURLBox, const OUString& rURL ) else if( !rURL.isEmpty() ) { OUString aURL( rURL ); - aURL = URIHelper::SmartRel2Abs( sInstPath, aURL, Link(), false ); + aURL = URIHelper::SmartRel2Abs( INetURLObject(sInstPath), aURL, Link(), false ); osl::FileBase::getSystemPathFromFileURL( aURL, aPath ); rURLBox->SetBaseURL( aURL ); -- cgit