diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-29 10:58:30 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-29 18:15:16 +0200 |
commit | 8e27afa534f5e3a0c610b36e7ed4d392b532b49d (patch) | |
tree | 416a0f26b455a928087df25341312eff4febe2c5 | |
parent | ed316832e9e9028444cbb587ce644d7acaacf1e7 (diff) |
loplugin:unnecessaryvirtual
Change-Id: Ic044a6e4568e707022d87bc5712205fbdf084ba2
Reviewed-on: https://gerrit.libreoffice.org/52067
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
34 files changed, 179 insertions, 91 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index bff95c0ef7cc..5e19ef184ffc 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -369,7 +369,7 @@ public: BasicStatus& GetBasicStatus() { return m_aStatus; } virtual bool IsModified () override; - virtual bool IsPasteAllowed (); + bool IsPasteAllowed (); void ShowCursor( bool bOn ); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 2b7733e56b15..9c078e608d00 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -101,7 +101,7 @@ public: virtual void StoreData() override; virtual bool IsModified() override; - virtual bool IsPasteAllowed(); + bool IsPasteAllowed(); virtual svl::IUndoManager* GetUndoManager() override; // return number of pages to be printed diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index 8f79346079d0..332124a1decb 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -1,38 +1,36 @@ -avmedia/source/vlc/inc/wrapper/Instance.hxx:28 - avmedia::vlc::wrapper::Instance::void-~Instance() -avmedia/source/vlc/inc/wrapper/Media.hxx:34 - avmedia::vlc::wrapper::Media::void-~Media() -avmedia/source/vlc/inc/wrapper/Player.hxx:37 - avmedia::vlc::wrapper::Player::void-~Player() -basic/source/comp/codegen.cxx:391 +basctl/source/basicide/baside2.hxx:372 + basctl::ModulWindow::_Bool-IsPasteAllowed() +basctl/source/inc/baside3.hxx:104 + basctl::DialogWindow::_Bool-IsPasteAllowed() +basic/source/comp/codegen.cxx:387 PCodeVisitor::void-~PCodeVisitor<T>() -basic/source/comp/codegen.cxx:468 +basic/source/comp/codegen.cxx:464 OffSetAccumulator::void-start(const sal_uInt8 *,) -basic/source/comp/codegen.cxx:469 +basic/source/comp/codegen.cxx:465 OffSetAccumulator::void-processOpCode0(enum SbiOpcode,) -basic/source/comp/codegen.cxx:470 +basic/source/comp/codegen.cxx:466 OffSetAccumulator::void-processOpCode1(enum SbiOpcode,T,) -basic/source/comp/codegen.cxx:471 +basic/source/comp/codegen.cxx:467 OffSetAccumulator::void-processOpCode2(enum SbiOpcode,T,T,) -basic/source/comp/codegen.cxx:472 +basic/source/comp/codegen.cxx:468 OffSetAccumulator::void-end() -basic/source/comp/codegen.cxx:487 +basic/source/comp/codegen.cxx:477 OffSetAccumulator::_Bool-processParams() -basic/source/comp/codegen.cxx:498 +basic/source/comp/codegen.cxx:488 BufferTransformer::void-start(const sal_uInt8 *,) -basic/source/comp/codegen.cxx:499 +basic/source/comp/codegen.cxx:489 BufferTransformer::void-processOpCode0(enum SbiOpcode,) -basic/source/comp/codegen.cxx:503 +basic/source/comp/codegen.cxx:493 BufferTransformer::void-processOpCode1(enum SbiOpcode,T,) -basic/source/comp/codegen.cxx:528 +basic/source/comp/codegen.cxx:518 BufferTransformer::void-processOpCode2(enum SbiOpcode,T,T,) -basic/source/comp/codegen.cxx:538 +basic/source/comp/codegen.cxx:528 BufferTransformer::_Bool-processParams() -basic/source/comp/codegen.cxx:539 +basic/source/comp/codegen.cxx:529 BufferTransformer::void-end() chart2/source/inc/WeakListenerAdapter.hxx:58 chart::WeakListenerAdapter::void-disposing(const css::lang::EventObject &,) -connectivity/source/drivers/firebird/SubComponent.hxx:72 +connectivity/source/drivers/firebird/SubComponent.hxx:67 connectivity::firebird::OPropertyArrayUsageHelper::void-~OPropertyArrayUsageHelper<TYPE>() extensions/source/dbpilots/unoautopilot.hxx:98 dbp::OUnoAutoPilot::::cppu::IPropertyArrayHelper *-createArrayHelper()const @@ -76,6 +74,8 @@ forms/source/xforms/namedcollection.hxx:106 NamedCollection::css::uno::Sequence<OUString>-getElementNames() forms/source/xforms/namedcollection.hxx:111 NamedCollection::sal_Bool-hasByName(const class rtl::OUString &,) +include/basic/sbx.hxx:130 + SbxArray::enum SbxClassType-GetClass()const include/comphelper/IdPropArrayHelper.hxx:53 comphelper::OIdPropertyArrayUsageHelper::void-~OIdPropertyArrayUsageHelper<TYPE>() include/comphelper/interaction.hxx:55 @@ -100,6 +100,28 @@ include/comphelper/unique_disposing_ptr.hxx:169 comphelper::unique_disposing_solar_mutex_reset_ptr::void-reset(T *,) include/comphelper/weakeventlistener.hxx:118 comphelper::OWeakListenerAdapter::void-disposing(const css::lang::EventObject &,) +include/cppcanvas/font.hxx:38 + cppcanvas::Font::void-~Font() +include/editeng/adjustitem.hxx:66 + SvxAdjustItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/charreliefitem.hxx:45 + SvxCharReliefItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/cmapitem.hxx:50 + SvxCaseMapItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/crossedoutitem.hxx:51 + SvxCrossedOutItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/escapementitem.hxx:101 + SvxEscapementItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/formatbreakitem.hxx:54 + SvxFormatBreakItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/lspcitem.hxx:96 + SvxLineSpacingItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/postitem.hxx:52 + SvxPostureItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/shaditem.hxx:79 + SvxShadowItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/editeng/wghtitem.hxx:52 + SvxWeightItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const include/sfx2/controlwrapper.hxx:257 sfx::MetricFieldWrapper::_Bool-IsControlDontKnow()const include/sfx2/controlwrapper.hxx:258 @@ -108,21 +130,21 @@ include/sfx2/controlwrapper.hxx:260 sfx::MetricFieldWrapper::ValueT-GetControlValue()const include/sfx2/controlwrapper.hxx:261 sfx::MetricFieldWrapper::void-SetControlValue(ValueT,) -include/sfx2/controlwrapper.hxx:291 +include/sfx2/controlwrapper.hxx:292 sfx::ListBoxWrapper::_Bool-IsControlDontKnow()const -include/sfx2/controlwrapper.hxx:293 +include/sfx2/controlwrapper.hxx:294 sfx::ListBoxWrapper::void-SetControlDontKnow(_Bool,) -include/sfx2/controlwrapper.hxx:296 - sfx::ListBoxWrapper::ValueT-GetControlValue()const include/sfx2/controlwrapper.hxx:297 + sfx::ListBoxWrapper::ValueT-GetControlValue()const +include/sfx2/controlwrapper.hxx:298 sfx::ListBoxWrapper::void-SetControlValue(ValueT,) -include/sfx2/controlwrapper.hxx:324 +include/sfx2/controlwrapper.hxx:325 sfx::ValueSetWrapper::_Bool-IsControlDontKnow()const -include/sfx2/controlwrapper.hxx:326 +include/sfx2/controlwrapper.hxx:327 sfx::ValueSetWrapper::void-SetControlDontKnow(_Bool,) -include/sfx2/controlwrapper.hxx:329 - sfx::ValueSetWrapper::ValueT-GetControlValue()const include/sfx2/controlwrapper.hxx:330 + sfx::ValueSetWrapper::ValueT-GetControlValue()const +include/sfx2/controlwrapper.hxx:331 sfx::ValueSetWrapper::void-SetControlValue(ValueT,) include/sfx2/itemwrapper.hxx:94 sfx::SingleItemWrapper::void-~SingleItemWrapper<ItemT, ValueT>() @@ -134,12 +156,48 @@ include/sfx2/itemwrapper.hxx:156 sfx::IdentItemWrapper::const ItemT &-GetItemValue(const ItemT &,)const include/sfx2/itemwrapper.hxx:158 sfx::IdentItemWrapper::void-SetItemValue(ItemT &,const ItemT &,)const +include/svl/aeitem.hxx:63 + SfxAllEnumItem::sal_uInt16-GetValueByPos(sal_uInt16,)const +include/svl/aeitem.hxx:64 + SfxAllEnumItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const include/svl/svdde.hxx:307 DdeService::void-~DdeService() -include/svtools/svparser.hxx:92 - SvParser::void-NextToken(T,) include/svtools/svparser.hxx:128 SvParser::void-Continue(T,) +include/svtools/treelistbox.hxx:723 + SvTreeListBox::void-SelectAll(_Bool,_Bool,) +include/svx/obj3d.hxx:84 + E3dObjList::class E3dObjList *-Clone()const +include/svx/sdgmoitm.hxx:43 + SdrGrafModeItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sdr/properties/defaultproperties.hxx:103 + sdr::properties::DefaultProperties::void-Scale(const class Fraction &,) +include/svx/sdr/table/tablecontroller.hxx:54 + sdr::table::SvxTableController::_Bool-HasMarked() +include/svx/sdtaditm.hxx:44 + SdrTextAniDirectionItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sdtaitm.hxx:46 + SdrTextVertAdjustItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sdtaitm.hxx:70 + SdrTextHorzAdjustItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sdtakitm.hxx:88 + SdrTextAniKindItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sdtfsitm.hxx:47 + SdrTextFitToSizeTypeItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/svdedxv.hxx:222 + SdrObjEditView::class SdrPageView *-GetTextEditPageView()const +include/svx/sxcecitm.hxx:39 + SdrCaptionEscDirItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sxctitm.hxx:36 + SdrCaptionTypeItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sxekitm.hxx:41 + SdrEdgeKindItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sxmtpitm.hxx:41 + SdrMeasureTextHPosItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sxmtpitm.hxx:58 + SdrMeasureTextVPosItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +include/svx/sxmuitm.hxx:38 + SdrMeasureUnitItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const include/toolkit/controls/geometrycontrolmodel.hxx:192 OGeometryControlModel::void-fillProperties(css::uno::Sequence<css::beans::Property> &,css::uno::Sequence<css::beans::Property> &,)const include/vbahelper/vbacollectionimpl.hxx:290 @@ -166,28 +224,44 @@ include/vbahelper/vbareturntypes.hxx:41 ooo::vba::DefaultReturnHelper::T1-getValue() include/vcl/vclptr.hxx:110 VclPtr::void-~VclPtr<T>() -mysqlc/source/mysqlc_subcomponent.hxx:104 +include/vcl/weld.hxx:219 + weld::TreeView::void-append_text(const class rtl::OUString &,) +include/vcl/weld.hxx:222 + weld::TreeView::void-append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,) +mysqlc/source/mysqlc_subcomponent.hxx:66 connectivity::mysqlc::OPropertyArrayUsageHelper::void-~OPropertyArrayUsageHelper<TYPE>() sc/inc/compressedarray.hxx:72 ScCompressedArray::void-~ScCompressedArray<A, D>() +sc/source/core/opencl/formulagroupcl.cxx:856 + sc::opencl::DynamicKernelMixedArgument::_Bool-IsMixedArgument()const +sc/source/core/opencl/formulagroupcl.cxx:871 + sc::opencl::DynamicKernelMixedArgument::void-GenNumDeclRef(std::stringstream &,)const +sc/source/core/opencl/formulagroupcl.cxx:875 + sc::opencl::DynamicKernelMixedArgument::void-GenStringDeclRef(std::stringstream &,)const sc/source/core/opencl/formulagroupcl.cxx:934 - sc::opencl::DynamicKernelSlidingArgument::_Bool-NeedParallelReduction()const -sc/source/core/opencl/formulagroupcl.cxx:941 - sc::opencl::DynamicKernelSlidingArgument::void-GenSlidingWindowFunction(std::stringstream &,) -sc/source/core/opencl/formulagroupcl.cxx:943 sc::opencl::DynamicKernelSlidingArgument::std::string-GenSlidingWindowDeclRef(_Bool,)const -sc/source/core/opencl/formulagroupcl.cxx:966 +sc/source/core/opencl/formulagroupcl.cxx:957 sc::opencl::DynamicKernelSlidingArgument::size_t-GenReductionLoopHeader(std::stringstream &,_Bool &,) -sc/source/core/opencl/formulagroupcl.cxx:1219 - sc::opencl::ParallelReductionVectorRef::void-GenSlidingWindowFunction(std::stringstream &,) -sc/source/core/opencl/formulagroupcl.cxx:1398 - sc::opencl::ParallelReductionVectorRef::std::string-GenSlidingWindowDeclRef(_Bool,)const -sc/source/core/opencl/formulagroupcl.cxx:1408 +sc/source/core/opencl/formulagroupcl.cxx:1121 + sc::opencl::DynamicKernelMixedSlidingArgument::_Bool-IsMixedArgument()const +sc/source/core/opencl/formulagroupcl.cxx:1134 + sc::opencl::DynamicKernelMixedSlidingArgument::void-GenNumDeclRef(std::stringstream &,)const +sc/source/core/opencl/formulagroupcl.cxx:1138 + sc::opencl::DynamicKernelMixedSlidingArgument::void-GenStringDeclRef(std::stringstream &,)const +sc/source/core/opencl/formulagroupcl.cxx:1210 sc::opencl::ParallelReductionVectorRef::size_t-GenReductionLoopHeader(std::stringstream &,int,_Bool &,) -sc/source/core/opencl/formulagroupcl.cxx:1432 - sc::opencl::ParallelReductionVectorRef::size_t-Marshal(cl_kernel,int,int,cl_program,) +sc/source/filter/inc/lotimpop.hxx:83 + ImportLotus::class ErrCode-Read() sc/source/ui/inc/anyrefdg.hxx:220 ScRefHdlrImpl::void-dispose() +sc/source/ui/inc/docsh.hxx:302 + ScDocShell::void-CheckConfigOptions() +sc/source/ui/inc/PivotLayoutTreeList.hxx:32 + ScPivotLayoutTreeList::void-InsertEntryForItem(class ScItemValue *,sal_uLong,) +sc/source/ui/inc/prevwsh.hxx:65 + ScPreviewShell::void-AdjustPosSizePixel(const class Point &,const class Size &,) +sc/source/ui/inc/tabvwsh.hxx:193 + ScTabViewShell::void-AdjustPosSizePixel(const class Point &,const class Size &,) sc/source/ui/vba/vbacondition.hxx:39 ScVbaCondition::class rtl::OUString-Formula1() sc/source/ui/vba/vbacondition.hxx:40 @@ -254,8 +328,12 @@ sc/source/ui/vba/vbapagebreak.hxx:48 ScVbaPageBreak::void-Delete() sc/source/ui/vba/vbapagebreak.hxx:49 ScVbaPageBreak::css::uno::Reference<ov::excel::XRange>-Location() +scaddins/source/analysis/analysishelper.hxx:574 + sca::analysis::ConvertDataLinear::double-ConvertToBase(double,sal_Int16,)const sd/source/ui/inc/ShellFactory.hxx:41 sd::ShellFactory::void-~ShellFactory<ShellType>() +sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx:48 + sd::sidebar::CurrentMasterPagesSelector::void-UpdateSelection() sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx:34 sd::slidesorter::model::Enumeration::void-~Enumeration<T>() slideshow/source/engine/activities/activitiesfactory.cxx:173 @@ -276,15 +354,23 @@ slideshow/source/engine/animationfactory.cxx:442 slideshow::internal::(anonymous namespace)::GenericAnimation::void-prefetch(const slideshow::internal::AnimatableShapeSharedPtr &,const slideshow::internal::ShapeAttributeLayerSharedPtr &,) slideshow/source/engine/animationfactory.cxx:446 slideshow::internal::(anonymous namespace)::GenericAnimation::void-start(const slideshow::internal::AnimatableShapeSharedPtr &,const slideshow::internal::ShapeAttributeLayerSharedPtr &,) -sw/inc/docary.hxx:116 +starmath/inc/view.hxx:258 + SmViewShell::void-AdjustPosSizePixel(const class Point &,const class Size &,) +svx/inc/sxcikitm.hxx:39 + SdrCircKindItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +svx/inc/sxmkitm.hxx:39 + SdrMeasureKindItem::class rtl::OUString-GetValueTextByPos(sal_uInt16,)const +sw/inc/docary.hxx:114 SwVectorModifyBase::void-~SwVectorModifyBase<Value>() sw/inc/flypos.hxx:37 SwPosFlyFrame::void-~SwPosFlyFrame() -sw/inc/ring.hxx:45 +sw/inc/ring.hxx:44 sw::Ring::void-~Ring<value_type>() +sw/source/core/inc/frame.hxx:893 + SwFrame::void-dumpTopMostAsXml(xmlTextWriterPtr,)const vcl/inc/opengl/BufferObject.hxx:31 vcl::BufferObject::void-~BufferObject<TYPE, BUFFER_TYPE>() -vcl/inc/salframe.hxx:177 +vcl/inc/salframe.hxx:179 SalFrame::void-Flush(const tools::Rectangle &,) vcl/inc/sallayout.hxx:181 SalLayout::_Bool-GetBoundRect(class SalGraphics &,tools::Rectangle &,)const @@ -292,6 +378,8 @@ vcl/inc/salmenu.hxx:92 SalMenu::tools::Rectangle-GetMenuBarButtonRectPixel(sal_uInt16,class SalFrame *,) vcl/inc/salobj.hxx:46 SalObject::void-Enable(_Bool,) +vcl/inc/salprn.hxx:111 + SalPrinter::enum SalPrinterError-GetErrorCode() vcl/inc/unx/saldata.hxx:65 X11SalData::void-Init() vcl/inc/unx/saldata.hxx:68 @@ -320,24 +408,24 @@ vcl/inc/unx/saldisp.hxx:393 SalX11Display::void-Yield() vcl/inc/unx/salinst.h:47 X11SalInstance::class SalX11Display *-CreateDisplay()const -writerfilter/source/ooxml/OOXMLFactory.hxx:70 - writerfilter::ooxml::OOXMLFactory_ns::void-startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,) writerfilter/source/ooxml/OOXMLFactory.hxx:71 - writerfilter::ooxml::OOXMLFactory_ns::void-charactersAction(class writerfilter::ooxml::OOXMLFastContextHandler *,const class rtl::OUString &,) + writerfilter::ooxml::OOXMLFactory_ns::void-startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,) writerfilter/source/ooxml/OOXMLFactory.hxx:72 - writerfilter::ooxml::OOXMLFactory_ns::void-endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,) + writerfilter::ooxml::OOXMLFactory_ns::void-charactersAction(class writerfilter::ooxml::OOXMLFastContextHandler *,const class rtl::OUString &,) writerfilter/source/ooxml/OOXMLFactory.hxx:73 + writerfilter::ooxml::OOXMLFactory_ns::void-endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,) +writerfilter/source/ooxml/OOXMLFactory.hxx:74 writerfilter::ooxml::OOXMLFactory_ns::void-attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,writerfilter::Token_t,const class OOXMLValue::Pointer_t &,) -writerfilter/source/ooxml/OOXMLFactory.hxx:76 +writerfilter/source/ooxml/OOXMLFactory.hxx:77 writerfilter::ooxml::OOXMLFactory_ns::void-~OOXMLFactory_ns() writerperfect/inc/ImportFilter.hxx:178 writerperfect::detail::ImportFilterImpl::void-doRegisterHandlers(Generator &,) -xmloff/source/forms/elementimport.hxx:573 +xmloff/source/forms/elementimport.hxx:575 xmloff::OContainerImport::SvXMLImportContextRef-CreateChildContext(sal_uInt16,const class rtl::OUString &,const css::uno::Reference<css::xml::sax::XAttributeList> &,) -xmloff/source/forms/elementimport.hxx:576 +xmloff/source/forms/elementimport.hxx:578 xmloff::OContainerImport::void-EndElement() -xmloff/source/forms/elementimport.hxx:581 +xmloff/source/forms/elementimport.hxx:583 xmloff::OContainerImport::css::uno::Reference<css::beans::XPropertySet>-createElement() -xmloff/source/forms/elementimport.hxx:609 +xmloff/source/forms/elementimport.hxx:611 xmloff::OColumnImport::css::uno::Reference<css::beans::XPropertySet>-createElement() diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index a335ab5e0c76..e53c1f1d8519 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -63,7 +63,7 @@ public: MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; virtual sal_uInt16 GetValueCount() const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetEnumValue() const override; virtual void SetEnumValue( sal_uInt16 nNewVal ) override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 8abe6c5e9455..5284040fcb86 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -42,7 +42,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const override; virtual bool GetPresentation( SfxItemPresentation ePres, diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 13b68875ffc1..b3e8536bc4ed 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -47,7 +47,7 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const override; SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap) diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index fa1d79ab7ef7..536d1fd44f03 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -48,7 +48,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 59450669512b..6269d1322434 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -98,7 +98,7 @@ public: } virtual sal_uInt16 GetValueCount() const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetEnumValue() const override; virtual void SetEnumValue( sal_uInt16 nNewVal ) override; }; diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index a38cc8f39360..2a1292e4e4af 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -51,7 +51,7 @@ public: MapUnit eCoreMetric, MapUnit ePresMetric, OUString &rText, const IntlWrapper& ) const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const override; diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index dba16641e3d9..d28796abd7be 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -49,7 +49,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index 547e7a29c6e7..16a4e099bada 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -49,7 +49,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual sal_uInt16 GetValueCount() const override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 0eecef7d859a..add7e0b2c465 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -60,8 +60,8 @@ public: void RemoveValue( sal_uInt16 nValue ); virtual sal_uInt16 GetValueCount() const override; - virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const override; }; diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index e1709b1c7b02..3ce9d7d581c0 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -40,7 +40,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + OUString GetValueTextByPos( sal_uInt16 nPos ) const; virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index deca6ce4a60b..fec5963d4e7d 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -100,7 +100,7 @@ namespace sdr virtual void ForceDefaultAttributes(); // Scale the included ItemSet. - virtual void Scale(const Fraction& rScale); + void Scale(const Fraction& rScale); }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 9b0eee19a28f..6a999a78b344 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -51,7 +51,7 @@ public: SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) override; SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) override; - SVX_DLLPRIVATE virtual bool HasMarked(); + SVX_DLLPRIVATE bool HasMarked(); SVX_DLLPRIVATE virtual bool DeleteMarked() override; SVX_DLLPRIVATE virtual void onSelectionHasChanged() override; diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index b767e0efa376..7a0b939e4fa0 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -41,7 +41,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index b1af7cad8b30..c56952cbf86a 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -43,7 +43,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; @@ -67,7 +67,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 358fa8d39815..09f990abcb9a 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -85,7 +85,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 6fd994e9514c..939e2ab9cdc9 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -44,7 +44,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; virtual bool HasBoolValue() const override; virtual bool GetBoolValue() const override; diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 7a93a5590c80..2c8710a90af0 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -219,7 +219,7 @@ public: SdrTextObj* GetTextEditObject() const { return mxTextEditObj.get(); } // info about TextEditPageView. Default is 0L. - virtual SdrPageView* GetTextEditPageView() const; + SdrPageView* GetTextEditPageView() const; // Current window of the outliners. void SetTextEditWin(vcl::Window* pWin); diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 0fb29574ecd2..fb7d898fcde5 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -36,7 +36,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 3; } - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 92e90d1b3247..9ca7f5be2a8e 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -33,7 +33,7 @@ public: SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; virtual sal_uInt16 GetValueCount() const override; // { return 4; } - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 96de5600ad11..b779dedf029e 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -38,7 +38,7 @@ public: virtual sal_uInt16 GetValueCount() const override; // { return 5; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 7abaeac5c9a6..d16605ba17c4 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -38,7 +38,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; @@ -55,7 +55,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 103b6cc4bd46..996b195f5b07 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -35,7 +35,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 0b3dc6122547..90d834bf10ff 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -80,7 +80,7 @@ public: virtual ~ImportLotus() override; ErrCode parse(); //parse + CalcAfterLoad - virtual ErrCode Read(); + ErrCode Read(); ErrCode Read( SvStream& ); // special for *.fm3 files }; diff --git a/sc/source/ui/inc/PivotLayoutTreeList.hxx b/sc/source/ui/inc/PivotLayoutTreeList.hxx index 6fb9430e1267..e658aac62738 100644 --- a/sc/source/ui/inc/PivotLayoutTreeList.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeList.hxx @@ -29,7 +29,7 @@ public: protected: virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) override; - virtual void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition); + void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition); virtual void KeyInput(const KeyEvent& rKeyEvent) override; }; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index dd0c026e8726..8b53fa802fed 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -299,7 +299,7 @@ public: * Called when the Options dialog is dismissed with the OK button, to * handle potentially conflicting option settings. */ - virtual void CheckConfigOptions(); + void CheckConfigOptions(); void PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index fd484a619bab..82a4b348f719 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -62,7 +62,7 @@ private: protected: virtual void Activate(bool bMDI) override; - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); + void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); virtual void InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ) override; virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 2aaaef3a9af0..a5c7270dc9cd 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -571,7 +571,7 @@ public: // converts fVal from this unit to rFrom unit // throws exception if not from same class // this implementation is for proportional cases only - virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const; + double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const; virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const override; }; diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index f20bf2ac2803..d4a7a4f8eb6c 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -45,7 +45,7 @@ public: used by the currently selected page of the document in the center pane. */ - virtual void UpdateSelection(); + void UpdateSelection(); /** Copy all master pages that are to be shown into the given list. */ diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index b26d75b40ff7..c651227806d4 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -36,7 +36,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index a61ea93d0848..2d9eb52041d4 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -36,7 +36,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + OUString GetValueTextByPos(sal_uInt16 nPos) const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index f576b59b4232..ee21f12bd6f0 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -890,7 +890,7 @@ public: public: // if writer is NULL, dumps the layout structure as XML in layout.xml virtual void dumpAsXml(xmlTextWriterPtr writer = nullptr) const; - virtual void dumpTopMostAsXml(xmlTextWriterPtr writer = nullptr) const; + void dumpTopMostAsXml(xmlTextWriterPtr writer = nullptr) const; void dumpInfosAsXml(xmlTextWriterPtr writer) const; virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const; void dumpChildrenAsXml(xmlTextWriterPtr writer) const; |