connectivity/source/drivers/mysqlc/mysqlc_views.cxx | 4 ----
connectivity/source/drivers/mysqlc/mysqlc_views.hxx | 1 -
sw/source/uibase/inc/workctrl.hxx | 7 ++-----
sw/source/uibase/ribbar/workctrl.cxx | 13 +++++--------
4 files changed, 7 insertions(+), 18 deletions(-)
New commits:
commit 89fae8b4b5b88b92706e760d870849260c56f2c0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Mar 29 09:00:46 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Mar 29 11:34:32 2022 +0200
loplugin:unusedfields
Change-Id: Iaf3a0a42e94994eab25f5e9ef8c111362e86fb02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132262
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
index f10e30034efe..1c79c9225d44 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
@@ -31,7 +31,6 @@ connectivity::mysqlc::Views::Views(const
css::uno::Reference<css::sdbc::XConnect
: sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
, m_xConnection(_rxConnection)
, m_xMetaData(_rxConnection->getMetaData())
- , m_bInDrop(false)
{
}
@@ -64,9 +63,6 @@ connectivity::sdbcx::ObjectType
connectivity::mysqlc::Views::appendObject(
// XDrop
void connectivity::mysqlc::Views::dropObject(sal_Int32 _nPos, const OUString&
/*_sElementName*/)
{
- if (m_bInDrop)
- return;
-
css::uno::Reference<XInterface> xObject(getObject(_nPos));
bool bIsNew = connectivity::sdbcx::ODescriptor::isNew(xObject);
if (!bIsNew)
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_views.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_views.hxx
index 2177fdc2e3e3..14570fc8d9a9 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_views.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_views.hxx
@@ -26,7 +26,6 @@ class Views final : public connectivity::sdbcx::OCollection
{
css::uno::Reference<css::sdbc::XConnection> m_xConnection;
css::uno::Reference<css::sdbc::XDatabaseMetaData> m_xMetaData;
- bool m_bInDrop;
// OCollection
virtual connectivity::sdbcx::ObjectType createObject(const OUString&
_rName) override;
diff --git a/sw/source/uibase/inc/workctrl.hxx
b/sw/source/uibase/inc/workctrl.hxx
index 8cd0a8fd6d08..5da3c344351c 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -103,8 +103,7 @@ class NavElementBox_Base
{
public:
NavElementBox_Base(std::unique_ptr<weld::ComboBox> xComboBox,
- const uno::Reference<frame::XFrame>& xFrame,
- NavElementToolBoxControl& rCtrl);
+ const uno::Reference<frame::XFrame>& xFrame);
virtual ~NavElementBox_Base() {}
@@ -118,7 +117,6 @@ public:
protected:
std::unique_ptr<weld::ComboBox> m_xComboBox;
uno::Reference< frame::XFrame > m_xFrame;
- NavElementToolBoxControl* m_pCtrl;
bool m_bRelease;
virtual bool DoKeyInput(const KeyEvent& /*rKEvt*/);
@@ -133,8 +131,7 @@ class NavElementBox_Impl final : public InterimItemWindow,
public NavElementBox_
{
public:
NavElementBox_Impl(vcl::Window* pParent,
- const uno::Reference<frame::XFrame>& xFrame,
- NavElementToolBoxControl& rCtrl);
+ const uno::Reference<frame::XFrame>& xFrame);
virtual void dispose() override
{
diff --git a/sw/source/uibase/ribbar/workctrl.cxx
b/sw/source/uibase/ribbar/workctrl.cxx
index a5e78b5f6288..e65a376f7592 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -583,11 +583,9 @@ VclPtr<InterimItemWindow>
SwJumpToSpecificPageControl::CreateItemWindow( vcl::Wi
}
NavElementBox_Base::NavElementBox_Base(std::unique_ptr<weld::ComboBox>
xComboBox,
- const uno::Reference<frame::XFrame>&
xFrame,
- NavElementToolBoxControl& rCtrl)
+ const uno::Reference<frame::XFrame>&
xFrame)
: m_xComboBox(std::move(xComboBox))
,m_xFrame(xFrame)
- ,m_pCtrl(&rCtrl)
,m_bRelease(true)
{
m_xComboBox->set_size_request(150, -1);
@@ -604,10 +602,9 @@
NavElementBox_Base::NavElementBox_Base(std::unique_ptr<weld::ComboBox> xComboBox
}
NavElementBox_Impl::NavElementBox_Impl(vcl::Window* pParent,
- const uno::Reference<frame::XFrame>&
xFrame,
- NavElementToolBoxControl& rCtrl)
+ const uno::Reference<frame::XFrame>&
xFrame)
: InterimItemWindow(pParent, "modules/swriter/ui/combobox.ui", "ComboBox")
- ,NavElementBox_Base(m_xBuilder->weld_combo_box("combobox"), xFrame, rCtrl)
+ ,NavElementBox_Base(m_xBuilder->weld_combo_box("combobox"), xFrame)
{
SetSizePixel(m_xContainer->get_preferred_size());
}
@@ -781,7 +778,7 @@ uno::Reference< awt::XWindow > SAL_CALL
NavElementToolBoxControl::createItemWind
xItemWindow = css::uno::Reference<css::awt::XWindow>(new
weld::TransportAsXWindow(xWidget.get()));
- m_xWeldBox.reset(new NavElementBox_Base(std::move(xWidget), m_xFrame,
*this));
+ m_xWeldBox.reset(new NavElementBox_Base(std::move(xWidget), m_xFrame));
m_pBox = m_xWeldBox.get();
}
else
@@ -790,7 +787,7 @@ uno::Reference< awt::XWindow > SAL_CALL
NavElementToolBoxControl::createItemWind
if ( pParent )
{
SolarMutexGuard aSolarMutexGuard;
- m_xVclBox = VclPtr<NavElementBox_Impl>::Create( pParent, m_xFrame,
*this );
+ m_xVclBox = VclPtr<NavElementBox_Impl>::Create( pParent, m_xFrame
);
m_pBox = m_xVclBox.get();
xItemWindow = VCLUnoHelper::GetInterface(m_xVclBox);
}
