chart2/source/inc/ChartColorPalettes.hxx | 1 - chart2/source/tools/ChartColorPalettes.cxx | 5 ++--- include/svx/GenericDropDownFieldDialog.hxx | 2 -- sd/source/console/PresenterController.cxx | 2 +- sd/source/console/PresenterWindowManager.cxx | 2 -- sd/source/console/PresenterWindowManager.hxx | 2 -- sd/source/ui/inc/SlideshowLayerRenderer.hxx | 2 -- svx/source/dialog/GenericDropDownFieldDialog.cxx | 2 -- sw/source/uibase/docvw/FrameControlsManager.cxx | 8 ++++++-- 9 files changed, 9 insertions(+), 17 deletions(-)
New commits: commit d5483115cda57b50f2f2ca689893e6429b4482cc Author: Noel Grandin <[email protected]> AuthorDate: Mon Feb 2 11:42:48 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Feb 2 13:11:30 2026 +0100 loplugin:unusedfields Change-Id: I24bdc3a0f0df439ad745151b3943ce1f8bf5da9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198534 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/chart2/source/inc/ChartColorPalettes.hxx b/chart2/source/inc/ChartColorPalettes.hxx index a4bda8bda0e8..7839ffd19c63 100644 --- a/chart2/source/inc/ChartColorPalettes.hxx +++ b/chart2/source/inc/ChartColorPalettes.hxx @@ -27,7 +27,6 @@ public: typedef Link<const MouseEvent&, bool> MouseEventHandler; private: - weld::Builder& mrBuilder; std::unique_ptr<weld::IconView> mxIconView; std::unique_ptr<weld::ScrolledWindow> mxWindow; std::vector<ChartColorPalette> maColorSets; diff --git a/chart2/source/tools/ChartColorPalettes.cxx b/chart2/source/tools/ChartColorPalettes.cxx index e33d24a67cca..c66a1d07bac3 100644 --- a/chart2/source/tools/ChartColorPalettes.cxx +++ b/chart2/source/tools/ChartColorPalettes.cxx @@ -19,9 +19,8 @@ constexpr tools::Long SIZE = ChartColorPaletteLayout::ItemSize; ChartColorPalettes::ChartColorPalettes(weld::Builder& rBuilder, const OUString& id, const OUString& winId) - : mrBuilder(rBuilder) - , mxIconView(mrBuilder.weld_icon_view(id)) - , mxWindow(mrBuilder.weld_scrolled_window(winId)) + : mxIconView(rBuilder.weld_icon_view(id)) + , mxWindow(rBuilder.weld_scrolled_window(winId)) , mnHighlightedItemId(0) { mxIconView->connect_mouse_move(LINK(this, ChartColorPalettes, OnMouseMove)); diff --git a/include/svx/GenericDropDownFieldDialog.hxx b/include/svx/GenericDropDownFieldDialog.hxx index 665447167ee6..c69b05e04265 100644 --- a/include/svx/GenericDropDownFieldDialog.hxx +++ b/include/svx/GenericDropDownFieldDialog.hxx @@ -17,8 +17,6 @@ class SVX_DLLPUBLIC GenericDropDownFieldDialog : public weld::GenericDialogController { std::unique_ptr<weld::ComboBox> m_xComboBox; - std::unique_ptr<weld::Button> m_xOK; - std::unique_ptr<weld::Button> m_xCancel; public: GenericDropDownFieldDialog(weld::Widget* pParent, const OUString& rTitle); diff --git a/sd/source/console/PresenterController.cxx b/sd/source/console/PresenterController.cxx index d1d5475dd65f..dd37c6de9934 100644 --- a/sd/source/console/PresenterController.cxx +++ b/sd/source/console/PresenterController.cxx @@ -93,7 +93,7 @@ PresenterController::PresenterController ( mxMainPaneId(rxMainPaneId), mpPaneContainer(std::move(xPaneContainer)), mnCurrentSlideIndex(-1), - mpWindowManager(new PresenterWindowManager(rxContext,mpPaneContainer,this)), + mpWindowManager(new PresenterWindowManager(mpPaneContainer,this)), mpCanvasHelper(std::make_shared<PresenterCanvasHelper>()), mnPendingSlideNumber(-1) { diff --git a/sd/source/console/PresenterWindowManager.cxx b/sd/source/console/PresenterWindowManager.cxx index d4e79e2b7823..791476e89cb0 100644 --- a/sd/source/console/PresenterWindowManager.cxx +++ b/sd/source/console/PresenterWindowManager.cxx @@ -49,11 +49,9 @@ namespace sdext::presenter { //===== PresenterWindowManager ================================================ PresenterWindowManager::PresenterWindowManager ( - const Reference<XComponentContext>& rxContext, ::rtl::Reference<PresenterPaneContainer> pPaneContainer, ::rtl::Reference<PresenterController> pPresenterController) : PresenterWindowManagerInterfaceBase(m_aMutex), - mxComponentContext(rxContext), mpPresenterController(std::move(pPresenterController)), mpPaneContainer(std::move(pPaneContainer)), mbIsLayoutPending(true), diff --git a/sd/source/console/PresenterWindowManager.hxx b/sd/source/console/PresenterWindowManager.hxx index 068f5aed139c..406a7326423a 100644 --- a/sd/source/console/PresenterWindowManager.hxx +++ b/sd/source/console/PresenterWindowManager.hxx @@ -58,7 +58,6 @@ class PresenterWindowManager { public: PresenterWindowManager ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, ::rtl::Reference<PresenterPaneContainer> pPaneContainer, ::rtl::Reference<PresenterController> pPresenterController); virtual ~PresenterWindowManager() override; @@ -143,7 +142,6 @@ public: const css::lang::EventObject& rEvent) override; private: - css::uno::Reference<css::uno::XComponentContext> mxComponentContext; ::rtl::Reference<PresenterController> mpPresenterController; css::uno::Reference<css::awt::XWindow> mxParentWindow; css::uno::Reference<css::rendering::XCanvas> mxParentCanvas; diff --git a/sd/source/ui/inc/SlideshowLayerRenderer.hxx b/sd/source/ui/inc/SlideshowLayerRenderer.hxx index a155a9267d9d..407abcea4f28 100644 --- a/sd/source/ui/inc/SlideshowLayerRenderer.hxx +++ b/sd/source/ui/inc/SlideshowLayerRenderer.hxx @@ -112,8 +112,6 @@ struct RenderState std::vector<drawinglayer::primitive2d::Primitive2DReference> maPrimitivesToUnhide; - SdrObject* mpCurrentTarget = nullptr; - bool mbShowMasterPageObjects = false; bool mbFooterEnabled = false; bool mbDateTimeEnabled = false; diff --git a/svx/source/dialog/GenericDropDownFieldDialog.cxx b/svx/source/dialog/GenericDropDownFieldDialog.cxx index f3b5a2c1175d..842d8a9c741e 100644 --- a/svx/source/dialog/GenericDropDownFieldDialog.cxx +++ b/svx/source/dialog/GenericDropDownFieldDialog.cxx @@ -15,8 +15,6 @@ GenericDropDownFieldDialog::GenericDropDownFieldDialog(weld::Widget* pParent, : GenericDialogController(pParent, u"svx/ui/dropdownfielddialog.ui"_ustr, u"DropDownDialog"_ustr) , m_xComboBox(m_xBuilder->weld_combo_box(u"combo_box"_ustr)) - , m_xOK(m_xBuilder->weld_button(u"OK"_ustr)) - , m_xCancel(m_xBuilder->weld_button(u"CANCEL"_ustr)) { set_title(rTitle); } commit ba5a6c007dfda67463ad9099d493b36e57ddaf4c Author: Miklos Vajna <[email protected]> AuthorDate: Mon Feb 2 08:25:16 2026 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Feb 2 13:11:17 2026 +0100 sw: fix crash in SwFrameControlsManager::SetContentControlAliasButton() gdb backtrace on the crashreport's core dump: #8 SwView::GetWrtShell (this=<optimized out>) at sw/inc/view.hxx:433 #9 SwFrameControlsManager::SetContentControlAliasButton (this=this@entry=0x53674d00, pContentControl=0x536d7210, aTopLeftPixel=...) at sw/source/uibase/docvw/FrameControlsManager.cxx:192 ... #19 0x000071084f165009 in SwWrtShell::GotoFieldmark (this=this@entry=0x552f4880, pMark=0x536d7e00) at sw/source/uibase/wrtsh/wrtsh3.cxx:227 #20 0x000071084f15d56b in SwWrtShell::SwWrtShell (this=this@entry=0x552f4880, rDoc=..., _pWin=<optimized out>, rShell=..., pViewOpt=pViewOpt@entry=0x7ffcab7ca2f0) at sw/source/uibase/wrtsh/wrtsh1.cxx:2118 #21 0x000071084e4a542c in SwView::SwView (this=this@entry=0x552f5180, _rFrame=..., pOldSh=pOldSh@entry=0x0) at include/rtl/ref.hxx:203 ... #29 0x000071085b272a05 in framework::LoadEnv::loadComponentFromURL (xLoader=..., xContext=..., sURL=..., sTarget=..., nSearchFlags=nSearchFlags@entry=0, lArgs=...) at framework/source/loadenv/loadenv.cxx:167 I.e. the document on load may have form protection on, in which case it jumps to the first fillable form, and if that happens to be inside a content control that has an alias/title defined, we hit this, probably. The problem is that the SwView ctor is not finished at this stage, so the view has no writer shell: (gdb) frame #9 SwFrameControlsManager::SetContentControlAliasButton (this=this@entry=0x53674d00, pContentControl=0x536d7210, aTopLeftPixel=...) at sw/source/uibase/docvw/FrameControlsManager.cxx:192 192 const SwViewOption* pViewOpt = m_pEditWin->GetView().GetWrtShell().GetViewOptions(); (gdb) print m_pEditWin.m_rInnerRef.m_pBody.m_rView.m_pWrtShell $5 = std::unique_ptr<SwWrtShell> = {get() = 0x0} Fix the problem by not assuming that the view has a writer shell set, which is usually true, except when the view creation is in progress. Change-Id: Ic7254e1ccbb9fdcafd94c04b829fae21a2322123 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198530 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx index 91e2bdefa4b8..4ec8ae27f520 100644 --- a/sw/source/uibase/docvw/FrameControlsManager.cxx +++ b/sw/source/uibase/docvw/FrameControlsManager.cxx @@ -189,8 +189,12 @@ void SwFrameControlsManager::SetContentControlAliasButton(SwContentControl* pCon { pControl = std::make_shared<SwFrameControl>( VclPtr<SwContentControlAliasButton>::Create(m_pEditWin, pContentControl).get()); - const SwViewOption* pViewOpt = m_pEditWin->GetView().GetWrtShell().GetViewOptions(); - pControl->SetReadonly(pViewOpt->IsReadonly()); + SwWrtShell* pWrtShell = m_pEditWin->GetView().GetWrtShellPtr(); + if (pWrtShell) + { + const SwViewOption* pViewOpt = pWrtShell->GetViewOptions(); + pControl->SetReadonly(pViewOpt->IsReadonly()); + } rControls[nullptr] = pControl; }
