[Libreoffice-commits] core.git: sc/source

[Libreoffice Gerrit user]

 sc/source/ui/docshell/dbdocimp.cxx |    4 +---
 sc/source/ui/inc/dbdocfun.hxx      |    2 +-
 sc/source/ui/unoobj/dispuno.cxx    |    3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 6d29499bd0b854338b7429a6f78b3224ac9f3201
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Aug 14 17:04:04 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 16 11:17:09 2018 +0200

    loplugin:returnconstant in ScDBDocFunc
    
    Change-Id: Iaa71bbc2a10e46153209bf3264c74c8ce78f007b
    Reviewed-on: https://gerrit.libreoffice.org/59124
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index bfcdda2608af..7fa81368ba04 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -102,7 +102,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, const SfxViewFrame*
     }
 }
 
-bool ScDBDocFunc::DoImportUno( const ScAddress& rPos,
+void ScDBDocFunc::DoImportUno( const ScAddress& rPos,
                                 const uno::Sequence<beans::PropertyValue>& aArgs )
 {
     svx::ODataAccessDescriptor aDesc( aArgs );      // includes selection and result set
@@ -113,8 +113,6 @@ bool ScDBDocFunc::DoImportUno( const ScAddress& rPos,
     OUString sTarget = pDBData->GetName();
 
     UpdateImport( sTarget, aDesc );
-
-    return true;
 }
 
 bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx
index 75672a48d6ad..0222fe5bd629 100644
--- a/sc/source/ui/inc/dbdocfun.hxx
+++ b/sc/source/ui/inc/dbdocfun.hxx
@@ -62,7 +62,7 @@ public:
     bool DoImport( SCTAB nTab, const ScImportParam& rParam,
                    const svx::ODataAccessDescriptor* pDescriptor);      // used for selection an existing ResultSet
 
-    bool DoImportUno( const ScAddress& rPos,
+    void DoImportUno( const ScAddress& rPos,
                       const css::uno::Sequence<css::beans::PropertyValue>& aArgs );
 
     static void     ShowInBeamer( const ScImportParam& rParam, const SfxViewFrame* pFrame );
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 0f0d25e3f53f..f8c55cd90de4 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -219,7 +219,8 @@ void SAL_CALL ScDispatch::dispatch( const util::URL& aURL,
         ScAddress aPos( rViewData.GetCurX(), rViewData.GetCurY(), rViewData.GetTabNo() );
 
         ScDBDocFunc aFunc( *rViewData.GetDocShell() );
-        bDone = aFunc.DoImportUno( aPos, aArgs );
+        aFunc.DoImportUno( aPos, aArgs );
+        bDone = true;
     }
     // cURLDocDataSource is never dispatched