[Libreoffice-commits] core.git: compilerplugins/clang include/oox include/sfx2 oox/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Mar 26 08:07:17 UTC 2019
compilerplugins/clang/unnecessaryvirtual-dead.results | 2 -
compilerplugins/clang/unnecessaryvirtual.results | 22 +++++++++---------
include/oox/helper/graphichelper.hxx | 4 +--
include/sfx2/tabdlg.hxx | 2 -
oox/source/drawingml/chart/objectformatter.cxx | 4 +--
oox/source/helper/graphichelper.cxx | 4 +--
6 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 8bb04558b97a84ec45e0e93b91fa8b4c226f9032
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 25 14:59:02 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Mar 26 09:06:51 2019 +0100
loplugin:unnnecessaryvirtual
Change-Id: I2aa9a8f14b6db2098931a14c6eed522a9d2653ed
Reviewed-on: https://gerrit.libreoffice.org/69682
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results
index 32567613fd25..29f7436169ff 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -12,7 +12,7 @@ sc/source/core/opencl/formulagroupcl.cxx:1061
void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
slideshow/source/engine/animationfactory.cxx:443
void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &,)
-vcl/inc/salframe.hxx:135
+vcl/inc/salframe.hxx:144
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
vcl/inc/salmenu.hxx:71
void SalMenu::SetItemBits(unsigned int,enum MenuItemBits,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results
index 9a7ac15bfe80..a092dc88030c 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -72,6 +72,12 @@ include/comphelper/unique_disposing_ptr.hxx:169
void comphelper::unique_disposing_solar_mutex_reset_ptr::reset(type-parameter-0-0 *,)
include/comphelper/weakeventlistener.hxx:120
void comphelper::OWeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,)
+include/oox/helper/graphichelper.hxx:77
+ int oox::GraphicHelper::getDefaultChartAreaLineStyle()const
+include/oox/helper/graphichelper.hxx:80
+ short oox::GraphicHelper::getDefaultChartAreaLineWidth()const
+include/sfx2/tabdlg.hxx:103
+ class SfxItemSet * SfxTabDialog::CreateInputItemSet(unsigned short,)
include/svl/svdde.hxx:237
class DdeData * DdeTopic::Get(enum SotClipboardFormatId,)
include/svl/svdde.hxx:238
@@ -108,10 +114,8 @@ include/vbahelper/vbareturntypes.hxx:40
void ooo::vba::DefaultReturnHelper::setValue(type-parameter-0-0,)
include/vbahelper/vbareturntypes.hxx:41
type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue()
-include/vcl/filter/PngImageReader.hxx:29
- void vcl::PngImageReader::~PngImageReader()
-include/xmloff/xmlstyle.hxx:217
- unsigned short SvXMLStylesContext::GetFamily(const class rtl::OUString &,)const
+include/vcl/weld.hxx:95
+ void weld::Widget::set_visible(_Bool,)
sc/source/core/opencl/formulagroupcl.cxx:1053
_Bool sc::opencl::DynamicKernelSlidingArgument::NeedParallelReduction()const
sc/source/core/opencl/formulagroupcl.cxx:1061
@@ -188,8 +192,8 @@ sc/source/ui/vba/vbapagebreak.hxx:48
void ScVbaPageBreak::Delete()
sc/source/ui/vba/vbapagebreak.hxx:49
class com::sun::star::uno::Reference<class ooo::vba::excel::XRange> ScVbaPageBreak::Location()
-sd/source/ui/inc/ViewClipboard.hxx:77
- unsigned short sd::ViewClipboard::InsertSlides(const class SdTransferable &,unsigned short,)
+shell/inc/i_xml_parser_event_handler.hxx:41
+ void i_xml_parser_event_handler::~i_xml_parser_event_handler()
slideshow/source/engine/activities/activitiesfactory.cxx:173
void slideshow::internal::(anonymous namespace)::FromToByActivity::startAnimation()
slideshow/source/engine/activities/activitiesfactory.cxx:242
@@ -210,11 +214,9 @@ slideshow/source/engine/animationfactory.cxx:447
void slideshow::internal::(anonymous namespace)::GenericAnimation::start(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &,)
sw/inc/flypos.hxx:37
void SwPosFlyFrame::~SwPosFlyFrame()
-sw/source/uibase/inc/drawbase.hxx:53
- _Bool SwDrawBase::MouseMove(const class MouseEvent &,)
-vcl/inc/salframe.hxx:135
+vcl/inc/salframe.hxx:144
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
-vcl/inc/salframe.hxx:180
+vcl/inc/salframe.hxx:189
void SalFrame::Flush(const class tools::Rectangle &,)
vcl/inc/salinst.hxx:92
_Bool SalInstance::SVMainHook(int *,)
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index a3db628ee361..cafcef22168c 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -74,10 +74,10 @@ public:
virtual sal_Int32 getDefaultChartAreaFillStyle() const;
/** Returns chartspace automatic default border style */
- virtual sal_Int32 getDefaultChartAreaLineStyle() const;
+ static sal_Int32 getDefaultChartAreaLineStyle();
/** Returns chartspace automatic default border width in Emu */
- virtual sal_Int16 getDefaultChartAreaLineWidth() const;
+ static sal_Int16 getDefaultChartAreaLineWidth();
// Device info and device dependent unit conversion -----------------------
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 0f6babf2774a..f74b66b2aaba 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -100,7 +100,7 @@ friend class SfxTabDialogUIObject;
protected:
virtual short Ok();
// Is deleted in Sfx!
- virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
+ static SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
VclPtr<VclButtonBox> m_pActionArea;
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index f97bd780bf3e..9c64530a70ad 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -823,8 +823,8 @@ LineFormatter::LineFormatter( ObjectFormatterData& rData, const AutoFormatEntry*
// set automatic border property for chartarea, because of tdf#81437 and tdf#82217
if ( eObjType == OBJECTTYPE_CHARTSPACE )
{
- mxAutoLine->maLineFill.moFillType = rData.mrFilter.getGraphicHelper().getDefaultChartAreaLineStyle();
- mxAutoLine->moLineWidth = rData.mrFilter.getGraphicHelper().getDefaultChartAreaLineWidth();
+ mxAutoLine->maLineFill.moFillType = oox::GraphicHelper::getDefaultChartAreaLineStyle();
+ mxAutoLine->moLineWidth = oox::GraphicHelper::getDefaultChartAreaLineWidth();
// this value is what MSO 2016 use as a default color for chartspace border
mxAutoLine->maLineFill.maFillColor.setSrgbClr( 0xD9D9D9 );
}
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index b720aeab8746..6ada6cd5a5a0 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -165,12 +165,12 @@ sal_Int32 GraphicHelper::getDefaultChartAreaFillStyle() const
return XML_solidFill;
}
-sal_Int32 GraphicHelper::getDefaultChartAreaLineStyle() const
+sal_Int32 GraphicHelper::getDefaultChartAreaLineStyle()
{
return XML_solidFill;
}
-sal_Int16 GraphicHelper::getDefaultChartAreaLineWidth() const
+sal_Int16 GraphicHelper::getDefaultChartAreaLineWidth()
{
// this value is what MSO 2016 writes fixing incomplete MSO 2010 documents (0.75 pt in emu)
return 9525;
More information about the Libreoffice-commits
mailing list