This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new de6be90764 Re-order page navigation icons in page preview (Writer/Calc)
de6be90764 is described below

commit de6be90764b864137a3acd1f9620c9014cc6edae
Author: mseidel <[email protected]>
AuthorDate: Sat May 21 12:06:04 2022 +0200

    Re-order page navigation icons in page preview (Writer/Calc)
    
    This fixes:
    https://bz.apache.org/ooo/show_bug.cgi?id=23802
    
    (cherry picked from commit e8cfa2eb26e50dac39632598f95355db453e1b0c)
---
 main/helpcontent2/source/text/scalc/main0210.xhp       | 4 ++--
 main/helpcontent2/source/text/swriter/main0210.xhp     | 4 ++--
 main/sc/uiconfig/scalc/toolbar/previewbar.xml          | 3 +--
 main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml  | 3 +--
 main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml     | 3 +--
 main/sw/uiconfig/swform/toolbar/previewobjectbar.xml   | 3 +--
 main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml | 3 +--
 main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml  | 3 +--
 main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml  | 3 +--
 9 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/main/helpcontent2/source/text/scalc/main0210.xhp 
b/main/helpcontent2/source/text/scalc/main0210.xhp
index 025f267941..e34bc29d5c 100644
--- a/main/helpcontent2/source/text/scalc/main0210.xhp
+++ b/main/helpcontent2/source/text/scalc/main0210.xhp
@@ -42,12 +42,12 @@
 <paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="1" 
l10n="CHG" oldref="1"><link href="text/scalc/main0210.xhp" name="Page Preview  
Bar">Page Preview Bar</link></paragraph>
 <paragraph role="paragraph" id="par_id3148663" xml-lang="en-US" l10n="CHG" 
oldref="2"><ahelp hid="HID_SC_WIN_PREVIEW">The <emph>Page Preview</emph> Bar is 
displayed when you choose <emph>File - Page Preview</emph>.</ahelp></paragraph>
 </section>
+<embed href="text/shared/02/10030000.xhp#ersteseite"/>
+<embed href="text/shared/02/10030000.xhp#syersteseite"/>
 <embed href="text/shared/02/10010000.xhp#vorigeseite"/>
 <embed href="text/shared/02/10010000.xhp#syvorigeseite"/>
 <embed href="text/shared/02/10020000.xhp#naechsteseite"/>
 <embed href="text/shared/02/10020000.xhp#synaechsteseite"/>
-<embed href="text/shared/02/10030000.xhp#ersteseite"/>
-<embed href="text/shared/02/10030000.xhp#syersteseite"/>
 <embed href="text/shared/02/10040000.xhp#letzteseite"/>
 <embed href="text/shared/02/10040000.xhp#syletzteseite"/>
 <embed href="text/scalc/02/10060000.xhp#massstabverkleinern"/>
diff --git a/main/helpcontent2/source/text/swriter/main0210.xhp 
b/main/helpcontent2/source/text/swriter/main0210.xhp
index efbeb94742..a33b0e7b67 100644
--- a/main/helpcontent2/source/text/swriter/main0210.xhp
+++ b/main/helpcontent2/source/text/swriter/main0210.xhp
@@ -38,12 +38,12 @@
 <paragraph role="heading" id="hd_id3145783" xml-lang="en-US" level="1" 
l10n="U" oldref="1"><link href="text/swriter/main0210.xhp" name="Page 
Preview">Page Preview</link></paragraph>
 <paragraph role="paragraph" id="par_id3154253" xml-lang="en-US" l10n="U" 
oldref="2">The <emph>Page Preview</emph> Bar appears when you view the current 
document in the page preview mode.</paragraph>
 </section>
+<embed href="text/shared/02/10030000.xhp#ersteseite"/>
+<embed href="text/shared/02/10030000.xhp#syersteseite"/>
 <embed href="text/shared/02/10010000.xhp#vorigeseite"/>
 <embed href="text/shared/02/10010000.xhp#syvorigeseite"/>
 <embed href="text/shared/02/10020000.xhp#naechsteseite"/>
 <embed href="text/shared/02/10020000.xhp#synaechsteseite"/>
-<embed href="text/shared/02/10030000.xhp#ersteseite"/>
-<embed href="text/shared/02/10030000.xhp#syersteseite"/>
 <embed href="text/shared/02/10040000.xhp#letzteseite"/>
 <embed href="text/shared/02/10040000.xhp#syletzteseite"/>
 <embed href="text/swriter/02/10050000.xhp#zweiseiten"/>
diff --git a/main/sc/uiconfig/scalc/toolbar/previewbar.xml 
b/main/sc/uiconfig/scalc/toolbar/previewbar.xml
index 370b345a3a..f4b26bc140 100644
--- a/main/sc/uiconfig/scalc/toolbar/previewbar.xml
+++ b/main/sc/uiconfig/scalc/toolbar/previewbar.xml
@@ -23,10 +23,9 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
+ <toolbar:toolbaritem xlink:href=".uno:FirstPage"/>
  <toolbar:toolbaritem xlink:href=".uno:PreviousPage"/>
  <toolbar:toolbaritem xlink:href=".uno:NextPage"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:FirstPage"/>
  <toolbar:toolbaritem xlink:href=".uno:LastPage"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ZoomOut"/>
diff --git a/main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml 
b/main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
index 85c5ef2a9b..11e7ee404d 100644
--- a/main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
@@ -23,10 +23,9 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
  <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
diff --git a/main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml 
b/main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
index 85c5ef2a9b..11e7ee404d 100644
--- a/main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
@@ -23,10 +23,9 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
  <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
diff --git a/main/sw/uiconfig/swform/toolbar/previewobjectbar.xml 
b/main/sw/uiconfig/swform/toolbar/previewobjectbar.xml
index 85c5ef2a9b..11e7ee404d 100644
--- a/main/sw/uiconfig/swform/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/swform/toolbar/previewobjectbar.xml
@@ -23,10 +23,9 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
  <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
diff --git a/main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml 
b/main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
index 85c5ef2a9b..11e7ee404d 100644
--- a/main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
@@ -23,10 +23,9 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
  <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
diff --git a/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml 
b/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
index 85c5ef2a9b..11e7ee404d 100644
--- a/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
@@ -23,10 +23,9 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
  <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>
diff --git a/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml 
b/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
index 85c5ef2a9b..11e7ee404d 100644
--- a/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
@@ -23,10 +23,9 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:PageUp"/>
  <toolbar:toolbaritem xlink:href=".uno:PageDown"/>
- <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages"/>

Reply via email to