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

[Libreoffice Gerrit user]

 sc/inc/xmlwrap.hxx                   |    2 +-
 sc/source/filter/chart/chart_imp.cxx |    3 +--
 sc/source/ui/docshell/docsh.cxx      |    7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 013c278d564d4e50c81bec7915c33f4edd75c00e
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Aug 13 10:19:56 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 14 14:22:45 2018 +0200

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

diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index 3327160b45c0..e7768f79d1e6 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -96,7 +96,7 @@ class ScXMLChartExportWrapper
 {
 public:
     ScXMLChartExportWrapper( css::uno::Reference< css::frame::XModel > const & xModel, SfxMedium& rMed );
-    bool Export();
+    void Export();
 
 private:
     css::uno::Reference< css::frame::XModel > mxModel;
diff --git a/sc/source/filter/chart/chart_imp.cxx b/sc/source/filter/chart/chart_imp.cxx
index bbc459931195..da76b4a4a233 100644
--- a/sc/source/filter/chart/chart_imp.cxx
+++ b/sc/source/filter/chart/chart_imp.cxx
@@ -22,12 +22,11 @@ ScXMLChartExportWrapper::ScXMLChartExportWrapper( css::uno::Reference< css::fram
 
 }
 
-bool ScXMLChartExportWrapper::Export()
+void ScXMLChartExportWrapper::Export()
 {
     if ( !mxStorage.is() )
         mxStorage = mrMedium.GetOutputStorage();
 
     uno::Reference< document::XStorageBasedDocument>(mxModel, uno::UNO_QUERY_THROW)->storeToStorage(mxStorage, uno::Sequence< beans::PropertyValue >() );
-    return true;
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index fba755a6e823..076d52c20afa 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -579,8 +579,6 @@ bool ScDocShell::SaveXML( SfxMedium* pSaveMedium, const css::uno::Reference< css
 
 bool ScDocShell::SaveCurrentChart( SfxMedium& rMedium )
 {
-    bool bRet = false;
-
     try
     {
 
@@ -591,13 +589,14 @@ bool ScDocShell::SaveCurrentChart( SfxMedium& rMedium )
         uno::Reference< frame::XModel > xChartDoc ( xCurrentComponent, uno::UNO_QUERY_THROW );
 
         ScXMLChartExportWrapper aExport( xChartDoc, rMedium );
-        bRet = aExport.Export();
+        aExport.Export();
+        return true;
     }
     catch(...)
     {
         SAL_WARN("sc", "exception thrown while saving chart. Bug!!!");
+        return false;
     }
-    return bRet;
 }
 
 bool ScDocShell::Load( SfxMedium& rMedium )