summaryrefslogtreecommitdiff
path: root/vcl/source/control
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-08-11 15:01:21 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-08-11 18:47:15 +0200
commit69972719542cd686687ddd91f2b5284483513608 (patch)
tree7d332110d48d199c0dab5532610bad652628427e /vcl/source/control
parentac40c3923580e4ec0e738d57ff8b885da93301ef (diff)
clang-tidy bugprone-parent-virtual-call in vcl
Change-Id: I270bb35f577cc1ee56233c585665478cbaab9085 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155616 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/control')
-rw-r--r--vcl/source/control/PriorityMergedHBox.cxx10
-rw-r--r--vcl/source/control/combobox.cxx8
-rw-r--r--vcl/source/control/imp_listbox.cxx2
-rw-r--r--vcl/source/control/spinfld.cxx2
4 files changed, 11 insertions, 11 deletions
diff --git a/vcl/source/control/PriorityMergedHBox.cxx b/vcl/source/control/PriorityMergedHBox.cxx
index fd5aa5814dac..5d5e6249ed16 100644
--- a/vcl/source/control/PriorityMergedHBox.cxx
+++ b/vcl/source/control/PriorityMergedHBox.cxx
@@ -46,18 +46,18 @@ PriorityMergedHBox::PriorityMergedHBox(vcl::Window* pParent)
void PriorityMergedHBox::Resize()
{
if (comphelper::LibreOfficeKit::isActive())
- return VclHBox::Resize();
+ return PriorityHBox::Resize();
if (!m_bInitialized)
Initialize();
if (!m_bInitialized)
{
- return VclHBox::Resize();
+ return PriorityHBox::Resize();
}
tools::Long nWidth = GetSizePixel().Width();
- tools::Long nCurrentWidth = VclHBox::calculateRequisition().getWidth() + BUTTON_WIDTH;
+ tools::Long nCurrentWidth = PriorityHBox::calculateRequisition().getWidth() + BUTTON_WIDTH;
// Hide lower priority controls
for (int i = GetChildCount() - 1; i >= 0; i--)
@@ -104,7 +104,7 @@ void PriorityMergedHBox::Resize()
}
}
- VclHBox::Resize();
+ PriorityHBox::Resize();
if (GetHiddenCount())
m_pButton->Show();
@@ -138,7 +138,7 @@ Size PriorityMergedHBox::calculateRequisition() const
{
if (!m_bInitialized)
{
- return VclHBox::calculateRequisition();
+ return PriorityHBox::calculateRequisition();
}
sal_uInt16 nVisibleChildren = 0;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 05b7a50006b9..ac817ce2a426 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -575,7 +575,7 @@ void ComboBox::setPosSizePixel( tools::Long nX, tools::Long nY, tools::Long nWid
void ComboBox::Resize()
{
- Control::Resize();
+ Edit::Resize();
if (m_pImpl->m_pSubEdit)
{
@@ -693,7 +693,7 @@ void ComboBox::StateChanged( StateChangedType nType )
void ComboBox::DataChanged( const DataChangedEvent& rDCEvt )
{
- Control::DataChanged( rDCEvt );
+ Edit::DataChanged( rDCEvt );
if ( !((rDCEvt.GetType() == DataChangedEventType::FONTS) ||
(rDCEvt.GetType() == DataChangedEventType::FONTSUBSTITUTION) ||
@@ -1570,7 +1570,7 @@ bool ComboBox::set_property(const OUString &rKey, const OUString &rValue)
else if (rKey == "placeholder-text")
SetPlaceholderText(rValue);
else
- return Control::set_property(rKey, rValue);
+ return Edit::set_property(rKey, rValue);
return true;
}
@@ -1581,7 +1581,7 @@ FactoryFunction ComboBox::GetUITestFactory() const
void ComboBox::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
{
- Control::DumpAsPropertyTree(rJsonWriter);
+ Edit::DumpAsPropertyTree(rJsonWriter);
{
auto entriesNode = rJsonWriter.startArray("entries");
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 1b18498c68fc..780105b32ea3 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2399,7 +2399,7 @@ bool ImplListBox::EventNotify( NotifyEvent& rNEvt )
}
}
- return bDone || Window::EventNotify( rNEvt );
+ return bDone || Control::EventNotify( rNEvt );
}
const Wallpaper& ImplListBox::GetDisplayBackground() const
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 973825a3a977..15229b53af3d 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -718,7 +718,7 @@ void SpinField::Resize()
if (!mbSpin)
return;
- Control::Resize();
+ Edit::Resize();
Size aSize = GetOutputSizePixel();
bool bSubEditPositioned = false;