summaryrefslogtreecommitdiff
path: root/svx/source/sidebar
diff options
context:
space:
mode:
authorShivam Kumar Singh <shivamhere247@gmail.com>2020-05-31 22:55:40 +0530
committerMike Kaganski <mike.kaganski@collabora.com>2020-06-02 12:00:32 +0200
commita9b47360c2af2514b1064fb179f9fb9f0b8ad225 (patch)
tree4361c7726a5509dbf8e09526df0d59295b2d3d4d /svx/source/sidebar
parentbb0039ca67f84d8c46e78f4209c17d2923790140 (diff)
Removed the "Font.." things from the Inspector
Removed all the font related stuff and added a common property listing box for the 'Character' Properties. Another patch coming up for 'Paragraph' properties. Change-Id: I71de4d4fe6536f49e0e700c850e2e714287c5e04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95228 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source/sidebar')
-rw-r--r--svx/source/sidebar/inspector/InspectorTextPanel.cxx12
-rw-r--r--svx/source/sidebar/inspector/InspectorTextPanel.hxx5
2 files changed, 4 insertions, 13 deletions
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 0c719dfccb2f..6eaa6f992573 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -44,22 +44,16 @@ 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)
- , mxFont(m_xBuilder->weld_toolbar("font"))
- , mxFontDispatch(new ToolbarUnoDispatcher(*mxFont, *m_xBuilder, rxFrame))
- , mxFontHeight(m_xBuilder->weld_toolbar("fontheight"))
- , mxFontHeightDispatch(new ToolbarUnoDispatcher(*mxFontHeight, *m_xBuilder, rxFrame))
+ , mxListBoxStyles(m_xBuilder->weld_tree_view("liststore"))
{
+ mxListBoxStyles->set_size_request(-1, mxListBoxStyles->get_height_rows(10));
}
InspectorTextPanel::~InspectorTextPanel() { disposeOnce(); }
void InspectorTextPanel::dispose()
{
- mxFontHeightDispatch.reset();
- mxFontDispatch.reset();
-
- mxFontHeight.reset();
- mxFont.reset();
+ mxListBoxStyles.reset();
PanelLayout::dispose();
}
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.hxx b/svx/source/sidebar/inspector/InspectorTextPanel.hxx
index ed8b24a52d48..0d6160dfe75e 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.hxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.hxx
@@ -42,10 +42,7 @@ public:
const css::uno::Reference<css::frame::XFrame>& rxFrame);
private:
- std::unique_ptr<weld::Toolbar> mxFont;
- std::unique_ptr<ToolbarUnoDispatcher> mxFontDispatch;
- std::unique_ptr<weld::Toolbar> mxFontHeight;
- std::unique_ptr<ToolbarUnoDispatcher> mxFontHeightDispatch;
+ std::unique_ptr<weld::TreeView> mxListBoxStyles; // To dump all the properties
vcl::EnumContext maContext;
};