diff options
| author | Pranam Lashkari <lpranam@collabora.com> | 2020-05-07 19:21:04 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-27 08:49:15 +0200 |
| commit | 3530807d113074a825dd6590ef5881b9f568e125 (patch) | |
| tree | 337f5af700b9db0e835d865af2bdd7ff3fb0bd58 /svx | |
| parent | c4617fe203ace1239f7aed866c74fa957b71b0df (diff) | |
fixed clear Direct Formatting button to sidebar in impress
Change-Id: I81cd30b3ce7087122c260dca99e86a3c857447b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93648
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94829
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.cxx | 7 | ||||
| -rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.hxx | 2 | ||||
| -rw-r--r-- | svx/uiconfig/ui/sidebartextpanel.ui | 25 |
3 files changed, 34 insertions, 0 deletions
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 6aa27cd3cd59..e8a69b3f789d 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -46,6 +46,8 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref get(mpToolBoxFontColorSw, "colorbar_writer"); get(mpToolBoxFontColor, "colorbar_others"); get(mpToolBoxBackgroundColor, "colorbar_background"); + get(mpResetAttr, "resetattr"); + get(mpSetDefault, "defaultattr"); bool isMobilePhone = false; if (comphelper::LibreOfficeKit::isActive() && @@ -67,6 +69,8 @@ void TextPropertyPanel::dispose() mpToolBoxFontColorSw.clear(); mpToolBoxFontColor.clear(); mpToolBoxBackgroundColor.clear(); + mpResetAttr.clear(); + mpSetDefault.clear(); PanelLayout::dispose(); } @@ -109,6 +113,9 @@ void TextPropertyPanel::HandleContextChange ( mpToolBoxFontColor->Show(!bWriterText); mpToolBoxFontColorSw->Show(bWriterText); mpToolBoxBackgroundColor->Show(bDrawText); + mpResetAttr->Show(bWriterText); + mpSetDefault->Show(bDrawText); + } } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index bbfe13f030d2..89a57d5e7b25 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -50,6 +50,8 @@ private: VclPtr<ToolBox> mpToolBoxFontColorSw; VclPtr<ToolBox> mpToolBoxFontColor; VclPtr<ToolBox> mpToolBoxBackgroundColor; + VclPtr<ToolBox> mpResetAttr; + VclPtr<ToolBox> mpSetDefault; vcl::EnumContext maContext; }; diff --git a/svx/uiconfig/ui/sidebartextpanel.ui b/svx/uiconfig/ui/sidebartextpanel.ui index 64b19a115db2..e965fbff9ecb 100644 --- a/svx/uiconfig/ui/sidebartextpanel.ui +++ b/svx/uiconfig/ui/sidebartextpanel.ui @@ -319,6 +319,31 @@ </packing> </child> <child> + <object class="sfxlo-SidebarToolBox" id="defaultattr"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <child> + <object class="GtkToolButton" id="setdefault"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="action_name">.uno:SetDefault</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> <object class="sfxlo-SidebarToolBox" id="position"> <property name="visible">True</property> <property name="can_focus">True</property> |