[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source svx/uiconfig

[Pranam Lashkari (via logerrit)]

 svx/source/sidebar/text/TextPropertyPanel.cxx |    7 +++++++
 svx/source/sidebar/text/TextPropertyPanel.hxx |    2 ++
 svx/uiconfig/ui/sidebartextpanel.ui           |   25 +++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

New commits:
commit 2b77fd26283bab07e55542e4354f2019ef446968
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Thu May 7 19:21:04 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri May 8 18:02:44 2020 +0200

    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 at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 2c8e0ccf20cc..fce4682eb2e1 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;
     const SfxViewShell* pViewShell = SfxViewShell::Current();
@@ -68,6 +70,8 @@ void TextPropertyPanel::dispose()
     mpToolBoxFontColorSw.clear();
     mpToolBoxFontColor.clear();
     mpToolBoxBackgroundColor.clear();
+    mpResetAttr.clear();
+    mpSetDefault.clear();
 
     PanelLayout::dispose();
 }
@@ -110,6 +114,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
@@ -318,6 +318,31 @@
                 <property name="position">3</property>
               </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>