[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/svl include/svtools include/svx sc/source sd/source svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Aug 8 07:30:59 UTC 2018
compilerplugins/clang/unnecessaryvirtual-dead.results | 10 -
compilerplugins/clang/unnecessaryvirtual.results | 156 +++++++++++-------
include/svl/undo.hxx | 42 ++--
include/svtools/treelistbox.hxx | 2
include/svx/sdr/contact/objectcontact.hxx | 14 -
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 2
sd/source/ui/framework/module/SlideSorterModule.hxx | 2
svx/source/inc/eventhandler.hxx | 62 -------
svx/source/sdr/contact/objectcontact.cxx | 24 --
svx/source/sdr/contact/objectcontactofpageview.cxx | 13 -
svx/source/sdr/event/eventhandler.cxx | 93 ----------
11 files changed, 125 insertions(+), 295 deletions(-)
New commits:
commit 1444bd72006fec7ebcd3c5df2399da26ad3b1466
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Aug 7 21:44:48 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Aug 8 09:30:45 2018 +0200
loplugin:unnecessaryvirtual
Change-Id: I3fe82f6e3aad299fe42d6256c0deaba1339df0c1
Reviewed-on: https://gerrit.libreoffice.org/58708
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 6c9fef9d3ab8..32e9137f6fcf 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -8,18 +8,14 @@ include/canvas/base/graphicdevicebase.hxx:302
void canvas::GraphicDeviceBase::removePropertyChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertyChangeListener> &,)
include/canvas/base/graphicdevicebase.hxx:315
void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,)
-include/svtools/valueset.hxx:498
- void SvtValueSet::UserDraw(const class UserDrawEvent &,)
-slideshow/source/engine/animationfactory.cxx:442
+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
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
vcl/inc/salmenu.hxx:80
void SalMenu::RemoveMenuBarButton(unsigned short,)
-vcl/inc/salobj.hxx:46
+vcl/inc/salobj.hxx:48
void SalObject::Enable(_Bool,)
-vcl/inc/unx/saldata.hxx:68
- void X11SalData::initNWF()
vcl/inc/unx/saldata.hxx:69
void X11SalData::deInitNWF()
writerfilter/source/ooxml/OOXMLFactory.hxx:71
@@ -29,4 +25,4 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:72
writerfilter/source/ooxml/OOXMLFactory.hxx:73
void writerfilter::ooxml::OOXMLFactory_ns::endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
writerfilter/source/ooxml/OOXMLFactory.hxx:74
- void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class std::shared_ptr<class writerfilter::ooxml::OOXMLValue> &,)
+ void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class tools::SvRef<class writerfilter::ooxml::OOXMLValue> &,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results
index 04c9dbad7855..8cf7943f5d66 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -64,6 +64,8 @@ include/comphelper/servicedecl.hxx:168
unsigned char comphelper::service_decl::detail::OwnServiceImpl::supportsService(const class rtl::OUString &,)
include/comphelper/servicedecl.hxx:172
class com::sun::star::uno::Sequence<class rtl::OUString> comphelper::service_decl::detail::OwnServiceImpl::getSupportedServiceNames()
+include/comphelper/solarmutex.hxx:53
+ _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:118
@@ -114,16 +116,52 @@ include/svl/svdde.hxx:251
_Bool DdeTopic::StartAdviseLoop()
include/svl/svdde.hxx:307
void DdeService::~DdeService()
-include/svtools/treelistbox.hxx:722
+include/svl/undo.hxx:202
+ void SfxUndoManager::SetMaxUndoActionCount(unsigned long,)
+include/svl/undo.hxx:205
+ class rtl::OUString SfxUndoManager::GetUndoActionComment(unsigned long,const _Bool,)const
+include/svl/undo.hxx:206
+ class SfxUndoAction * SfxUndoManager::GetUndoAction(unsigned long,)const
+include/svl/undo.hxx:210
+ class rtl::OUString SfxUndoManager::GetRedoActionComment(unsigned long,const _Bool,)const
+include/svl/undo.hxx:211
+ class SfxUndoAction * SfxUndoManager::GetRedoAction()const
+include/svl/undo.hxx:231
+ void SfxUndoManager::Reset()
+include/svl/undo.hxx:234
+ _Bool SfxUndoManager::IsDoing()const
+include/svl/undo.hxx:235
+ unsigned long SfxUndoManager::GetRepeatActionCount()const
+include/svl/undo.hxx:236
+ class rtl::OUString SfxUndoManager::GetRepeatActionComment(class SfxRepeatTarget &,)const
+include/svl/undo.hxx:237
+ _Bool SfxUndoManager::Repeat(class SfxRepeatTarget &,)
+include/svl/undo.hxx:238
+ _Bool SfxUndoManager::CanRepeat(class SfxRepeatTarget &,)const
+include/svl/undo.hxx:244
+ unsigned long SfxUndoManager::LeaveListAction()
+include/svl/undo.hxx:261
+ unsigned long SfxUndoManager::LeaveAndMergeListAction()
+include/svl/undo.hxx:263
+ _Bool SfxUndoManager::IsInListAction()const
+include/svl/undo.hxx:265
+ unsigned long SfxUndoManager::GetListActionDepth()const
+include/svl/undo.hxx:267
+ void SfxUndoManager::RemoveLastUndoAction()
+include/svl/undo.hxx:276
+ void SfxUndoManager::EnableUndo(_Bool,)
+include/svl/undo.hxx:280
+ _Bool SfxUndoManager::IsUndoEnabled()const
+include/svl/undo.hxx:282
+ void SfxUndoManager::AddUndoListener(class SfxUndoListener &,)
+include/svl/undo.hxx:283
+ void SfxUndoManager::RemoveUndoListener(class SfxUndoListener &,)
+include/svl/undo.hxx:284
+ _Bool SfxUndoManager::IsEmptyActions()const
+include/svtools/treelistbox.hxx:718
void SvTreeListBox::SelectAll(_Bool,_Bool,)
-include/svtools/valueset.hxx:497
+include/svtools/valueset.hxx:490
void SvtValueSet::Select()
-include/svtools/valueset.hxx:498
- void SvtValueSet::UserDraw(const class UserDrawEvent &,)
-include/svx/dialcontrol.hxx:234
- void svx::SvxDialControl::HandleMouseEvent(const class Point &,_Bool,)
-include/svx/svdobj.hxx:346
- class SdrPage * SdrObject::getSdrPageFromSdrObject()const
include/toolkit/controls/geometrycontrolmodel.hxx:191
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
@@ -148,14 +186,16 @@ 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/weld.hxx:298
+include/vcl/weld.hxx:304
void weld::TreeView::append_text(const class rtl::OUString &,)
-include/vcl/weld.hxx:301
+include/vcl/weld.hxx:307
void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,)
-sc/source/core/opencl/formulagroupcl.cxx:870
- void sc::opencl::DynamicKernelMixedArgument::GenNumDeclRef(class std::basic_stringstream<char> &,)const
+sc/source/core/opencl/formulagroupcl.cxx:909
+ void sc::opencl::DynamicKernelMixedArgument::GenNumDeclRef(class std::__cxx11::basic_stringstream<char> &,)const
sc/source/ui/inc/anyrefdg.hxx:219
void ScRefHdlrImpl::dispose()
+sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:47
+ void ScStatisticsTwoVariableDialog::ValidateDialogInput()
sc/source/ui/vba/vbacondition.hxx:39
class rtl::OUString ScVbaCondition::Formula1()
sc/source/ui/vba/vbacondition.hxx:40
@@ -220,32 +260,34 @@ 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/framework/module/SlideSorterModule.hxx:63
+ void sd::framework::SlideSorterModule::SaveResourceState()
slideshow/source/engine/activities/activitiesfactory.cxx:173
void slideshow::internal::(anonymous namespace)::FromToByActivity::startAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:241
+slideshow/source/engine/activities/activitiesfactory.cxx:242
void slideshow::internal::(anonymous namespace)::FromToByActivity::endAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:331
+slideshow/source/engine/activities/activitiesfactory.cxx:332
void slideshow::internal::(anonymous namespace)::FromToByActivity::performEnd()
-slideshow/source/engine/activities/activitiesfactory.cxx:344
+slideshow/source/engine/activities/activitiesfactory.cxx:345
void slideshow::internal::(anonymous namespace)::FromToByActivity::dispose()
-slideshow/source/engine/activities/activitiesfactory.cxx:526
+slideshow/source/engine/activities/activitiesfactory.cxx:527
void slideshow::internal::(anonymous namespace)::ValuesActivity::startAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:537
+slideshow/source/engine/activities/activitiesfactory.cxx:538
void slideshow::internal::(anonymous namespace)::ValuesActivity::endAnimation()
-slideshow/source/engine/activities/activitiesfactory.cxx:582
+slideshow/source/engine/activities/activitiesfactory.cxx:583
void slideshow::internal::(anonymous namespace)::ValuesActivity::performEnd()
-slideshow/source/engine/animationfactory.cxx:442
+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> &,)
-slideshow/source/engine/animationfactory.cxx:446
+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> &,)
+svx/source/inc/eventhandler.hxx:50
+ void sdr::event::BaseEvent::~BaseEvent()
sw/inc/flypos.hxx:37
void SwPosFlyFrame::~SwPosFlyFrame()
-vcl/inc/headless/svpgdi.hxx:227
- void SvpSalGraphics::drawBitmap(const struct SalTwoRect &,struct BitmapBuffer *,)
+vcl/inc/qt5/Qt5Frame.hxx:90
+ void Qt5Frame::InitSvpSalGraphics(class SvpSalGraphics *,)
vcl/inc/salframe.hxx:135
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
-vcl/inc/salframe.hxx:179
- void SalFrame::Flush(const class tools::Rectangle &,)
vcl/inc/sallayout.hxx:185
_Bool SalLayout::GetBoundRect(class SalGraphics &,class tools::Rectangle &,)const
vcl/inc/salmenu.hxx:79
@@ -254,42 +296,42 @@ vcl/inc/salmenu.hxx:80
void SalMenu::RemoveMenuBarButton(unsigned short,)
vcl/inc/salmenu.hxx:92
class tools::Rectangle SalMenu::GetMenuBarButtonRectPixel(unsigned short,class SalFrame *,)
-vcl/inc/salobj.hxx:46
+vcl/inc/salobj.hxx:48
void SalObject::Enable(_Bool,)
vcl/inc/salprn.hxx:112
enum SalPrinterError SalPrinter::GetErrorCode()
vcl/inc/unx/gtk/gtkdata.hxx:164
int GtkSalDisplay::CaptureMouse(class SalFrame *,)
-vcl/inc/unx/saldata.hxx:65
- void X11SalData::Init()
-vcl/inc/unx/saldata.hxx:68
- void X11SalData::initNWF()
-vcl/inc/unx/saldata.hxx:69
- void X11SalData::deInitNWF()
-vcl/inc/unx/saldisp.hxx:166
- void SalXLib::~SalXLib()
-vcl/inc/unx/saldisp.hxx:167
- void SalXLib::Init()
-vcl/inc/unx/saldisp.hxx:169
- _Bool SalXLib::Yield(_Bool,_Bool,)
-vcl/inc/unx/saldisp.hxx:170
- void SalXLib::Wakeup()
-vcl/inc/unx/saldisp.hxx:173
- void SalXLib::Insert(int,void *,int (*)(int, void *),int (*)(int, void *),int (*)(int, void *),)
-vcl/inc/unx/saldisp.hxx:177
- void SalXLib::Remove(int,)
-vcl/inc/unx/saldisp.hxx:179
- void SalXLib::StartTimer(unsigned long,)
-vcl/inc/unx/saldisp.hxx:180
- void SalXLib::StopTimer()
-vcl/inc/unx/saldisp.hxx:182
- _Bool SalXLib::CheckTimeout(_Bool,)
-vcl/inc/unx/saldisp.hxx:393
- void SalX11Display::Yield()
-vcl/inc/unx/salframe.h:210
- void X11SalFrame::updateGraphics(_Bool,)
-vcl/inc/unx/salinst.h:47
- class SalX11Display * X11SalInstance::CreateDisplay()const
+vcl/qt5/Qt5Widget.cxx:401
+ void Qt5Widget::focusInEvent(class QFocusEvent *,)
+vcl/qt5/Qt5Widget.cxx:406
+ void Qt5Widget::focusOutEvent(class QFocusEvent *,)
+vcl/qt5/Qt5Widget.cxx:411
+ void Qt5Widget::keyPressEvent(class QKeyEvent *,)
+vcl/qt5/Qt5Widget.cxx:416
+ void Qt5Widget::keyReleaseEvent(class QKeyEvent *,)
+vcl/qt5/Qt5Widget.cxx:421
+ void Qt5Widget::mouseMoveEvent(class QMouseEvent *,)
+vcl/qt5/Qt5Widget.cxx:426
+ void Qt5Widget::mousePressEvent(class QMouseEvent *,)
+vcl/qt5/Qt5Widget.cxx:431
+ void Qt5Widget::mouseReleaseEvent(class QMouseEvent *,)
+vcl/qt5/Qt5Widget.cxx:436
+ void Qt5Widget::moveEvent(class QMoveEvent *,)
+vcl/qt5/Qt5Widget.cxx:438
+ void Qt5Widget::paintEvent(class QPaintEvent *,)
+vcl/qt5/Qt5Widget.cxx:443
+ void Qt5Widget::resizeEvent(class QResizeEvent *,)
+vcl/qt5/Qt5Widget.cxx:448
+ void Qt5Widget::showEvent(class QShowEvent *,)
+vcl/qt5/Qt5Widget.cxx:450
+ void Qt5Widget::wheelEvent(class QWheelEvent *,)
+vcl/qt5/Qt5Widget.cxx:452
+ void Qt5Widget::closeEvent(class QCloseEvent *,)
+workdir/../vcl/inc/qt5/Qt5FilePicker.hxx:122
+ void Qt5FilePicker::disposing(const struct com::sun::star::lang::EventObject &,)
+workdir/../vcl/unx/kde4/KDE4FilePicker.hxx:137
+ void KDE4FilePicker::disposing(const struct com::sun::star::lang::EventObject &,)
writerfilter/source/ooxml/OOXMLFactory.hxx:71
void writerfilter::ooxml::OOXMLFactory_ns::startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
writerfilter/source/ooxml/OOXMLFactory.hxx:72
@@ -297,9 +339,7 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:72
writerfilter/source/ooxml/OOXMLFactory.hxx:73
void writerfilter::ooxml::OOXMLFactory_ns::endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
writerfilter/source/ooxml/OOXMLFactory.hxx:74
- void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class std::shared_ptr<class writerfilter::ooxml::OOXMLValue> &,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:77
- void writerfilter::ooxml::OOXMLFactory_ns::~OOXMLFactory_ns()
+ void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class tools::SvRef<class writerfilter::ooxml::OOXMLValue> &,)
xmloff/source/forms/elementimport.hxx:575
class rtl::Reference<class SvXMLImportContext> xmloff::OContainerImport::CreateChildContext(unsigned short,const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::xml::sax::XAttributeList> &,)
xmloff/source/forms/elementimport.hxx:578
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index fea14a7b6bb1..434124373666 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -199,16 +199,16 @@ public:
SfxUndoManager( size_t nMaxUndoActionCount = 20 );
virtual ~SfxUndoManager();
- virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount );
+ void SetMaxUndoActionCount( size_t nMaxUndoActionCount );
virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false );
virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const;
- virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
- virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const;
+ OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+ SfxUndoAction* GetUndoAction( size_t nNo=0 ) const;
/// Get info about all undo actions (comment, view shell id, etc.)
OUString GetUndoActionsInfo() const;
virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const;
- virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
- virtual SfxUndoAction* GetRedoAction() const;
+ OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+ SfxUndoAction* GetRedoAction() const;
/// Get info about all redo actions (comment, view shell id, etc.)
OUString GetRedoActionsInfo() const;
virtual bool Undo();
@@ -228,20 +228,20 @@ public:
followed by <code>Clear()</code>. The only difference to this calling sequence is that Reset is an
atomic operation, also resulting in only one notification.
*/
- virtual void Reset();
+ void Reset();
/** determines whether an Undo or Redo is currently running
*/
- virtual bool IsDoing() const;
- virtual size_t GetRepeatActionCount() const;
- virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const;
- virtual bool Repeat( SfxRepeatTarget &rTarget );
- virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const;
+ bool IsDoing() const;
+ size_t GetRepeatActionCount() const;
+ OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const;
+ bool Repeat( SfxRepeatTarget &rTarget );
+ bool CanRepeat( SfxRepeatTarget &rTarget ) const;
virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, ViewShellId nViewShellId);
/** Leaves the list action entered with EnterListAction
@return the number of the sub actions in the list which has just been left. Note that in case no such
actions exist, the list action does not contribute to the Undo stack, but is silently removed.
*/
- virtual size_t LeaveListAction();
+ size_t LeaveListAction();
/** Leaves the list action entered with EnterListAction, and forcefully merges the previous
action on the stack into the newly created list action.
@@ -258,13 +258,13 @@ public:
@return the number of the sub actions in the list which has just been left. Note that in case no such
actions exist, the list action does not contribute to the Undo stack, but is silently removed.
*/
- virtual size_t LeaveAndMergeListAction();
+ size_t LeaveAndMergeListAction();
/// determines whether we're within a ListAction context, i.e. a LeaveListAction/LeaveAndMergeListAction call is pending
- virtual bool IsInListAction() const;
+ bool IsInListAction() const;
/// Determines how many nested list actions are currently open
- virtual size_t GetListActionDepth() const;
+ size_t GetListActionDepth() const;
/** Clears the redo stack and removes the top undo action */
- virtual void RemoveLastUndoAction();
+ void RemoveLastUndoAction();
/** enables (true) or disables (false) recording of undo actions
If undo actions are added while undo is disabled, they are deleted.
@@ -273,15 +273,15 @@ public:
Multiple calls to <code>EnableUndo</code> are not cumulative. That is, calling <code>EnableUndo( false )</code>
twice, and then calling <code>EnableUndo( true )</code> means that Undo is enable afterwards.
*/
- virtual void EnableUndo( bool bEnable );
+ void EnableUndo( bool bEnable );
/// returns true if undo is currently enabled.
/// This returns false if undo was disabled using EnableUndo( false ) and
/// also during the runtime of the Undo() and Redo() methods.
- virtual bool IsUndoEnabled() const;
+ bool IsUndoEnabled() const;
/// Adds a new listener to be notified about changes in the UndoManager's state
- virtual void AddUndoListener( SfxUndoListener& i_listener );
- virtual void RemoveUndoListener( SfxUndoListener& i_listener );
- virtual bool IsEmptyActions() const;
+ void AddUndoListener( SfxUndoListener& i_listener );
+ void RemoveUndoListener( SfxUndoListener& i_listener );
+ bool IsEmptyActions() const;
/** marks the current top-level element of the Undo stack, and returns a unique ID for it
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 248e9d8d4e80..ee6fff1a7d91 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -715,7 +715,7 @@ public:
virtual bool Collapse( SvTreeListEntry* pParent );
virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true );
sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect );
- virtual void SelectAll( bool bSelect, bool bPaint = true );
+ void SelectAll( bool bSelect, bool bPaint = true );
void SetCurEntry( SvTreeListEntry* _pEntry );
SvTreeListEntry* GetCurEntry() const;
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index ceb14e4f4e79..7e9f0c2ae523 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -44,7 +44,7 @@ protected:
virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0;
virtual const char* GetUndoNameId() = 0;
virtual bool InputRangesValid();
- virtual void ValidateDialogInput();
+ void ValidateDialogInput();
// Widgets
VclPtr<FixedText> mpVariable1RangeLabel;
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
index c5431ad17ad7..5102d9108059 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -60,7 +60,7 @@ public:
*/
void AddActiveMainView (const OUString& rsMainViewURL);
bool IsResourceActive (const OUString& rsMainViewURL);
- virtual void SaveResourceState();
+ void SaveResourceState();
virtual void SAL_CALL disposing() override;
commit 46449722030066473fef54b9766a3bafccef4e25
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Aug 7 21:14:34 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Aug 8 09:30:28 2018 +0200
the TimeEventHandler stuff is dead
ever since
commit c760d61bad637bf178566884039dd07d81ab17ed
Date: Fri Jul 27 15:28:44 2018 +0200
remove SdrGrafObj::IsSwappedOut
Change-Id: I68c98449b98a3ac5da3bf26917ad2a76226f470c
Reviewed-on: https://gerrit.libreoffice.org/58707
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index d2bf55036946..eaf74e3dc0ed 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -30,10 +30,6 @@ namespace tools { class Rectangle; }
class SdrPageView;
class OutputDevice;
-namespace sdr { namespace event {
- class TimerEventHandler;
-}}
-
namespace basegfx {
class B2DRange;
class B2DHomMatrix;
@@ -67,9 +63,6 @@ private:
// support animatedSwitchPrimitives
sdr::animation::primitiveAnimator maPrimitiveAnimator;
- // the EventHandler for e.g. asynchronious loading of graphics
- std::unique_ptr<sdr::event::TimerEventHandler> mpEventHandler;
-
// The redirector. If set it is used to pipe all supported calls
// to the redirector
ViewObjectContactRedirector* mpViewObjectContactRedirector;
@@ -129,13 +122,6 @@ public:
// method to get the primitiveAnimator
sdr::animation::primitiveAnimator& getPrimitiveAnimator() { return maPrimitiveAnimator; }
- // method to get the EventHandler. It will
- // return a existing one or create a new one using CreateEventHandler().
- sdr::event::TimerEventHandler& GetEventHandler() const;
-
- // test if there is an EventHandler without creating one on demand
- bool HasEventHandler() const;
-
// check if text animation is allowed. Default is sal_true.
virtual bool IsTextAnimationAllowed() const;
diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx
index c8a5da50a2f2..83736c543d39 100644
--- a/svx/source/inc/eventhandler.hxx
+++ b/svx/source/inc/eventhandler.hxx
@@ -26,68 +26,6 @@
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
-namespace sdr
-{
- namespace event
- {
- class BaseEvent;
- class TimerEventHandler;
- } // end of namespace event
-} // end of namespace sdr
-
-namespace sdr
-{
- namespace event
- {
- class BaseEvent
- {
- // the EventHandler this event is registered at
- TimerEventHandler& mrEventHandler;
-
- public:
- BaseEvent(TimerEventHandler& rEventHandler);
-
- virtual ~BaseEvent();
-
- // the called method if the event is triggered
- virtual void ExecuteEvent() = 0;
- };
- } // end of namespace event
-} // end of namespace sdr
-
-namespace sdr
-{
- namespace event
- {
- class TimerEventHandler : public Idle
- {
- ::std::vector< BaseEvent* > maVector;
-
- // to allow BaseEvents to use the add/remove functionality
- friend class BaseEvent;
-
- // methods to add/remove events. These are private since
- // they are used from BaseEvent only.
- void AddEvent(BaseEvent& rBaseEvent);
- void RemoveEvent(BaseEvent& rBaseEvent);
-
- // access to a event, 0L when no more events
- BaseEvent* GetEvent();
-
- public:
- TimerEventHandler();
- ~TimerEventHandler() override;
-
- bool IsEmpty() const;
-
- // The timer when it is triggered; from class Timer
- virtual void Invoke() override;
-
- // reset the timer
- void Restart();
- };
- } // end of namespace event
-} // end of namespace sdr
#endif // INCLUDED_SVX_SOURCE_INC_EVENTHANDLER_HXX
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 8085cc0e3721..2aa2655cac22 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -34,7 +34,6 @@ namespace sdr { namespace contact {
ObjectContact::ObjectContact()
: maViewObjectContactVector(),
maPrimitiveAnimator(),
- mpEventHandler(nullptr),
mpViewObjectContactRedirector(nullptr),
maViewInformation2D(uno::Sequence< beans::PropertyValue >()),
mbIsPreviewRenderer(false)
@@ -64,10 +63,6 @@ ObjectContact::~ObjectContact() COVERITY_NOEXCEPT_FALSE
// assert when there were new entries added during deletion
DBG_ASSERT(maViewObjectContactVector.empty(), "Corrupted ViewObjectContactList (!)");
-
- // delete the EventHandler. This will destroy all still contained events.
- mpEventHandler.reset();
- // If there are still Events registered, something has went wrong
}
// LazyInvalidate request. Default implementation directly handles
@@ -139,25 +134,6 @@ bool ObjectContact::AreGluePointsVisible() const
return false;
}
-// method to get the primitiveAnimator
-
-// method to get the EventHandler. It will
-// return a existing one or create a new one using CreateEventHandler().
-sdr::event::TimerEventHandler& ObjectContact::GetEventHandler() const
-{
- if(!HasEventHandler())
- {
- const_cast< ObjectContact* >(this)->mpEventHandler.reset( new sdr::event::TimerEventHandler() );
- }
- return *mpEventHandler;
-}
-
-// test if there is an EventHandler without creating one on demand
-bool ObjectContact::HasEventHandler() const
-{
- return (nullptr != mpEventHandler);
-}
-
// check if text animation is allowed. Default is sal_true.
bool ObjectContact::IsTextAnimationAllowed() const
{
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index bbd8f48a4c13..281f304d3829 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -126,19 +126,6 @@ namespace sdr
DoProcessDisplay(rDisplayInfo);
}
}
-
- // after paint take care of the evtl. scheduled asynchronious commands.
- // Do this by resetting the timer contained there. Thus, after the paint
- // that timer will be triggered and the events will be executed.
- if(HasEventHandler())
- {
- sdr::event::TimerEventHandler& rEventHandler = GetEventHandler();
-
- if(!rEventHandler.IsEmpty())
- {
- rEventHandler.Restart();
- }
- }
}
// Process the whole displaying. Only use given DisplayInfo, do not access other
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index 990c10defa0e..f8fcdb10ac3f 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -26,99 +26,6 @@ namespace sdr
{
namespace event
{
- BaseEvent::BaseEvent(TimerEventHandler& rEventHandler)
- : mrEventHandler(rEventHandler)
- {
- mrEventHandler.AddEvent(*this);
- }
-
- BaseEvent::~BaseEvent()
- {
- mrEventHandler.RemoveEvent(*this);
- }
- } // end of namespace mixer
-} // end of namespace sdr
-
-
-namespace sdr
-{
- namespace event
- {
- void TimerEventHandler::AddEvent(BaseEvent& rBaseEvent)
- {
- maVector.push_back(&rBaseEvent);
- }
-
- void TimerEventHandler::RemoveEvent(BaseEvent& rBaseEvent)
- {
- if(maVector.back() == &rBaseEvent)
- {
- // the one to remove is the last, pop
- maVector.pop_back();
- }
- else
- {
- const auto aFindResult = ::std::find(
- maVector.begin(), maVector.end(), &rBaseEvent);
- DBG_ASSERT(aFindResult != maVector.end(),
- "EventHandler::RemoveEvent: Event to be removed not found (!)");
- maVector.erase(aFindResult);
- }
- }
-
- BaseEvent* TimerEventHandler::GetEvent()
- {
- if(!maVector.empty())
- {
- // get the last event, that one is fastest to be removed
- return maVector.back();
- }
- else
- {
- return nullptr;
- }
- }
-
- TimerEventHandler::TimerEventHandler()
- {
- SetPriority(TaskPriority::HIGH_IDLE);
- Stop();
- }
-
- TimerEventHandler::~TimerEventHandler()
- {
- Stop();
- while(!maVector.empty())
- {
- delete GetEvent();
- }
- }
-
- // for control
- bool TimerEventHandler::IsEmpty() const
- {
- return (0 == maVector.size());
- }
-
- // The timer when it is triggered; from class Timer
- void TimerEventHandler::Invoke()
- {
- // Trigger and consume the events
- for(;;)
- {
- BaseEvent* pEvent = GetEvent();
- if(pEvent == nullptr)
- break;
- pEvent->ExecuteEvent();
- delete pEvent;
- }
- }
-
- // reset the timer
- void TimerEventHandler::Restart()
- {
- Start();
- }
} // end of namespace mixer
} // end of namespace sdr
More information about the Libreoffice-commits
mailing list