summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/app/inputwin.cxx4
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx4
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx4
-rw-r--r--sc/source/ui/inc/checklistmenu.hxx2
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx5
-rw-r--r--sc/source/ui/inc/inputwin.hxx2
-rw-r--r--sc/source/ui/inc/navipi.hxx9
-rw-r--r--sc/source/ui/navipi/navipi.cxx8
-rw-r--r--sc/source/ui/navipi/scenwnd.cxx4
9 files changed, 20 insertions, 22 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 902c1f72c96b..c014cf6ffadc 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2189,7 +2189,7 @@ void ScPosWnd::DoEnter()
ReleaseFocus_Impl();
}
-bool ScPosWnd::Notify( NotifyEvent& rNEvt )
+bool ScPosWnd::EventNotify( NotifyEvent& rNEvt )
{
bool bHandled = true;
@@ -2241,7 +2241,7 @@ bool ScPosWnd::Notify( NotifyEvent& rNEvt )
}
if (!bHandled)
- bHandled = ComboBox::Notify(rNEvt);
+ bHandled = ComboBox::EventNotify(rNEvt);
return bHandled;
}
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index fd56093da389..bdf2b706e7df 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1321,7 +1321,7 @@ void ScCheckListMenuWindow::MouseMove(const MouseEvent& rMEvt)
queueCloseSubMenu();
}
-bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt)
+bool ScCheckListMenuWindow::EventNotify(NotifyEvent& rNEvt)
{
if (rNEvt.GetType() == MouseNotifyEvent::KEYUP)
{
@@ -1334,7 +1334,7 @@ bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt)
return true;
}
}
- return ScMenuFloatingWindow::Notify(rNEvt);
+ return ScMenuFloatingWindow::EventNotify(rNEvt);
}
void ScCheckListMenuWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index f4273992e9f4..fb613d84d7b0 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -94,13 +94,13 @@ void ScCondFrmtEntry::dispose()
VclContainer::dispose();
}
-bool ScCondFrmtEntry::Notify( NotifyEvent& rNEvt )
+bool ScCondFrmtEntry::EventNotify( NotifyEvent& rNEvt )
{
if (rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN)
{
maClickHdl.Call(*this);
}
- return VclContainer::Notify(rNEvt);
+ return VclContainer::EventNotify(rNEvt);
}
void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex)
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 1ee9e7bdc102..5c0b2dff233c 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -320,7 +320,7 @@ public:
virtual void dispose() override;
virtual void MouseMove(const MouseEvent& rMEvt) override;
- virtual bool Notify(NotifyEvent& rNEvt) override;
+ virtual bool EventNotify(NotifyEvent& rNEvt) override;
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index f7d446ff474b..27a4fbc2e468 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -72,7 +72,7 @@ public:
virtual void setAllocation(const Size &rAllocation) override;
virtual void dispose() override;
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
bool IsSelected() const { return mbActive;}
void SetIndex(sal_Int32 nIndex);
@@ -131,7 +131,6 @@ public:
virtual void SetInactive() override;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
- using ScCondFrmtEntry::Notify;
virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::CONDITION; }
};
@@ -272,7 +271,7 @@ public:
virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::DATE; }
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
- using ScCondFrmtEntry::Notify;
+
protected:
virtual OUString GetExpressionString() override;
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 4b7ec0c8a0c6..b53d794d5fbf 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -170,7 +170,7 @@ protected:
virtual void Select() override;
virtual void Modify() override;
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 7a21bf879643..166e37af6616 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -60,7 +60,7 @@ public:
protected:
virtual void Select() override;
virtual void DoubleClick() override;
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
private:
struct ScenarioEntry
@@ -116,7 +116,7 @@ public:
void SetCol( SCCOL nColNo );
protected:
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
virtual void LoseFocus() override;
virtual void Up() override;
virtual void Down() override;
@@ -144,7 +144,7 @@ public:
void SetRow(SCROW nRow) { SetValue(nRow); }
protected:
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
virtual Size GetOptimalSize() const override;
virtual void LoseFocus() override;
virtual void dispose() override;
@@ -253,8 +253,7 @@ public:
virtual ~ScNavigatorDlg() override;
virtual void dispose() override;
- using Window::Notify;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
};
class ScNavigatorDialogWrapper: public SfxChildWindowContext
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index e3782a5010c0..abdc36d4eab7 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -85,9 +85,9 @@ ColumnEdit::~ColumnEdit()
VCL_BUILDER_FACTORY_ARGS(ColumnEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT)
-bool ColumnEdit::Notify( NotifyEvent& rNEvt )
+bool ColumnEdit::EventNotify( NotifyEvent& rNEvt )
{
- bool bHandled = SpinField::Notify( rNEvt );
+ bool bHandled = SpinField::EventNotify(rNEvt);
MouseNotifyEvent nType = rNEvt.GetType();
if ( nType == MouseNotifyEvent::KEYINPUT )
@@ -262,9 +262,9 @@ RowEdit::~RowEdit()
VCL_BUILDER_FACTORY_ARGS(RowEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT)
-bool RowEdit::Notify( NotifyEvent& rNEvt )
+bool RowEdit::EventNotify( NotifyEvent& rNEvt )
{
- bool bHandled = NumericField::Notify( rNEvt );
+ bool bHandled = NumericField::EventNotify(rNEvt);
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 9c6884b05c6c..6255cb2e6806 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -107,7 +107,7 @@ void ScScenarioListBox::DoubleClick()
SelectScenario();
}
-bool ScScenarioListBox::Notify( NotifyEvent& rNEvt )
+bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
{
bool bHandled = false;
@@ -155,7 +155,7 @@ bool ScScenarioListBox::Notify( NotifyEvent& rNEvt )
}
}
- return bHandled || ListBox::Notify( rNEvt );
+ return bHandled || ListBox::EventNotify(rNEvt);
}
const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() const
generated by cgit (git 2.34.1) at 2025-01-12 18:48:54 +0000