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 fe03d516660f9116ac759201b171144521e41816
Author: Nnamani Ezinne <nnamani.ezi...@collabora.com>
AuthorDate: Mon Nov 8 21:13:59 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Nov 11 10:47:19 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>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a8517c3cbaba..d3353e441474 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3055,6 +3055,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 318f7c61fd67..ac95d565625e 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>
@@ -3432,7 +3432,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>
@@ -3457,7 +3457,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>
@@ -3469,7 +3469,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>
@@ -4991,7 +4991,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>
@@ -5034,7 +5034,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>
@@ -5058,7 +5058,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>
@@ -6172,7 +6172,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>
@@ -6266,7 +6266,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>
@@ -6410,7 +6410,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>
@@ -6453,7 +6453,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>
@@ -6477,7 +6477,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>
@@ -6542,7 +6542,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>
@@ -6677,7 +6677,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>
@@ -6702,7 +6702,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>
@@ -16905,7 +16905,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>
@@ -17116,7 +17116,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 e8967b8e0530..d0b39af77f36 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>
@@ -3441,7 +3441,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>
@@ -3481,7 +3481,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>
@@ -4824,7 +4824,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>
@@ -4861,7 +4861,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>
@@ -6001,7 +6001,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>
@@ -6143,7 +6143,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>
@@ -6282,7 +6282,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>
@@ -6323,7 +6323,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>
@@ -18025,7 +18025,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>
@@ -18448,7 +18448,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 4d06b92f60a1..e27b31d7cd83 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>
@@ -3297,7 +3297,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>
@@ -4516,7 +4516,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>
@@ -6803,7 +6803,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 18ee3754e2d6..743d917d3ce7 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>
@@ -3704,7 +3704,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>
@@ -3728,7 +3728,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>
@@ -5787,7 +5787,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>
@@ -5857,7 +5857,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>
@@ -11853,7 +11853,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>
@@ -11864,7 +11864,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>
@@ -11934,7 +11934,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 7f5a0fef3804..6d120d5b844e 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_single.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_single.ui
@@ -197,7 +197,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>
@@ -249,7 +249,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>
@@ -261,7 +261,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>
@@ -11304,7 +11304,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>
