[Libreoffice-commits] core.git: include/vcl sfx2/source svtools/source

[Noel Grandin]

 include/vcl/weld.hxx               |    1 -
 sfx2/source/appl/fileobj.cxx       |    7 +------
 sfx2/source/appl/fileobj.hxx       |    2 --
 svtools/source/control/inettbc.cxx |   16 +++-------------
 4 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit e75e6b850a8791237dca6654b526831f1b0c7bc6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Apr 20 11:01:28 2018 +0200

    loplugin:unusedfields
    
    Change-Id: I9c80805788d49b13552c168a36fdf395da19df26
    Reviewed-on: https://gerrit.libreoffice.org/53196
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 116e7c182f07..ae9931eb2b0c 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -393,7 +393,6 @@ class VCL_DLLPUBLIC Scale : virtual public Widget
 {
 protected:
     Link<Scale&, void> m_aValueChangedHdl;
-    Link<Scale&, void> m_aOutputHdl;
 
     void signal_value_changed() { m_aValueChangedHdl.Call(*this); }
 
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 371d8839f75a..d785cec58fa8 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -56,10 +56,8 @@ SvFileObject::SvFileObject()
     , bWaitForData(false)
     , bInNewData(false)
     , bDataReady(false)
-    , bNativFormat(false)
     , bClearMedium(false)
     , bStateChangeCalled(false)
-    , bInCallDownload(false)
 {
 }
 
@@ -175,9 +173,7 @@ bool SvFileObject::LoadFile_Impl()
         bWaitForData = true;
 
         tools::SvRef<SfxMedium> xTmpMed = xMed;
-        bInCallDownload = true;
         xMed->Download( LINK( this, SvFileObject, LoadGrfReady_Impl ) );
-        bInCallDownload = false;
 
         bClearMedium = !xMed.is();
         if( bClearMedium )
@@ -210,7 +206,7 @@ bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
 
     // To avoid that a native link is created
     if( !rGrf.IsGfxLink() &&
-        !rGrf.GetContext() && !bNativFormat )
+        !rGrf.GetContext() )
         rGrf.SetGfxLink( GfxLink() );
 
     if( !pStream )
@@ -370,7 +366,6 @@ IMPL_LINK_NOARG( SvFileObject, LoadGrfReady_Impl, void*, void )
     // When we come form here there it can not be an error no more.
     bLoadError = false;
     bWaitForData = false;
-    bInCallDownload = false;
 
     if( !bInNewData && !bDataReady )
     {
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index f55e7885713d..86219ef5a1d5 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -44,10 +44,8 @@ class SvFileObject : public sfx2::SvLinkSource
     bool bWaitForData : 1;
     bool bInNewData : 1;
     bool bDataReady : 1;
-    bool bNativFormat : 1;
     bool bClearMedium : 1;
     bool bStateChangeCalled : 1;
-    bool bInCallDownload : 1;
 
     bool GetGraphic_Impl( Graphic&, SvStream* pStream );
     bool LoadFile_Impl();
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;