[Libreoffice-commits] core.git: cui/source fpicker/source include/svtools include/unotools sd/source sfx2/source svtools/source unotools/source
Caolán McNamara
caolanm at redhat.com
Tue Aug 18 08:40:32 PDT 2015
cui/source/dialogs/hldocntp.cxx | 2 +-
cui/source/dialogs/hldoctp.cxx | 3 +--
fpicker/source/office/iodlg.cxx | 2 +-
include/svtools/inettbc.hxx | 2 +-
include/unotools/localfilehelper.hxx | 2 +-
sd/source/filter/ppt/pptin.cxx | 2 +-
sfx2/source/appl/linkmgr2.cxx | 2 +-
sfx2/source/inet/inettbc.cxx | 2 +-
svtools/source/control/inettbc.cxx | 10 ++++------
unotools/source/ucbhelper/localfilehelper.cxx | 2 +-
10 files changed, 13 insertions(+), 16 deletions(-)
New commits:
commit bdc3053067175eea4d30d5ca6d304366174c9316
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 18 14:50:11 2015 +0100
rBaseURL argument now unused
Change-Id: I02cacfeaf26788ed024fa9753af132f0d5822e6f
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 332d45f..d67771a 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -407,7 +407,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
OUString aStrURL;
OUString aTempStrURL( m_pCbbPath->GetText() );
- utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, m_pCbbPath->GetBaseURL(), aStrURL );
+ utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, aStrURL );
OUString aStrPath = aStrURL;
bool bZeroPath = aStrPath.isEmpty();
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 2ff99465..4e710cc 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -118,7 +118,6 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
// get data from dialog-controls
OUString aStrURL;
OUString aStrPath ( m_pCbbPath->GetText() );
- const OUString aBaseURL ( m_pCbbPath->GetBaseURL() );
OUString aStrMark( m_pEdTarget->GetText() );
if ( aStrPath != aEmptyStr )
@@ -127,7 +126,7 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
if ( aURL.GetProtocol() != INetProtocol::NotValid ) // maybe the path is already a valid
aStrURL = aStrPath; // hyperlink, then we can use this path directly
else
- utl::LocalFileHelper::ConvertSystemPathToURL( aStrPath, aBaseURL, aStrURL );
+ utl::LocalFileHelper::ConvertSystemPathToURL( aStrPath, aStrURL );
//#105788# always create a URL even if it is not valid
if( aStrURL == aEmptyStr )
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 123f96f..496fd8a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -935,7 +935,7 @@ IMPL_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
INetURLObject aFileObject( aFileName );
if ( ( aFileObject.GetProtocol() == INetProtocol::NotValid ) && !aFileName.isEmpty() )
{
- OUString sCompleted = SvtURLBox::ParseSmart( aFileName, _pFileView->GetViewURL(), SvtPathOptions().GetWorkPath() );
+ OUString sCompleted = SvtURLBox::ParseSmart( aFileName, _pFileView->GetViewURL() );
if ( !sCompleted.isEmpty() )
aFileName = sCompleted;
}
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 47217f2..3619ef6 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -80,7 +80,7 @@ public:
void UpdatePickList( );
- static OUString ParseSmart( const OUString& aText, const OUString& aBaseURL, const OUString& aWorkDir );
+ static OUString ParseSmart( const OUString& aText, const OUString& aBaseURL );
void SetFilter(const OUString& _sFilter);
diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx
index 3530dc4..a8f37c3 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -35,7 +35,7 @@ namespace utl
Returning sal_True and an empty URL means that the URL doesn't point to a local file.
*/
static bool ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn);
- static bool ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn );
+ static bool ConvertSystemPathToURL( const OUString& rName, OUString& rReturn );
/**
Converts a "UCB compatible" URL into a "physical" file name.
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 813c0bc..44c3668 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2066,7 +2066,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
OUString aBookmarkURL( pInfo->GetBookmark() );
INetURLObject aURL( pPtr->aTarget );
if( INetProtocol::NotValid == aURL.GetProtocol() )
- utl::LocalFileHelper::ConvertSystemPathToURL( pPtr->aTarget, aBaseURL, aBookmarkURL );
+ utl::LocalFileHelper::ConvertSystemPathToURL( pPtr->aTarget, aBookmarkURL );
if( aBookmarkURL.isEmpty() )
aBookmarkURL = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pPtr->aTarget, URIHelper::GetMaybeFileHdl(), true );
pInfo->SetBookmark( aBookmarkURL );
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 164742b..432ac51 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -564,7 +564,7 @@ OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL )
OUString sRet;
INetURLObject aURL( rTopic );
if( INetProtocol::NotValid == aURL.GetProtocol() )
- utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, rBaseURL, sRet );
+ utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, sRet );
if( sRet.isEmpty() )
sRet = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), rTopic, URIHelper::GetMaybeFileHdl(), true );
return sRet;
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 69017d5..59a9831 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -88,7 +88,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ )
if ( aObj.GetProtocol() == INetProtocol::NotValid )
{
OUString aBaseURL = GetURLBox()->GetBaseURL();
- aName = SvtURLBox::ParseSmart( rName, aBaseURL, SvtPathOptions().GetWorkPath() );
+ aName = SvtURLBox::ParseSmart( rName, aBaseURL );
}
else
aName = rName;
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 3f152dd..4bf7565 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() )
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index d1897a3..e8d82f2 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::ucb;
namespace utl
{
-bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUString&, OUString& rReturn )
+bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, OUString& rReturn )
{
bool ok = osl::FileBase::getFileURLFromSystemPath(rName, rReturn)
== osl::FileBase::E_None;
More information about the Libreoffice-commits
mailing list