diff options
author | Shivam Kumar Singh <shivamhere247@gmail.com> | 2020-07-03 00:36:12 +0530 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-07-16 12:12:50 +0200 |
commit | 51ccfd3b39d1d32052e8d51ab9ba7324ccd843f5 (patch) | |
tree | 66665265edbe7ed81bb55b3418fa8a018baf4561 /svx | |
parent | 4bb931a488b8fe7a0b4961956252f667b683a630 (diff) |
Cleanup: Fix variable names for Inspector
Fixing of variable names following LO naming conventions
and some other minor fixes.
Change-Id: Iad58584ecc07a02287193a615c428819363ed0c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97810
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/sidebar/inspector/InspectorTextPanel.cxx | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx index 1b0ea48a55c3..6157f2bc67fb 100644 --- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx +++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx @@ -42,52 +42,50 @@ InspectorTextPanel::Create(vcl::Window* pParent, InspectorTextPanel::InspectorTextPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) : PanelLayout(pParent, "InspectorTextPanel", "svx/ui/inspectortextpanel.ui", rxFrame) - , mxListBoxStyles(m_xBuilder->weld_tree_view("listbox_fonts")) + , mpListBoxStyles(m_xBuilder->weld_tree_view("listbox_fonts")) { - mxListBoxStyles->set_size_request(-1, mxListBoxStyles->get_height_rows(25)); + mpListBoxStyles->set_size_request(-1, mpListBoxStyles->get_height_rows(25)); } -static void FillBox_Impl(weld::TreeView& rListBoxStyles, const TreeNode& current, +static void FillBox_Impl(weld::TreeView& rListBoxStyles, const TreeNode& rCurrent, weld::TreeIter* pParent) { std::unique_ptr<weld::TreeIter> pResult = rListBoxStyles.make_iterator(); - const OUString& rName = current.sNodeName; + const OUString& rName = rCurrent.sNodeName; rListBoxStyles.insert(pParent, -1, &rName, nullptr, nullptr, nullptr, false, pResult.get()); - for (const TreeNode& ChildNode : current.children) - FillBox_Impl(rListBoxStyles, ChildNode, pResult.get()); + for (const TreeNode& rChildNode : rCurrent.children) + FillBox_Impl(rListBoxStyles, rChildNode, pResult.get()); } void InspectorTextPanel::updateEntries(const std::vector<TreeNode>& rStore) { - mxListBoxStyles->freeze(); - mxListBoxStyles->clear(); - for (const TreeNode& ChildNode : rStore) + mpListBoxStyles->freeze(); + mpListBoxStyles->clear(); + for (const TreeNode& rChildNode : rStore) { - FillBox_Impl(*mxListBoxStyles, ChildNode, nullptr); + FillBox_Impl(*mpListBoxStyles, rChildNode, nullptr); } - mxListBoxStyles->thaw(); + mpListBoxStyles->thaw(); - weld::TreeView* pTreeDiagram = mxListBoxStyles.get(); + weld::TreeView* pTreeDiagram = mpListBoxStyles.get(); pTreeDiagram->all_foreach([pTreeDiagram](weld::TreeIter& rEntry) { pTreeDiagram->expand_row(rEntry); return false; }); - std::unique_ptr<weld::TreeIter> xEntry = mxListBoxStyles->make_iterator(); - if (!mxListBoxStyles->get_iter_first(*xEntry)) - return; - if (!mxListBoxStyles->iter_next(*xEntry)) - return; - mxListBoxStyles->collapse_row(*xEntry); // Collapse "Default Paragraph Style" + std::unique_ptr<weld::TreeIter> pEntry = mpListBoxStyles->make_iterator(); + mpListBoxStyles->get_iter_first(*pEntry); + mpListBoxStyles->iter_next(*pEntry); + mpListBoxStyles->collapse_row(*pEntry); // Collapse "Default Paragraph Style" } InspectorTextPanel::~InspectorTextPanel() { disposeOnce(); } void InspectorTextPanel::dispose() { - mxListBoxStyles.reset(); + mpListBoxStyles.reset(); PanelLayout::dispose(); } |