summaryrefslogtreecommitdiff
path: root/svtools/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-18 14:50:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-18 16:40:09 +0100
commitbdc3053067175eea4d30d5ca6d304366174c9316 (patch)
tree2c1b8d858561c500d02432591f3ac028dea26bd4 /svtools/source
parentc89207eaa4ea1b55be46ea083cce174a373035b2 (diff)
rBaseURL argument now unused
Change-Id: I02cacfeaf26788ed024fa9753af132f0d5822e6f
Diffstat (limited to 'svtools/source')
-rw-r--r--svtools/source/control/inettbc.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 3f152dda123f..4bf756548eb3 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -460,8 +460,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
}
}
-
-OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseURL, const OUString& aWorkDir )
+OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseURL )
{
OUString aMatch;
OUString aText = _aText;
@@ -538,14 +537,13 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR
else
{
OUString aTmpMatch;
- ::utl::LocalFileHelper::ConvertSystemPathToURL( aText, aWorkDir, aTmpMatch );
+ ::utl::LocalFileHelper::ConvertSystemPathToURL( aText, aTmpMatch );
aMatch = aTmpMatch;
}
return aMatch;
}
-
void SvtMatchContext_Impl::doExecute()
{
::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
@@ -586,7 +584,7 @@ void SvtMatchContext_Impl::doExecute()
if( schedule() )
{
if ( eProt == INetProtocol::NotValid )
- aMatch = SvtURLBox::ParseSmart( aText, aBaseURL, aWorkDir );
+ aMatch = SvtURLBox::ParseSmart( aText, aBaseURL );
else
aMatch = aText;
if ( !aMatch.isEmpty() )
@@ -1217,7 +1215,7 @@ OUString SvtURLBox::GetURL()
if ( aObj.GetProtocol() == INetProtocol::NotValid )
{
- OUString aName = ParseSmart( aText, aBaseURL, SvtPathOptions().GetWorkPath() );
+ OUString aName = ParseSmart( aText, aBaseURL );
aObj.SetURL(aName);
OUString aURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
if ( aURL.isEmpty() )