vcl/source/control/edit.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 3ebb0c68c969241dd93cf833f56763eef6ae4acd
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jan 13 11:20:06 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Jan 16 20:33:02 2025 +0100
tdf#164127 vcl: Skip further focus processing for disposed Edit
For the UNO control property browser, switching focus away
from the property browser to the document while an Edit in the property
browser has focus and then back to the property browser results in the
controls of the property browsers getting disposed and new ones created
when processing the focus event. Backtrace of how the Edit gets
disposed (for the "Name" edit):
1 VclReferenceBase::disposeOnce vclreferencebase.cxx 37 0x7f62fdb3d82a
2 VclPtr<vcl::Window>::disposeAndClear vclptr.hxx 207 0x7f62fd6aebc5
3 VclBuilder::disposeBuilder builder.cxx 831 0x7f62fd68ca34
4 VclBuilder::~VclBuilder builder.cxx 823 0x7f62fd68c8c7
5 VclBuilder::~VclBuilder builder.cxx 822 0x7f62fd68cba9
6 std::default_delete<VclBuilder>::operator() unique_ptr.h 93
0x7f62fd748b78
7 std::__uniq_ptr_impl<VclBuilder,
std::default_delete<VclBuilder>>::reset unique_ptr.h 205 0x7f62fd77c9f8
8 std::unique_ptr<VclBuilder, std::default_delete<VclBuilder>>::reset
unique_ptr.h 504 0x7f62fd77bf4d
9 SalInstanceBuilder::~SalInstanceBuilder salvtables.cxx 7578
0x7f62fe038f8a
10 SalInstanceBuilder::~SalInstanceBuilder salvtables.cxx 7573
0x7f62fe038fe9
11 std::default_delete<weld::Builder>::operator() unique_ptr.h 93
0x7f62dcf9a3ab
12 std::__uniq_ptr_impl<weld::Builder,
std::default_delete<weld::Builder>>::reset unique_ptr.h 205 0x7f62dd101868
13 std::unique_ptr<weld::Builder,
std::default_delete<weld::Builder>>::reset unique_ptr.h 504 0x7f62dd0f7a5d
14
pcr::CommonBehaviourControl<com::sun::star::inspection::XPropertyControl,
weld::Entry>::clear_widgetry commoncontrol.hxx 150 0x7f62dd15ad8d
15
pcr::CommonBehaviourControl<com::sun::star::inspection::XPropertyControl,
weld::Entry>::disposing commoncontrol.hxx 156 0x7f62dd1552d5
16 cppu::WeakComponentImplHelperBase::dispose implbase.cxx 104
0x7f6304f3db00
17
cppu::PartialWeakComponentImplHelper<com::sun::star::inspection::XPropertyControl>::dispose
compbase.hxx 90 0x7f62dd1545b5
18 pcr::(anonymous namespace)::lcl_implDisposeControl_nothrow
browserlistbox.cxx 678 0x7f62dcf9f864
19 pcr::OBrowserListBox::Clear browserlistbox.cxx 694 0x7f62dcf9c8d1
20 pcr::OBrowserListBox::~OBrowserListBox browserlistbox.cxx 324
0x7f62dcf9c717
21 o3tl::default_delete<pcr::OBrowserListBox>::operator() deleter.hxx
46 0x7f62dcfae757
22 std::unique_ptr<pcr::OBrowserListBox,
o3tl::default_delete<pcr::OBrowserListBox>>::~unique_ptr unique_ptr.h 399
0x7f62dcfae54f
23 pcr::OBrowserPage::~OBrowserPage browserpage.cxx 38 0x7f62dcfae348
24 std::default_delete<pcr::OBrowserPage>::operator() unique_ptr.h 93
0x7f62dd136577
25 std::unique_ptr<pcr::OBrowserPage,
std::default_delete<pcr::OBrowserPage>>::~unique_ptr unique_ptr.h 399
0x7f62dd13373f
26 pcr::OPropertyEditor::PropertyPage::~PropertyPage propertyeditor.hxx
43 0x7f62dd1336ed
27 std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>::~pair stl_pair.h 284 0x7f62dd1341a9
28 std::destroy_at<std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>> stl_construct.h 88 0x7f62dd134185
29
std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<unsigned
short const, pcr::OPropertyEditor::PropertyPage>>>>::destroy<std::pair<unsigned
short const, pcr::OPropertyEditor::PropertyPage>> alloc_traits.h 593
0x7f62dd1340b5
30 std::_Rb_tree<unsigned short, std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>, std::_Select1st<std::pair<unsigned short
const, pcr::OPropertyEditor::PropertyPage>>, std::less<unsigned short>,
std::allocator<std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>>>::_M_destroy_node stl_tree.h 621
0x7f62dd1340b5
31 std::_Rb_tree<unsigned short, std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>, std::_Select1st<std::pair<unsigned short
const, pcr::OPropertyEditor::PropertyPage>>, std::less<unsigned short>,
std::allocator<std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>>>::_M_drop_node stl_tree.h 629
0x7f62dd134051
32 std::_Rb_tree<unsigned short, std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>, std::_Select1st<std::pair<unsigned short
const, pcr::OPropertyEditor::PropertyPage>>, std::less<unsigned short>,
std::allocator<std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>>>::_M_erase stl_tree.h 1934 0x7f62dd133f9e
33 std::_Rb_tree<unsigned short, std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>, std::_Select1st<std::pair<unsigned short
const, pcr::OPropertyEditor::PropertyPage>>, std::less<unsigned short>,
std::allocator<std::pair<unsigned short const,
pcr::OPropertyEditor::PropertyPage>>>::clear stl_tree.h 1251 0x7f62dd1371e5
34 std::__cxx1998::map<unsigned short,
pcr::OPropertyEditor::PropertyPage>::clear stl_map.h 1183 0x7f62dd136e25
35 std::map<unsigned short, pcr::OPropertyEditor::PropertyPage>::clear
map.h 573 0x7f62dd132b68
36 pcr::OPropertyEditor::ClearAll propertyeditor.cxx 62 0x7f62dd130570
37 pcr::OPropertyBrowserController::stopInspection propcontroller.cxx
839 0x7f62dd0e7e58
38 pcr::OPropertyBrowserController::impl_rebindToInspectee_nothrow
propcontroller.cxx 916 0x7f62dd0e94be
39 pcr::OPropertyBrowserController::inspect propcontroller.cxx 246
0x7f62dd0e9c1a
40 pcr::FormController::setFastPropertyValue_NoBroadcast
formcontroller.cxx 190 0x7f62dd06dcca
41 cppu::OPropertySetHelper::setFastPropertyValue propshlp.cxx 524
0x7f6304f873a8
42 cppu::OPropertySetHelper::setPropertyValue propshlp.cxx 264
0x7f6304f859bb
43 basctl::PropBrw::implSetNewObject propbrw.cxx 303 0x7f62e8b185db
44 basctl::PropBrw::ImplUpdate propbrw.cxx 501 0x7f62e8b16549
45 basctl::PropBrw::Update propbrw.cxx 64 0x7f62e8b15f4a
46 basctl::DialogWindowLayout::UpdatePropertyBrowser baside3.cxx 1256
0x7f62e89e805b
47 basctl::DialogWindow::UpdateBrowser baside3.cxx 599 0x7f62e89e8009
48 basctl::Shell::Activate basides1.cxx 1602 0x7f62e8a0669a
49 SfxShell::DoActivate_Impl shell.cxx 326 0x7f630301e7a3
50 SfxDispatcher::DoActivate_Impl dispatch.cxx 600 0x7f6302fc9bc8
51 SfxViewFrame::DoActivate viewfrm.cxx 1197 0x7f63036313f4
52 SfxApplication::SetViewFrame_Impl app.cxx 261 0x7f6302e4e59e
53 SfxViewFrame::SetViewFrame viewfrm.cxx 3731 0x7f63036313ad
54 SfxViewFrame::MakeActive_Impl viewfrm.cxx 2332 0x7f63036365e4
55 SfxFrameWindow_Impl::EventNotify frame2.cxx 108 0x7f63035c383c
56 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
57 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
58 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
59 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
60 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
61 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
62 DockingWindow::EventNotify dockwin.cxx 581 0x7f62fd778931
63 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
64 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
65 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
66 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
67 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
68 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
69 Control::EventNotify ctrl.cxx 253 0x7f62fd939845
70 TabControl::EventNotify tabctrl.cxx 1618 0x7f62fda32eac
71 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
72 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
73 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
74 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
75 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
76 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
77 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
78 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
79 VclScrolledWindow::EventNotify layout.cxx 2181 0x7f62fd79e326
80 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
81 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
82 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
83 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
84 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
85 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
86 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
87 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
88 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
89 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
90 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
91 vcl::Window::EventNotify event.cxx 213 0x7f62fd77eec7
92 Control::EventNotify ctrl.cxx 253 0x7f62fd939845
93 vcl::Window::CompatNotify window.cxx 3943 0x7f62fd8cae40
94 vcl::Window::GetFocus window.cxx 1855 0x7f62fd8cb109
95 Edit::GetFocus edit.cxx 1838 0x7f62fd94ab69
96 vcl::Window::CompatGetFocus window.cxx 3903 0x7f62fd8d602f
97 vcl::Window::ImplGrabFocus mouse.cxx 384 0x7f62fd8052c7
98 vcl::Window::GrabFocus window.cxx 2990 0x7f62fd8c4a67
99 vcl::Window::ImplAsyncFocusHdl winproc.cxx 2059 0x7f62fd8eb787
100 vcl::Window::LinkStubImplAsyncFocusHdl winproc.cxx 2033
0x7f62fd8eb5ad
101 Link<void *, void>::Call link.hxx 101 0x7f62fd8f39e1
102 ImplHandleUserEvent winproc.cxx 2285 0x7f62fd8efbe1
103 ImplWindowFrameProc winproc.cxx 2849 0x7f62fd8ecb1a
104 SalFrame::CallCallback salframe.hxx 311 0x7f62fe4ad65c
105 SalGenericDisplay::ProcessEvent gendisp.cxx 66 0x7f62fe4d596f
106 SalUserEventList::DispatchUserEvents(bool)::$_0::operator()() const
salusereventlist.cxx 119 0x7f62fdff0d7d
107 SalUserEventList::DispatchUserEvents salusereventlist.cxx 120
0x7f62fdff0c56
108 SalGenericDisplay::DispatchInternalEvent gendisp.cxx 51
0x7f62fe4d58c5
109 SalX11Display::Yield saldisp.cxx 1860 0x7f62f3910ad4
110 DisplayYield saldisp.cxx 321 0x7f62f3905b2f
111 (anonymous namespace)::YieldEntry::HandleNextEvent saldata.cxx 559
0x7f62f390169c
112 SalXLib::Yield saldata.cxx 655 0x7f62f3900f09
113 X11SalInstance::DoYield salinst.cxx 193 0x7f62f391df3d
114 ImplYield svapp.cxx 385 0x7f62fe0bdd46
115 Application::Yield svapp.cxx 488 0x7f62fe0bd65f
116 Application::Execute svapp.cxx 360 0x7f62fe0bd440
117 desktop::Desktop::Main app.cxx 1679 0x7f6306f27f39
118 ImplSVMain svmain.cxx 230 0x7f62fe0df1c6
119 SVMain svmain.cxx 248 0x7f62fe0e0db9
120 soffice_main sofficemain.cxx 121 0x7f6306fa181a
121 sal_main main.c 51 0x55f5d611da6d
122 main main.c 49 0x55f5d611da47
As a consequence, the subsequent call to
GetSettings().GetStyleSettings().GetSelectionOptions();
in Edit::GetFocus (s. frame 95 above) triggers a crash
because the `mpWindowImpl` of the disposed Edit is null.
To prevent this, check whether the Edit is disposed
after the call to vcl::Window::GetFocus and return
early if that is the case.
For the property browser, that restores the behavior from
before
commit b2b43e83ccc41c37bad32a4dcf07ca86bf2f8a15
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Thu Sep 7 15:42:57 2023 +0200
a11y: Call base class impl at beginning of Edit::GetFocus
, where the app doesn't crash, but the previously focused
"Name" edit no longer has focus after switching back and forth
(as it has actually been replaced by a new edit).
(The cursor blinks once in the edit, then disappears.)
Without being familiar with the underlying property browser
logic, it's unclear to me whether the underlying problem there
could be solved in a better way, e.g. whether skipping the
logic for the `OwnPropertyId::INTROSPECTEDOBJECT` case in
FormController::setFastPropertyValue_NoBroadcast (s. frame 40 above)
could be skipped if the previously inspected object (`m_xCurrentInspectee`)
is already the same as the "new" object to inspect (`_rValue`)
or whether that logic is required to ensure displayed values get
updated in specific scenarios where they might have changed
in the meantime.
Change-Id: I0e441fe9f5dfb487bf832206bcdec08d87e7ae2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180168
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
(cherry picked from commit 9778cd8b09b03757b0462bd6780cf7500000072f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180202
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index c2a7c4c9ccf8..f579264363a6 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1841,6 +1841,11 @@ void Edit::GetFocus()
{
Control::GetFocus();
+ // tdf#164127 for an Edit in the UNO control property browser, above call
to Control::GetFocus
+ // can result in it getting disposed - return early in that case
+ if (isDisposed())
+ return;
+
if ( mpSubEdit )
mpSubEdit->ImplGrabFocus( GetGetFocusFlags() );
else if ( !mbActivePopup )
