desktop/source/lib/init.cxx | 3 +
sd/uiconfig/simpress/ui/notebookbar.ui | 38 +++++++-------
sd/uiconfig/simpress/ui/notebookbar_compact.ui | 26 ++++-----
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 12 ++--
sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 20 +++----
sd/uiconfig/simpress/ui/notebookbar_single.ui | 8 +-
6 files changed, 55 insertions(+), 52 deletions(-)
New commits:
commit 9bdf99aef988592f09cf0f8b6171501253cb6ef8
Author: Nnamani Ezinne <nnamani.ezi...@collabora.com>
AuthorDate: Mon Nov 8 21:13:59 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Nov 15 08:53:55 2021 +0100
Impress- Correct commands mentioning Page instead of Slide
Replaced UNO commands that have similar implementation but their labels
bear Page instead of Slide
Change-Id: I5fb24493478b0a8fdd4e324066d8112497fc9eb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124888
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125049
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9edc10d013e4..2e1bc71f626a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2843,6 +2843,9 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertPage"),
OUString(".uno:DeletePage"),
OUString(".uno:DuplicatePage"),
+ OUString(".uno:InsertSlide"),
+ OUString(".uno:DeleteSlide"),
+ OUString(".uno:DuplicateSlide"),
OUString(".uno:Cut"),
OUString(".uno:Copy"),
OUString(".uno:Paste"),
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index c8f258613db7..0f84fee9b661 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1168,7 +1168,7 @@
<object class="GtkMenuItem" id="MenuInsert-ImportFromFile">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ImportFromFile</property>
+ <property name="action_name">.uno:ImportSlideFromFile</property>
</object>
</child>
<child>
@@ -1242,14 +1242,14 @@
<object class="GtkMenuItem" id="MenuInsert-InsertPageField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPageField</property>
+ <property name="action_name">.uno:InsertSlideField</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuInsert-InsertPagesField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPagesField</property>
+ <property name="action_name">.uno:InsertSlidesField</property>
</object>
</child>
<child>
@@ -3431,7 +3431,7 @@
<object class="GtkToolButton"
id="Home-InsertPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3456,7 +3456,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3468,7 +3468,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property
name="action_name">.uno:DeletePage</property>
+ <property
name="action_name">.uno:DeleteSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4971,7 +4971,7 @@
<object class="GtkToolButton"
id="Insert-InsertPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5014,7 +5014,7 @@
<object class="GtkToolButton"
id="Insert-DuplicatePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5038,7 +5038,7 @@
<object class="GtkToolButton"
id="Insert-ImportFromFile">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ImportFromFile</property>
+ <property
name="action_name">.uno:ImportSlideFromFile</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6152,7 +6152,7 @@
<object class="GtkToolButton"
id="Insert-InsertPage1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6246,7 +6246,7 @@
<object class="GtkToolButton"
id="Slide-PageSetup">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6390,7 +6390,7 @@
<object class="GtkToolButton"
id="Slide-InsertPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6433,7 +6433,7 @@
<object class="GtkToolButton"
id="Slide-DuplicatePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6457,7 +6457,7 @@
<object class="GtkToolButton"
id="Slide-DeletePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DeletePage</property>
+ <property
name="action_name">.uno:DeleteSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6522,7 +6522,7 @@
<object class="GtkToolButton"
id="Slide-RenamePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:RenamePage</property>
+ <property
name="action_name">.uno:RenameSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6657,7 +6657,7 @@
<object class="GtkToolButton"
id="Slide-MovePageUp">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:MovePageUp</property>
+ <property
name="action_name">.uno:MoveSlideUp</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6682,7 +6682,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property
name="action_name">.uno:MovePageDown</property>
+ <property
name="action_name">.uno:MoveSlideDown</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16883,7 +16883,7 @@
<object class="GtkToolButton"
id="MasterPageMenu-PageSetup1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
</object>
<packing>
<property name="expand">False</property>
@@ -17094,7 +17094,7 @@
<object class="GtkToolButton"
id="MasterPageMenu-PageSetup">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index 6b16a8114c25..f4c2da53ea96 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -1287,7 +1287,7 @@
<object class="GtkMenuItem" id="MenuInsert-ImportFromFile">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ImportFromFile</property>
+ <property name="action_name">.uno:ImportSlideFromFile</property>
</object>
</child>
<child>
@@ -1361,14 +1361,14 @@
<object class="GtkMenuItem" id="MenuInsert-InsertPageField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPageField</property>
+ <property name="action_name">.uno:InsertSlideField</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuInsert-InsertPagesField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPagesField</property>
+ <property name="action_name">.uno:InsertSlidesField</property>
</object>
</child>
<child>
@@ -3440,7 +3440,7 @@
<object class="GtkToolButton"
id="Home-InsertPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3480,7 +3480,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4823,7 +4823,7 @@
<object class="GtkToolButton"
id="Insert-InsertPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4860,7 +4860,7 @@
<object class="GtkToolButton"
id="Insert-DuplicatePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6000,7 +6000,7 @@
<object class="GtkToolButton"
id="Page-PageSetup">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6142,7 +6142,7 @@
<object class="GtkToolButton"
id="Page-DeletePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:DeletePage</property>
+ <property
name="action_name">.uno:DeleteSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6281,7 +6281,7 @@
<object class="GtkToolButton"
id="Page-MovePageUp">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:MovePageUp</property>
+ <property
name="action_name">.uno:MoveSlideUp</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6322,7 +6322,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property
name="action_name">.uno:MovePageDown</property>
+ <property
name="action_name">.uno:MoveSlideDown</property>
</object>
<packing>
<property name="expand">False</property>
@@ -18024,7 +18024,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="visible_horizontal">False</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
<property
name="icon_name">sfx2/res/symphony/open_more.png</property>
</object>
<packing>
@@ -18447,7 +18447,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
index 8859be5e67d1..f520bc410b93 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui
@@ -562,7 +562,7 @@
<object class="GtkMenuItem" id="MenuEdit-PageSetup">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PageSetup</property>
+ <property name="action_name">.uno:SlideSetup</property>
</object>
</child>
</object>
@@ -1760,14 +1760,14 @@
<object class="GtkMenuItem" id="MenuInsert-InsertPageField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPageField</property>
+ <property name="action_name">.uno:InsertSlideField</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="MenuInsert-InsertPagesField">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPagesField</property>
+ <property name="action_name">.uno:InsertSlidesField</property>
</object>
</child>
<child>
@@ -3283,7 +3283,7 @@
<object class="GtkToolButton"
id="Default-InsertPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4502,7 +4502,7 @@
<object class="GtkToolButton"
id="Text-InsertPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6789,7 +6789,7 @@
<object class="GtkToolButton"
id="Default-InsertPage1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
index 2210b4e86b20..6c9dfcb7021b 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui
@@ -712,7 +712,7 @@
<object class="GtkMenuItem" id="MenuEdit-PageSetup">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:PageSetup</property>
+ <property name="action_name">.uno:SlideSetup</property>
</object>
</child>
</object>
@@ -1677,14 +1677,14 @@
<object class="GtkMenuItem" id="InsertPageFieldD">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPageField</property>
+ <property name="action_name">.uno:InsertSlideField</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="InsertPagesFieldD">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:InsertPagesField</property>
+ <property name="action_name">.uno:InsertSlidesField</property>
</object>
</child>
<child>
@@ -3703,7 +3703,7 @@
<object class="GtkToolButton"
id="InsertPage">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -3727,7 +3727,7 @@
<object class="GtkToolButton"
id="DuplicateSlide2">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -5786,7 +5786,7 @@
<object class="GtkToolButton"
id="InsertPageField3">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPageField</property>
+ <property
name="action_name">.uno:InsertSlideField</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -5856,7 +5856,7 @@
<object class="GtkToolButton"
id="InsertPagesField3">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPagesField</property>
+ <property
name="action_name">.uno:InsertSlidesField</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -11852,7 +11852,7 @@
<object class="GtkToolButton"
id="InsertPageField1">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPageField</property>
+ <property
name="action_name">.uno:InsertSlideField</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -11863,7 +11863,7 @@
<object class="GtkToolButton"
id="InsertPagesField1">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPagesField</property>
+ <property
name="action_name">.uno:InsertSlidesField</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -11933,7 +11933,7 @@
<object class="GtkToolButton"
id="InsertPageTitleField1">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPageTitleField</property>
+ <property
name="action_name">.uno:InsertSlideTitleField</property>
</object>
<packing>
<property
name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_single.ui
b/sd/uiconfig/simpress/ui/notebookbar_single.ui
index 428e694f9c18..6d984318d099 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_single.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_single.ui
@@ -196,7 +196,7 @@
<object class="GtkToolButton"
id="Home-InsertPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -248,7 +248,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -260,7 +260,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
- <property
name="action_name">.uno:DeletePage</property>
+ <property
name="action_name">.uno:DeleteSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -11387,7 +11387,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="visible_horizontal">False</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
<property
name="icon_name">sfx2/res/symphony/open_more.png</property>
</object>
<packing>
