summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx2
-rw-r--r--sd/uiconfig/sdraw/menubar/menubar.xml4
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar.ui146
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_compact.ui215
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui14
-rw-r--r--sd/uiconfig/sdraw/ui/notebookbar_single.ui122
6 files changed, 2 insertions, 501 deletions
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index fb720af1f034..5341acc24f13 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -348,6 +348,8 @@ void SlideBackground::HandleContextChange(
else if ( IsDraw() )
{
mxMasterLabel->set_label(SdResId(STR_MASTERPAGE_LABEL));
+ mxDspMasterBackground->hide();
+ mxDspMasterObjects->hide();
if (maContext == maDrawOtherContext)
{
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index bdcc15444dc8..a2d06a2ec2ec 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -448,10 +448,6 @@
<menu:menuitem menu:id=".uno:InsertMasterPage"/>
<menu:menuitem menu:id=".uno:DeleteMasterPage"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:DisplayMasterBackground"/>
- <menu:menuitem menu:id=".uno:DisplayMasterObjects"/>
- <menu:menuitem menu:id=".uno:MasterLayouts"/>
- <menu:menuseparator/>
<menu:menu menu:id=".uno:SlideMoveMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:MovePageFirst"/>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 512ddb512df7..8824cc4637cc 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1355,20 +1355,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuSlide-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterBackground</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuSlide-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterObjects</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuSlide-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -6281,83 +6267,6 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Page-Section-MasterSlide1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="GtkBox" id="GroupB57">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="LineA26">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Page-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterBackground</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">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="LineB28">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Page-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterObjects</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">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <style>
- <class name="priority-2"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Page-Section-Arrange">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -17655,61 +17564,6 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Master-Section-MasterLayouts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="GtkSeparator" id="separator61">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="orientation">vertical</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom124">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="toolbar_style">both</property>
- <property name="show_arrow">False</property>
- <property name="icon_size">3</property>
- <child>
- <object class="GtkToolButton" id="MasterPage-MasterLayouts1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MasterLayouts</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">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Master-Section-ShowHide">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index 7745842f0f95..bef513927bbe 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -1263,20 +1263,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuSlide-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterBackground</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuSlide-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterObjects</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuSlide-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -6117,85 +6103,6 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Layout-Section-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom69">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Page-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterBackground</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">1</property>
- </packing>
- </child>
- <style>
- <class name="priority-7"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
- <object class="VclOptionalBox" id="Layout-Section-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="SectionBottom66">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Page-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterObjects</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">1</property>
- </packing>
- </child>
- <style>
- <class name="priority-6"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">10</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Layout-Section-SelectGroup">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -18674,128 +18581,6 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Master-Section-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Anchor1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Master-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterBackground</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">1</property>
- </packing>
- </child>
- <style>
- <class name="priority-4"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <object class="VclOptionalBox" id="Master-Section-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Draw20">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Master-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="visible_horizontal">False</property>
- <property name="action_name">.uno:DisplayMasterObjects</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">0</property>
- </packing>
- </child>
- <style>
- <class name="priority-3"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
- <object class="VclOptionalBox" id="Master-Section-MasterLayouts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Draw21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Master-MasterLayouts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="visible_horizontal">False</property>
- <property name="action_name">.uno:MasterLayouts</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">0</property>
- </packing>
- </child>
- <style>
- <class name="priority-2"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">10</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Master-Section-PageMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
index 59ca912fa6d0..2c0ab5f3ca11 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui
@@ -2757,20 +2757,6 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuSlide-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterBackground</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuSlide-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterObjects</property>
- </object>
- </child>
- <child>
<object class="GtkSeparatorMenuItem" id="MenuSlide-separator5">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_single.ui b/sd/uiconfig/sdraw/ui/notebookbar_single.ui
index 7824636dde81..106c3f5df571 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_single.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_single.ui
@@ -11833,128 +11833,6 @@
</packing>
</child>
<child>
- <object class="VclOptionalBox" id="Master-Section-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Anchor1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Master-DisplayMasterBackground">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DisplayMasterBackground</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">1</property>
- </packing>
- </child>
- <style>
- <class name="priority-4"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <object class="VclOptionalBox" id="Master-Section-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Draw20">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Master-DisplayMasterObjects">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="visible_horizontal">False</property>
- <property name="action_name">.uno:DisplayMasterObjects</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">0</property>
- </packing>
- </child>
- <style>
- <class name="priority-3"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child>
- <object class="VclOptionalBox" id="Master-Section-MasterLayouts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <child>
- <object class="sfxlo-NotebookbarToolBox" id="Draw21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="Master-MasterLayouts">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="visible_horizontal">False</property>
- <property name="action_name">.uno:MasterLayouts</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">0</property>
- </packing>
- </child>
- <style>
- <class name="priority-2"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">10</property>
- </packing>
- </child>
- <child>
<object class="VclOptionalBox" id="Master-Section-PageMode">
<property name="visible">True</property>
<property name="can_focus">False</property>
generated by cgit (git 2.34.1) at 2025-02-13 02:29:57 +0000