diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-04-19 10:44:22 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-19 17:57:22 +0200 |
commit | a1533910d896f18980a37c7a9c15154366dacae3 (patch) | |
tree | 97f53cdba75a7ecb20d8ed37186e58d889311dbd /svtools/source/control/inettbc.cxx | |
parent | 4bacf58f4af44ac8c4632b43289ccfcc07e5820c (diff) |
weld XMLFilterTabDialog
Change-Id: I5ef92805690f55913e6366fce1fd4dc5180bb5a6
Reviewed-on: https://gerrit.libreoffice.org/53146
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/source/control/inettbc.cxx')
-rw-r--r-- | svtools/source/control/inettbc.cxx | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index afa2101417a2..28377622e183 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -492,6 +492,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, MatchContext_Impl::MatchContext_Impl(URLBox* pBoxP, const OUString& rText) : Thread( "MatchContext_Impl" ) , aLink( LINK( this, MatchContext_Impl, Select_Impl ) ) + , aBaseURL( pBoxP->aBaseURL ) , aText( rText ) , pBox( pBoxP ) , bOnlyDirectories( false ) @@ -2161,7 +2162,7 @@ OUString URLBox::GetURL() if ( aObj.GetProtocol() == INetProtocol::NotValid ) { - OUString aName = ParseSmart( aText, OUString() ); + OUString aName = ParseSmart( aText, aBaseURL ); aObj.SetURL(aName); OUString aURL( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); if ( aURL.isEmpty() ) @@ -2199,4 +2200,15 @@ OUString URLBox::GetURL() return aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } +void URLBox::SetBaseURL( const OUString& rURL ) +{ + ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() ); + + // Reset match lists + pImpl->aCompletions.clear(); + pImpl->aURLs.clear(); + + aBaseURL = rURL; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |