summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/form/datanavi.cxx4
-rw-r--r--svx/source/gallery2/galbrws1.hxx1
-rw-r--r--svx/source/inc/datanavi.hxx2
-rw-r--r--svx/source/inc/filtnav.hxx1
-rw-r--r--svx/source/inc/fmexpl.hxx1
-rw-r--r--svx/source/sidebar/PanelLayout.cxx4
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx4
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx6
-rw-r--r--svx/source/tbxctrls/itemwin.cxx16
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx12
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx6
11 files changed, 27 insertions, 30 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 3ce5917d35e5..6ee7271a991c 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1027,7 +1027,7 @@ namespace svxform
}
- bool XFormsPage::Notify( NotifyEvent& rNEvt )
+ bool XFormsPage::EventNotify( NotifyEvent& rNEvt )
{
bool bHandled = false;
@@ -1043,7 +1043,7 @@ namespace svxform
}
}
- return bHandled || Window::Notify( rNEvt );
+ return bHandled || Window::EventNotify( rNEvt );
}
void XFormsPage::Resize()
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 999d8a6cea76..896fca11a683 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -72,7 +72,6 @@ class GalleryBrowser1 : public Control, public SfxListener
friend class GalleryBrowser;
friend class svx::sidebar::GalleryControl;
friend class GalleryThemeListBox;
- using Control::Notify;
using Window::KeyInput;
private:
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index dd027cc21ab7..2141695275dd 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -273,7 +273,7 @@ namespace svxform
bool RemoveEntry();
protected:
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
public:
XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup );
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index ce5a59277b82..5f458f7f241f 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -253,7 +253,6 @@ public:
const FmFilterModel* GetFilterModel() const {return m_pModel;}
protected:
- using Control::Notify;
virtual void KeyInput( const KeyEvent& rKEvt ) override;
virtual void Command( const CommandEvent& rEvt ) override;
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index a05a218abea7..fdceac955375 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -512,7 +512,6 @@ namespace svxform
using SvTreeListBox::Insert;
using SvTreeListBox::ExecuteDrop;
using SvTreeListBox::Select;
- using SvTreeListBox::Notify;
private:
sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD );
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 2f492fe78270..74451ec9378e 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -105,11 +105,11 @@ void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, P
VclContainer::setLayoutAllocation(*pChild, Point(0, 0), Size(nWidth, nHeight));
}
-bool PanelLayout::Notify(NotifyEvent& rNEvt)
+bool PanelLayout::EventNotify(NotifyEvent& rNEvt)
{
if (rNEvt.GetType() == MouseNotifyEvent::COMMAND)
Accelerator::ToggleMnemonicsOnHierarchy(*rNEvt.GetCommandEvent(), this);
- return Control::Notify( rNEvt );
+ return Control::EventNotify( rNEvt );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index acef7151f2ec..87187f6c5417 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -494,7 +494,7 @@ void SvxColorDockingWindow::GetFocus()
}
}
-bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )
+bool SvxColorDockingWindow::EventNotify( NotifyEvent& rNEvt )
{
bool bRet = false;
if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) )
@@ -510,7 +510,7 @@ bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )
}
}
- return bRet || SfxDockingWindow::Notify( rNEvt );
+ return bRet || SfxDockingWindow::EventNotify(rNEvt);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 114f23f0fe03..11b27ac8278a 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -320,7 +320,7 @@ private:
virtual void Select() override;
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
static void ImplReleaseFocus();
public:
@@ -374,9 +374,9 @@ bool ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt )
return ListBox::PreNotify( rNEvt );
}
-bool ImplGrafModeControl::Notify( NotifyEvent& rNEvt )
+bool ImplGrafModeControl::EventNotify( NotifyEvent& rNEvt )
{
- bool bHandled = ListBox::Notify( rNEvt );
+ bool bHandled = ListBox::EventNotify( rNEvt );
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index fcf4af697ac6..de7c5bbae3a3 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -173,9 +173,9 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt )
}
-bool SvxLineBox::Notify( NotifyEvent& rNEvt )
+bool SvxLineBox::EventNotify( NotifyEvent& rNEvt )
{
- bool bHandled = LineLB::Notify( rNEvt );
+ bool bHandled = LineLB::EventNotify( rNEvt );
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -331,9 +331,9 @@ bool SvxMetricField::PreNotify( NotifyEvent& rNEvt )
}
-bool SvxMetricField::Notify( NotifyEvent& rNEvt )
+bool SvxMetricField::EventNotify( NotifyEvent& rNEvt )
{
- bool bHandled = MetricField::Notify( rNEvt );
+ bool bHandled = MetricField::EventNotify( rNEvt );
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -419,9 +419,9 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
}
-bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
+bool SvxFillTypeBox::EventNotify( NotifyEvent& rNEvt )
{
- bool bHandled = FillTypeLB::Notify( rNEvt );
+ bool bHandled = FillTypeLB::EventNotify( rNEvt );
if (isDisposed())
return false;
@@ -487,9 +487,9 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
}
-bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
+bool SvxFillAttrBox::EventNotify( NotifyEvent& rNEvt )
{
- bool bHandled = FillAttrLB::Notify( rNEvt );
+ bool bHandled = FillAttrLB::EventNotify( rNEvt );
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index aa725a740cb7..d7041356bb14 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -134,7 +134,7 @@ public:
bool IsVisible() const { return bVisible; }
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual void StateChanged( StateChangedType nStateChange ) override;
@@ -225,7 +225,7 @@ public:
nFtCount = pList->GetFontNameCount(); }
virtual void UserDraw( const UserDrawEvent& rUDEvt ) override;
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
virtual Reference< css::accessibility::XAccessible > CreateAccessible() override;
void SetOwnFontList(::std::unique_ptr<FontList> && _aOwnFontList) { m_aOwnFontList = std::move(_aOwnFontList); }
};
@@ -530,7 +530,7 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
return ComboBox::PreNotify( rNEvt );
}
-bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
+bool SvxStyleBox_Impl::EventNotify( NotifyEvent& rNEvt )
{
bool bHandled = false;
@@ -569,7 +569,7 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
break;
}
}
- return bHandled || ComboBox::Notify( rNEvt );
+ return bHandled || ComboBox::EventNotify( rNEvt );
}
void SvxStyleBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
@@ -1050,7 +1050,7 @@ bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
return FontNameBox::PreNotify( rNEvt );
}
-bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
+bool SvxFontNameBox_Impl::EventNotify( NotifyEvent& rNEvt )
{
bool bHandled = false;
mbEndPreview = false;
@@ -1090,7 +1090,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
EndPreview();
}
- return bHandled || FontNameBox::Notify( rNEvt );
+ return bHandled || FontNameBox::EventNotify( rNEvt );
}
void SvxFontNameBox_Impl::SetOptimalSize()
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index c7e74bd51c37..c42d2627693e 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -93,7 +93,7 @@ public:
void UpdateFont( const css::awt::FontDescriptor& rCurrentFont );
void SetOptimalSize();
- virtual bool Notify( NotifyEvent& rNEvt ) override;
+ virtual bool EventNotify( NotifyEvent& rNEvt ) override;
protected:
virtual void Select() override;
@@ -207,7 +207,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFo
}
-bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
+bool SvxFontSizeBox_Impl::EventNotify( NotifyEvent& rNEvt )
{
bool bHandled = false;
@@ -242,7 +242,7 @@ bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
SetText(GetSavedValue());
}
- return bHandled || FontSizeBox::Notify( rNEvt );
+ return bHandled || FontSizeBox::EventNotify( rNEvt );
}
void SvxFontSizeBox_Impl::SetOptimalSize()
generated by cgit (git 2.34.1) at 2025-01-12 19:05:38 +0000