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 c3773aaf627dda07125358c77f767ac1fe4fa755
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 16:01:04 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/+/125047
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e748aa006411..6a1e0871fceb 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3025,6 +3025,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 6fb8639c1729..e31737653f4f 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1175,7 +1175,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>
@@ -1249,14 +1249,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>
@@ -3414,7 +3414,7 @@
<child>
<object class="GtkToolButton"
id="Home-InsertPage">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3438,7 +3438,7 @@
<object class="GtkToolButton"
id="Home-DuplicatePage">
<property name="visible">True</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>
@@ -3449,7 +3449,7 @@
<object class="GtkToolButton"
id="Home-DeletePage">
<property name="visible">True</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>
@@ -4924,7 +4924,7 @@
<child>
<object class="GtkToolButton"
id="Insert-InsertPage">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4966,7 +4966,7 @@
<child>
<object class="GtkToolButton"
id="Insert-DuplicatePage">
<property name="visible">True</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4989,7 +4989,7 @@
<child>
<object class="GtkToolButton"
id="Insert-ImportFromFile">
<property name="visible">True</property>
- <property
name="action_name">.uno:ImportFromFile</property>
+ <property
name="action_name">.uno:ImportSlideFromFile</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6069,7 +6069,7 @@
<child>
<object class="GtkToolButton"
id="Insert-InsertPage1">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6162,7 +6162,7 @@
<child>
<object class="GtkToolButton"
id="Slide-PageSetup">
<property name="visible">True</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6302,7 +6302,7 @@
<child>
<object class="GtkToolButton"
id="Slide-InsertPage">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6344,7 +6344,7 @@
<child>
<object class="GtkToolButton"
id="Slide-DuplicatePage">
<property name="visible">True</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6367,7 +6367,7 @@
<child>
<object class="GtkToolButton"
id="Slide-DeletePage">
<property name="visible">True</property>
- <property
name="action_name">.uno:DeletePage</property>
+ <property
name="action_name">.uno:DeleteSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6431,7 +6431,7 @@
<child>
<object class="GtkToolButton"
id="Slide-RenamePage">
<property name="visible">True</property>
- <property
name="action_name">.uno:RenamePage</property>
+ <property
name="action_name">.uno:RenameSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6563,7 +6563,7 @@
<child>
<object class="GtkToolButton"
id="Slide-MovePageUp">
<property name="visible">True</property>
- <property
name="action_name">.uno:MovePageUp</property>
+ <property
name="action_name">.uno:MoveSlideUp</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6587,7 +6587,7 @@
<object class="GtkToolButton"
id="Slide-MovePageDown">
<property name="visible">True</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>
@@ -16601,7 +16601,7 @@
<child>
<object class="GtkToolButton"
id="MasterPageMenu-PageSetup1">
<property name="visible">True</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
</object>
<packing>
<property name="expand">False</property>
@@ -16808,7 +16808,7 @@
<child>
<object class="GtkToolButton"
id="MasterPageMenu-PageSetup">
<property name="visible">True</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 163eb1a69f3f..21a90fc1d5fd 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -1294,7 +1294,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>
@@ -1368,14 +1368,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>
@@ -3429,7 +3429,7 @@
<child>
<object class="GtkToolButton"
id="Home-InsertPage">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3468,7 +3468,7 @@
<object class="GtkToolButton"
id="Home-DuplicatePage">
<property name="visible">True</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>
@@ -4767,7 +4767,7 @@
<child>
<object class="GtkToolButton"
id="Insert-InsertPage">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4803,7 +4803,7 @@
<child>
<object class="GtkToolButton"
id="Insert-DuplicatePage">
<property name="visible">True</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -5915,7 +5915,7 @@
<child>
<object class="GtkToolButton"
id="Page-PageSetup">
<property name="visible">True</property>
- <property
name="action_name">.uno:PageSetup</property>
+ <property
name="action_name">.uno:SlideSetup</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6053,7 +6053,7 @@
<child>
<object class="GtkToolButton"
id="Page-DeletePage">
<property name="visible">True</property>
- <property
name="action_name">.uno:DeletePage</property>
+ <property
name="action_name">.uno:DeleteSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6189,7 +6189,7 @@
<child>
<object class="GtkToolButton"
id="Page-MovePageUp">
<property name="visible">True</property>
- <property
name="action_name">.uno:MovePageUp</property>
+ <property
name="action_name">.uno:MoveSlideUp</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6229,7 +6229,7 @@
<object class="GtkToolButton"
id="Page-MovePageDown1">
<property name="visible">True</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>
@@ -17613,7 +17613,7 @@
<object class="GtkToolButton"
id="Master-PageSetup">
<property name="visible">True</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>
@@ -18027,7 +18027,7 @@
<object class="GtkToolButton"
id="MasterPage-PageSetup">
<property name="visible">True</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 c0faa924fe4f..461f13833e9b 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>
@@ -1767,14 +1767,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>
@@ -3295,7 +3295,7 @@
<child>
<object class="GtkToolButton"
id="Default-InsertPage">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4478,7 +4478,7 @@
<child>
<object class="GtkToolButton"
id="Text-InsertPage">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -6693,7 +6693,7 @@
<child>
<object class="GtkToolButton"
id="Default-InsertPage1">
<property name="visible">True</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 0702698a220d..ba8dd6409a10 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>
@@ -1684,14 +1684,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>
@@ -3694,7 +3694,7 @@
<child>
<object class="GtkToolButton"
id="InsertPage">
<property
name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -3717,7 +3717,7 @@
<child>
<object class="GtkToolButton"
id="DuplicateSlide2">
<property
name="visible">True</property>
- <property
name="action_name">.uno:DuplicatePage</property>
+ <property
name="action_name">.uno:DuplicateSlide</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -5711,7 +5711,7 @@
<child>
<object class="GtkToolButton"
id="InsertPageField3">
<property
name="visible">True</property>
- <property
name="action_name">.uno:InsertPageField</property>
+ <property
name="action_name">.uno:InsertSlideField</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -5778,7 +5778,7 @@
<child>
<object class="GtkToolButton"
id="InsertPagesField3">
<property
name="visible">True</property>
- <property
name="action_name">.uno:InsertPagesField</property>
+ <property
name="action_name">.uno:InsertSlidesField</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -11584,7 +11584,7 @@
<child>
<object class="GtkToolButton"
id="InsertPageField1">
<property
name="visible">True</property>
- <property
name="action_name">.uno:InsertPageField</property>
+ <property
name="action_name">.uno:InsertSlideField</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -11594,7 +11594,7 @@
<child>
<object class="GtkToolButton"
id="InsertPagesField1">
<property
name="visible">True</property>
- <property
name="action_name">.uno:InsertPagesField</property>
+ <property
name="action_name">.uno:InsertSlidesField</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -11661,7 +11661,7 @@
<child>
<object class="GtkToolButton"
id="InsertPageTitleField1">
<property
name="visible">True</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 f391b47b78b2..0299bd63790e 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_single.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_single.ui
@@ -192,7 +192,7 @@
<child>
<object class="GtkToolButton"
id="Home-InsertPage">
<property name="visible">True</property>
- <property
name="action_name">.uno:InsertPage</property>
+ <property
name="action_name">.uno:InsertSlide</property>
</object>
<packing>
<property name="expand">False</property>
@@ -242,7 +242,7 @@
<object class="GtkToolButton"
id="Home-DuplicatePage">
<property name="visible">True</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>
@@ -253,7 +253,7 @@
<object class="GtkToolButton"
id="Home-DeletePage">
<property name="visible">True</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>
@@ -10958,7 +10958,7 @@
<object class="GtkToolButton"
id="Master-PageSetup">
<property name="visible">True</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>
