include/svx/devtools/DevelopmentToolDockingWindow.hxx | 4 ++--
svx/source/devtools/DevelopmentToolDockingWindow.cxx | 18 ++++++++++--------
2 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit c661a428ea82755deb0b40678d98c4028afb1636
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Feb 5 17:27:52 2021 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Feb 11 00:32:10 2021 +0100
devtools: rename LeftSideTreeView to DocumentModelTreeView
Change-Id: I1a16f448a7e726e9c78d4b4a7b24ea8cef0e0d12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110465
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
index 1f10c0c2a672..b6fe26e67ea4 100644
--- a/include/svx/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/svx/devtools/DevelopmentToolDockingWindow.hxx
@@ -28,7 +28,7 @@ class SVX_DLLPUBLIC DevelopmentToolDockingWindow final :
public SfxDockingWindow
private:
std::unique_ptr<weld::Label> mpClassNameLabel;
std::unique_ptr<weld::TreeView> mpClassListBox;
- std::unique_ptr<weld::TreeView> mpLeftSideTreeView;
+ std::unique_ptr<weld::TreeView> mpDocumentModelTreeView;
std::unique_ptr<weld::ToggleButton> mpSelectionToggle;
css::uno::Reference<css::uno::XInterface> mxRoot;
@@ -37,7 +37,7 @@ private:
DocumentModelTreeHandler maDocumentModelTreeHandler;
- DECL_LINK(LeftSideSelected, weld::TreeView&, void);
+ DECL_LINK(DocumentModelTreeViewSelectionHandler, weld::TreeView&, void);
DECL_LINK(SelectionToggled, weld::ToggleButton&, void);
DECL_LINK(ObjectInspectorExpandingHandler, const weld::TreeIter&, bool);
diff --git a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
index f32d974a42dd..d7dbd5731022 100644
--- a/svx/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/svx/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -499,13 +499,14 @@
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* pInputBi
"svx/ui/developmenttool.ui")
, mpClassNameLabel(m_xBuilder->weld_label("class_name_value_id"))
, mpClassListBox(m_xBuilder->weld_tree_view("class_listbox_id"))
- , mpLeftSideTreeView(m_xBuilder->weld_tree_view("leftside_treeview_id"))
+ ,
mpDocumentModelTreeView(m_xBuilder->weld_tree_view("leftside_treeview_id"))
, mpSelectionToggle(m_xBuilder->weld_toggle_button("selection_toggle"))
, maDocumentModelTreeHandler(
- mpLeftSideTreeView,
+ mpDocumentModelTreeView,
pInputBindings->GetDispatcher()->GetFrame()->GetObjectShell()->GetBaseModel())
{
- mpLeftSideTreeView->connect_changed(LINK(this,
DevelopmentToolDockingWindow, LeftSideSelected));
+ mpDocumentModelTreeView->connect_changed(
+ LINK(this, DevelopmentToolDockingWindow,
DocumentModelTreeViewSelectionHandler));
mpSelectionToggle->connect_toggled(LINK(this,
DevelopmentToolDockingWindow, SelectionToggled));
mpClassListBox->connect_expanding(
LINK(this, DevelopmentToolDockingWindow,
ObjectInspectorExpandingHandler));
@@ -521,7 +522,8 @@
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* pInputBi
mxSelectionListener.set(new SelectionChangeHandler(xController, this));
}
-IMPL_LINK(DevelopmentToolDockingWindow, LeftSideSelected, weld::TreeView&,
rView, void)
+IMPL_LINK(DevelopmentToolDockingWindow, DocumentModelTreeViewSelectionHandler,
weld::TreeView&,
+ rView, void)
{
if (mpSelectionToggle->get_state() == TRISTATE_TRUE)
return;
@@ -583,7 +585,7 @@ void DevelopmentToolDockingWindow::dispose()
mpClassNameLabel.reset();
mpClassListBox.reset();
mpSelectionToggle.reset();
- mpLeftSideTreeView.reset();
+ mpDocumentModelTreeView.reset();
SfxDockingWindow::dispose();
}
@@ -594,12 +596,12 @@ void DevelopmentToolDockingWindow::updateSelection()
if (eTriState == TRISTATE_TRUE)
{
introspect(mxCurrentSelection);
- mpLeftSideTreeView->set_sensitive(false);
+ mpDocumentModelTreeView->set_sensitive(false);
}
else
{
- mpLeftSideTreeView->set_sensitive(true);
- LeftSideSelected(*mpLeftSideTreeView);
+ mpDocumentModelTreeView->set_sensitive(true);
+ DocumentModelTreeViewSelectionHandler(*mpDocumentModelTreeView);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
