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

[Gülşah Köse (via logerrit)]

 sd/source/ui/dlg/dlgolbul.cxx               |    6 -
 sd/uiconfig/sdraw/ui/bulletsandnumbering.ui |  137 ----------------------------
 2 files changed, 1 insertion(+), 142 deletions(-)

New commits:
commit e80de5c8fb38f9af58aa7147169a9cd6ec443151
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Thu Apr 11 13:34:47 2019 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Apr 26 14:39:10 2019 +0200

    Remove tabs: bullets, numberings, images from Impress
    
    Remove that tabs from Bullets and Numbering dialog because they are
    already exists on sidebar.
    
    Change-Id: I293efd4bb4ed3f34830e39768dcb42ceeae62640
    Reviewed-on: https://gerrit.libreoffice.org/70765
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 0ffad3c6c36c..1d71948dcc4d 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -116,13 +116,9 @@ OutlineBulletDlg::OutlineBulletDlg(weld::Window* pParent, const SfxItemSet* pAtt
 
     SetInputSet(&m_aInputSet);
 
-    if (!m_bTitle)
-        AddTabPage("singlenum", RID_SVXPAGE_PICK_SINGLE_NUM);
-    else
+    if (m_bTitle)
         RemoveTabPage("singlenum");
 
-    AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET);
-    AddTabPage("graphics", RID_SVXPAGE_PICK_BMP);
     AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS);
     AddTabPage("position", RID_SVXPAGE_NUM_POSITION);
 }
diff --git a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
index 65b5472c4ea0..a9dd71745e1f 100644
--- a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
+++ b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
@@ -127,143 +127,6 @@
                   <placeholder/>
                 </child>
               </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="bullets">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="bulletsandnumbering|bullets">Bullets</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="singlenum">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="bulletsandnumbering|singlenum">Numbering</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="graphics">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="bulletsandnumbering|graphics">Image</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
               <packing>
                 <property name="position">3</property>
               </packing>