diff options
-rw-r--r-- | compilerplugins/clang/unnecessaryvirtual.results | 26 | ||||
-rw-r--r-- | include/sfx2/basedlgs.hxx | 2 | ||||
-rw-r--r-- | include/svtools/simptabl.hxx | 2 | ||||
-rw-r--r-- | include/vcl/treelistbox.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/inc/xestyle.hxx | 2 | ||||
-rw-r--r-- | vcl/source/treelist/treelistbox.cxx | 11 |
6 files changed, 19 insertions, 25 deletions
diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index fc9f10ad6e12..054f950a361b 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -58,7 +58,7 @@ include/basegfx/utils/unopolypolygon.hxx:97 void basegfx::unotools::UnoPolyPolygon::modifying()const include/comphelper/interaction.hxx:54 void comphelper::OInteraction::select() -include/comphelper/proparrhlp.hxx:87 +include/comphelper/proparrhlp.hxx:83 class cppu::IPropertyArrayHelper * comphelper::OAggregationArrayUsageHelper::createArrayHelper()const include/comphelper/servicedecl.hxx:164 class rtl::OUString comphelper::service_decl::detail::OwnServiceImpl::getImplementationName() @@ -66,18 +66,14 @@ include/comphelper/servicedecl.hxx:167 unsigned char comphelper::service_decl::detail::OwnServiceImpl::supportsService(const class rtl::OUString &,) include/comphelper/servicedecl.hxx:171 class com::sun::star::uno::Sequence<class rtl::OUString> comphelper::service_decl::detail::OwnServiceImpl::getSupportedServiceNames() -include/comphelper/solarmutex.hxx:57 +include/comphelper/solarmutex.hxx:59 _Bool comphelper::SolarMutex::tryToAcquire() 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 +include/comphelper/weakeventlistener.hxx:119 void comphelper::OWeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,) -include/sfx2/templatelocalview.hxx:205 - void SfxTemplateLocalView::reload() -include/sfx2/templatelocalview.hxx:207 - void SfxTemplateLocalView::showAllTemplates() -include/sfx2/thumbnailview.hxx:338 - void SfxThumbnailView::Clear() +include/sfx2/basedlgs.hxx:91 + void SfxModelessDialog::FillInfo(struct SfxChildWinInfo &,)const include/svl/svdde.hxx:237 class DdeData * DdeTopic::Get(enum SotClipboardFormatId,) include/svl/svdde.hxx:238 @@ -90,6 +86,8 @@ include/svl/svdde.hxx:244 _Bool DdeTopic::StartAdviseLoop() include/svl/svdde.hxx:300 void DdeService::~DdeService() +include/svtools/simptabl.hxx:88 + int SvSimpleTable::ColCompare(class SvTreeListEntry *,class SvTreeListEntry *,) include/toolkit/controls/geometrycontrolmodel.hxx:184 void OGeometryControlModel::fillProperties(class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,)const include/vbahelper/vbacollectionimpl.hxx:290 @@ -116,7 +114,9 @@ include/vbahelper/vbareturntypes.hxx:41 type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue() include/vcl/customweld.hxx:41 class rtl::OUString weld::CustomWidgetController::GetHelpText()const -include/vcl/weld.hxx:95 +include/vcl/treelistbox.hxx:471 + class SvTreeListEntry * SvTreeListBox::CreateEntry()const +include/vcl/weld.hxx:96 void weld::Widget::set_visible(_Bool,) sc/source/core/opencl/formulagroupcl.cxx:1053 _Bool sc::opencl::DynamicKernelSlidingArgument::NeedParallelReduction()const @@ -128,10 +128,10 @@ sc/source/core/opencl/formulagroupcl.cxx:1520 class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > sc::opencl::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool,)const sc/source/core/opencl/formulagroupcl.cxx:1555 unsigned long sc::opencl::ParallelReductionVectorRef::Marshal(struct _cl_kernel *,int,int,struct _cl_program *,) -sc/source/ui/inc/anyrefdg.hxx:222 +sc/source/filter/inc/xestyle.hxx:703 + void XclExpDxf::SaveXmlExt(class XclExpXmlStream &,) +sc/source/ui/inc/anyrefdg.hxx:220 void ScRefHdlrImpl::dispose() -sc/source/ui/inc/namemgrtable.hxx:42 - void ScRangeManagerTable::InitListener::~InitListener() sc/source/ui/vba/vbacondition.hxx:41 class rtl::OUString ScVbaCondition::Formula1() sc/source/ui/vba/vbacondition.hxx:42 diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index d2646af1d9e5..9f712bd8632b 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -88,7 +88,7 @@ protected: virtual void StateChanged( StateChangedType nStateChange ) override; public: - virtual void FillInfo(SfxChildWinInfo&) const; + void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo const * pInfo); virtual bool EventNotify( NotifyEvent& rNEvt ) override; SfxBindings& GetBindings() diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index d73ad7bfcfa6..1238c7c051d6 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -85,7 +85,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) override; - virtual sal_Int32 ColCompare(SvTreeListEntry*,SvTreeListEntry*); + sal_Int32 ColCompare(SvTreeListEntry*,SvTreeListEntry*); public: SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index f0ac85bd3980..f99219d5f1ff 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -468,7 +468,6 @@ public: void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ); - virtual SvTreeListEntry* CreateEntry() const; // To create new Entries // Return value: TRISTATE_TRUE == Ok, TRISTATE_FALSE == Cancel, TRISTATE_INDET == Ok and Make visible moved entry virtual TriState NotifyMoving( diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index e5dfb8f2939b..bd805ba66147 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -700,7 +700,7 @@ public: virtual ~XclExpDxf() override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; - virtual void SaveXmlExt( XclExpXmlStream& rStrm); + void SaveXmlExt( XclExpXmlStream& rStrm); private: std::unique_ptr<XclExpCellAlign> mpAlign; diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index e2271167a24a..007036b1012b 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -918,11 +918,6 @@ void SvTreeListBox::ForbidEmptyText() mpImpl->m_bIsEmptyTextAllowed = false; } -SvTreeListEntry* SvTreeListBox::CreateEntry() const -{ - return new SvTreeListEntry; -} - const void* SvTreeListBox::FirstSearchEntry( OUString& _rEntryText ) const { SvTreeListEntry* pEntry = GetCurEntry(); @@ -1587,7 +1582,7 @@ SvTreeListEntry* SvTreeListBox::InsertEntry( aCurInsertedExpBmp = rDefExpBmp; aCurInsertedColBmp = rDefColBmp; - SvTreeListEntry* pEntry = CreateEntry(); + SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->SetUserData( pUser ); InitEntry( pEntry, rText, rDefColBmp, rDefExpBmp, eButtonKind ); pEntry->EnableChildrenOnDemand( bChildrenOnDemand ); @@ -1615,7 +1610,7 @@ SvTreeListEntry* SvTreeListBox::InsertEntry( const OUString& rText, aCurInsertedExpBmp = aExpEntryBmp; aCurInsertedColBmp = aCollEntryBmp; - SvTreeListEntry* pEntry = CreateEntry(); + SvTreeListEntry* pEntry = new SvTreeListEntry; pEntry->SetUserData( pUser ); InitEntry( pEntry, rText, aCollEntryBmp, aExpEntryBmp, eButtonKind ); @@ -1801,7 +1796,7 @@ SvTreeListEntry* SvTreeListBox::CloneEntry( SvTreeListEntry* pSource ) SvLBoxButton* pButtonItem = static_cast<SvLBoxButton*>(pSource->GetFirstItem(SvLBoxItemType::Button)); if( pButtonItem ) eButtonKind = pButtonItem->GetKind(); - SvTreeListEntry* pClone = CreateEntry(); + SvTreeListEntry* pClone = new SvTreeListEntry; InitEntry( pClone, aStr, aCollEntryBmp, aExpEntryBmp, eButtonKind ); pClone->SvTreeListEntry::Clone( pSource ); pClone->EnableChildrenOnDemand( pSource->HasChildrenOnDemand() ); |