[Libreoffice-commits] core.git: include/oox oox/source sc/source sd/source sw/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 23 17:36:04 UTC 2019
include/oox/core/xmlfilterbase.hxx | 2 +-
include/oox/ole/axcontrol.hxx | 2 +-
include/oox/ppt/pptimport.hxx | 2 +-
include/oox/shape/ShapeFilterBase.hxx | 2 +-
oox/source/drawingml/fillproperties.cxx | 2 +-
oox/source/ppt/pptimport.cxx | 2 +-
oox/source/shape/ShapeFilterBase.cxx | 2 +-
sc/source/filter/excel/xestream.cxx | 2 +-
sc/source/filter/inc/excelfilter.hxx | 2 +-
sc/source/filter/inc/xestream.hxx | 2 +-
sc/source/filter/oox/excelfilter.cxx | 2 +-
sd/source/filter/eppt/epptooxml.hxx | 2 +-
sw/source/filter/ww8/docxexportfilter.hxx | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 09cd0e363d6c5b0e7b9cebc598030a7e3d397922
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Aug 23 14:59:48 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Aug 23 19:34:49 2019 +0200
loplugin:returnconstval in oox
Change-Id: Id83744fcb90d1bf6e6fe048858f48a4944351494
Reviewed-on: https://gerrit.libreoffice.org/78013
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 4f828abf82eb..68bd801eaefd 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -102,7 +102,7 @@ public:
virtual void useInternalChartDataTable( bool /*bInternal*/ ) { }
/** Has to be implemented by each filter to return the table style list. */
- virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0;
+ virtual ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0;
OUString getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& rPart );
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 968360a5b39b..d1d47459bdb8 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -334,7 +334,7 @@ public:
PropertySet const & rPropSet,
sal_Int32& nOrientation );
- const css::uno::Reference<css::frame::XModel> GetDocModel() const { return mxDocModel; }
+ const css::uno::Reference<css::frame::XModel> & GetDocModel() const { return mxDocModel; }
private:
css::uno::Reference< css::frame::XModel > mxDocModel;
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index c97a6f8c4f57..c5ff1b1e5a0c 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -62,7 +62,7 @@ public:
virtual const ::oox::drawingml::Theme* getCurrentTheme() const override;
virtual ::oox::vml::Drawing* getVmlDrawing() override;
- virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override;
+ virtual oox::drawingml::table::TableStyleListPtr getTableStyles() override;
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override;
const SlidePersistPtr& getActualSlidePersist() const { return mpActualSlidePersist; };
diff --git a/include/oox/shape/ShapeFilterBase.hxx b/include/oox/shape/ShapeFilterBase.hxx
index 50d80f39cae9..b0ddbff4e217 100644
--- a/include/oox/shape/ShapeFilterBase.hxx
+++ b/include/oox/shape/ShapeFilterBase.hxx
@@ -56,7 +56,7 @@ public:
virtual ::oox::vml::Drawing* getVmlDrawing() override;
/** Has to be implemented by each filter to return TableStyles. */
- virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override;
+ virtual ::oox::drawingml::table::TableStyleListPtr getTableStyles() override;
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override;
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 81d46dae8a23..82c48426d1a2 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -132,7 +132,7 @@ RectanglePoint lclGetRectanglePoint( sal_Int32 nToken )
return RectanglePoint_LEFT_TOP;
}
-const awt::Size lclGetOriginalSize( const GraphicHelper& rGraphicHelper, const Reference< XGraphic >& rxGraphic )
+awt::Size lclGetOriginalSize( const GraphicHelper& rGraphicHelper, const Reference< XGraphic >& rxGraphic )
{
awt::Size aSizeHmm( 0, 0 );
try
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index a5ef6c54150d..efc10c69af97 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -254,7 +254,7 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe
return mpActualSlidePersist ? mpActualSlidePersist->getDrawing() : nullptr;
}
-const oox::drawingml::table::TableStyleListPtr PowerPointImport::getTableStyles()
+oox::drawingml::table::TableStyleListPtr PowerPointImport::getTableStyles()
{
if ( !mpTableStyleList && !maTableStyleListPath.isEmpty() )
{
diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx
index bde8cdca19c3..1ebae0c9a230 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -57,7 +57,7 @@ void ShapeFilterBase::setCurrentTheme(const ::oox::drawingml::ThemePtr& pTheme)
return nullptr;
}
-const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles()
+::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles()
{
return ::oox::drawingml::table::TableStyleListPtr();
}
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 3a292b545898..98444d6ca0b4 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -985,7 +985,7 @@ const oox::drawingml::Theme* XclExpXmlStream::getCurrentTheme() const
return nullptr;
}
-const oox::drawingml::table::TableStyleListPtr XclExpXmlStream::getTableStyles()
+oox::drawingml::table::TableStyleListPtr XclExpXmlStream::getTableStyles()
{
return oox::drawingml::table::TableStyleListPtr();
}
diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index 0d87691739b2..dfacf12502bf 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -44,7 +44,7 @@ public:
virtual const ::oox::drawingml::Theme* getCurrentTheme() const override;
virtual ::oox::vml::Drawing* getVmlDrawing() override;
- virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override;
+ virtual ::oox::drawingml::table::TableStyleListPtr getTableStyles() override;
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override;
virtual void useInternalChartDataTable( bool bInternal ) override;
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 29733bb67a8e..93b070a55da9 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -310,7 +310,7 @@ public:
virtual bool importDocument() throw() override;
virtual oox::vml::Drawing* getVmlDrawing() override;
virtual const oox::drawingml::Theme* getCurrentTheme() const override;
- virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override;
+ virtual oox::drawingml::table::TableStyleListPtr getTableStyles() override;
virtual oox::drawingml::chart::ChartConverter* getChartConverter() override;
private:
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index 2183233b0bee..820c174c37bd 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -191,7 +191,7 @@ const ::oox::drawingml::Theme* ExcelFilter::getCurrentTheme() const
return nullptr;
}
-const TableStyleListPtr ExcelFilter::getTableStyles()
+TableStyleListPtr ExcelFilter::getTableStyles()
{
return TableStyleListPtr();
}
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 02b96def092f..d4f2b618f25d 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -68,7 +68,7 @@ public:
// only needed for import, leave them empty, refactor later XmlFilterBase to export and import base?
virtual oox::vml::Drawing* getVmlDrawing() override { return nullptr; }
virtual const oox::drawingml::Theme* getCurrentTheme() const override { return nullptr; }
- virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override { return oox::drawingml::table::TableStyleListPtr(); }
+ virtual oox::drawingml::table::TableStyleListPtr getTableStyles() override { return oox::drawingml::table::TableStyleListPtr(); }
virtual oox::drawingml::chart::ChartConverter* getChartConverter() override { return nullptr; }
static const char* GetSideDirection( sal_uInt8 nDirection );
diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx
index 0efcc51c79fe..ae98c87c327c 100644
--- a/sw/source/filter/ww8/docxexportfilter.hxx
+++ b/sw/source/filter/ww8/docxexportfilter.hxx
@@ -37,7 +37,7 @@ public:
virtual const ::oox::drawingml::Theme* getCurrentTheme() const override { return nullptr; }
virtual ::oox::vml::Drawing* getVmlDrawing() override { return nullptr; }
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override { return nullptr; }
- virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override { return ::oox::drawingml::table::TableStyleListPtr(); }
+ virtual ::oox::drawingml::table::TableStyleListPtr getTableStyles() override { return ::oox::drawingml::table::TableStyleListPtr(); }
// Actual export of the DOCX document
virtual bool exportDocument() override;
More information about the Libreoffice-commits
mailing list