diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-20 11:01:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-20 15:45:54 +0200 |
| commit | e75e6b850a8791237dca6654b526831f1b0c7bc6 (patch) | |
| tree | 4045cf93268dfa46c05417523e7236bf1ccc3738 /svtools | |
| parent | 6ea4b982fada0bbca957dfa0729e2c3225c8a460 (diff) | |
loplugin:unusedfields
Change-Id: I9c80805788d49b13552c168a36fdf395da19df26
Reviewed-on: https://gerrit.libreoffice.org/53196
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/inettbc.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 28377622e183..0ba4aaa20ba8 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -128,10 +128,8 @@ class MatchContext_Impl: public salhelper::Thread std::vector<OUString> aCompletions; std::vector<OUString> aURLs; svtools::AsynchronLink aLink; - OUString aBaseURL; OUString aText; URLBox* pBox; - bool bOnlyDirectories; osl::Mutex mutex_; bool stopped_; @@ -492,10 +490,8 @@ 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 ) , stopped_(false) , commandId_(0) { @@ -703,8 +699,6 @@ void MatchContext_Impl::ReadFolder( const OUString& rURL, { uno::Reference< XDynamicResultSet > xDynResultSet; ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS; - if ( bOnlyDirectories ) - eInclude = INCLUDE_FOLDERS_ONLY; xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude ); @@ -1150,8 +1144,8 @@ void MatchContext_Impl::doExecute() OUString aMatch; INetProtocol eProt = INetURLObject::CompareProtocolScheme( aText ); - INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( aBaseURL ); - if ( aBaseURL.isEmpty() ) + INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( pBox->aBaseURL ); + if ( pBox->aBaseURL.isEmpty() ) eBaseProt = INetURLObject::CompareProtocolScheme( SvtPathOptions().GetWorkPath() ); INetProtocol eSmartProt = INetProtocol::NotValid; @@ -1164,7 +1158,7 @@ void MatchContext_Impl::doExecute() if( schedule() ) { if ( eProt == INetProtocol::NotValid ) - aMatch = SvtURLBox::ParseSmart( aText, aBaseURL ); + aMatch = SvtURLBox::ParseSmart( aText, pBox->aBaseURL ); else aMatch = aText; if ( !aMatch.isEmpty() ) @@ -1262,10 +1256,6 @@ void MatchContext_Impl::doExecute() } } - if ( bOnlyDirectories ) - // don't scan history picklist if only directories are allowed, picklist contains only files - return; - bool bFull = false; INetURLObject aCurObj; |