[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig

[shubham656 (via logerrit)]

 include/svx/float3d.hxx             |    1 -
 svx/source/engine3d/float3d.cxx     |    2 --
 svx/uiconfig/ui/docking3deffects.ui |   19 -------------------
 3 files changed, 22 deletions(-)

New commits:
commit 5da3ae08596c2465532e662537f5292454a84a3e
Author:     shubham656 <shubham656jain at gmail.com>
AuthorDate: Mon Dec 21 19:15:56 2020 +0530
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Tue Jan 5 07:57:03 2021 +0100

    tdf#131427 Remove button "Texture, Shadow and Color" in 3D Effects dialog
    
    Change-Id: I72146e7f3aac9b02c6fca2ae984e70e01d1c07fa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108102
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index fb24c7fa1e2a..a48181d487fe 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -153,7 +153,6 @@ private:
     std::unique_ptr<weld::ToggleButton> m_xBtnTexColor;
     std::unique_ptr<weld::ToggleButton> m_xBtnTexReplace;
     std::unique_ptr<weld::ToggleButton> m_xBtnTexModulate;
-    std::unique_ptr<weld::ToggleButton> m_xBtnTexBlend;
     std::unique_ptr<weld::ToggleButton> m_xBtnTexObjectX;
     std::unique_ptr<weld::ToggleButton> m_xBtnTexParallelX;
     std::unique_ptr<weld::ToggleButton> m_xBtnTexCircleX;
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 8636cfc2baaa..8f5da0ce79e3 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -153,7 +153,6 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
     , m_xBtnTexColor(m_xBuilder->weld_toggle_button("texcolor"))
     , m_xBtnTexReplace(m_xBuilder->weld_toggle_button("texreplace"))
     , m_xBtnTexModulate(m_xBuilder->weld_toggle_button("texmodulate"))
-    , m_xBtnTexBlend(m_xBuilder->weld_toggle_button("texblend"))
     , m_xBtnTexObjectX(m_xBuilder->weld_toggle_button("texobjx"))
     , m_xBtnTexParallelX(m_xBuilder->weld_toggle_button("texparallelx"))
     , m_xBtnTexCircleX(m_xBuilder->weld_toggle_button("texcirclex"))
@@ -401,7 +400,6 @@ void Svx3DWin::dispose()
     m_xBtnTexColor.reset();
     m_xBtnTexReplace.reset();
     m_xBtnTexModulate.reset();
-    m_xBtnTexBlend.reset();
     m_xBtnTexObjectX.reset();
     m_xBtnTexParallelX.reset();
     m_xBtnTexCircleX.reset();
diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui
index 9a057041eb3b..b771683be3d5 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -1678,7 +1678,6 @@
                 <accessibility>
                   <relation type="label-for" target="texreplace"/>
                   <relation type="label-for" target="texmodulate"/>
-                  <relation type="label-for" target="texblend"/>
                 </accessibility>
               </object>
               <packing>
@@ -1826,24 +1825,6 @@
                 <property name="top_attach">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkToggleButton" id="texblend">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes" context="docking3deffects|texblend|tooltip_text">Texture, Shadow and Color</property>
-                <property name="halign">start</property>
-                <property name="hexpand">True</property>
-                <property name="image">image42</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label22"/>
-                </accessibility>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkToggleButton" id="texobjx">
                 <property name="visible">True</property>