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 f198345 Changed order of Zoom In/Out in Page Preview toolbar (Writer)
f198345 is described below
commit f1983454cecaae0362e655a38f99edf38a260b8f
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Aug 6 19:53:15 2020 +0200
Changed order of Zoom In/Out in Page Preview toolbar (Writer)
(cherry picked from commit 1f277a59f38fd9adfd4e7ae9e4cd9a939d21dd8f)
---
main/helpcontent2/source/text/swriter/main0210.xhp | 11 +++++------
main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml | 12 ++++++------
main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml | 14 +++++++-------
main/sw/uiconfig/swform/toolbar/previewobjectbar.xml | 12 ++++++------
main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml | 12 ++++++------
main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml | 12 ++++++------
main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml | 12 ++++++------
7 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/main/helpcontent2/source/text/swriter/main0210.xhp
b/main/helpcontent2/source/text/swriter/main0210.xhp
index 205b653..efbeb94 100644
--- a/main/helpcontent2/source/text/swriter/main0210.xhp
+++ b/main/helpcontent2/source/text/swriter/main0210.xhp
@@ -2,7 +2,7 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -10,16 +10,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -52,11 +52,10 @@
<embed href="text/swriter/02/10070000.xhp#symassstab"/>
<embed href="text/swriter/02/10080000.xhp#bookpreview"/>
<embed href="text/swriter/02/10080000.xhp#sybookpreview"/>
-<embed href="text/swriter/02/10010000.xhp#zoomin"/>
<embed href="text/swriter/02/10020000.xhp#zoomout"/>
<embed href="text/swriter/02/10030000.xhp#previewzoom"/>
+<embed href="text/swriter/02/10010000.xhp#zoomin"/>
<embed href="text/shared/01/03110000.xhp#ganzerbildschirm"/>
<embed href="text/shared/00/00000403.xhp#syfullscreen"/>
-
</body>
</helpdocument>
diff --git a/main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
b/main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
index 46e606e..85c5ef2 100644
--- a/main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument
1.0//EN" "toolbar.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,16 +9,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -33,11 +33,11 @@
<toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
<toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPagePreView"/>
diff --git a/main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
b/main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
index 3ee6969..85c5ef2 100644
--- a/main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/sweb/toolbar/previewobjectbar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument
1.0//EN" "toolbar.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,23 +9,23 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar";
xmlns:xlink="http://www.w3.org/1999/xlink";>
<toolbar:toolbaritem xlink:href=".uno:PageUp"/>
<toolbar:toolbaritem xlink:href=".uno:PageDown"/>
-<toolbar:toolbarseparator/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc"/>
<toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc"/>
<toolbar:toolbarseparator/>
@@ -33,11 +33,11 @@
<toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
<toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPagePreView"/>
diff --git a/main/sw/uiconfig/swform/toolbar/previewobjectbar.xml
b/main/sw/uiconfig/swform/toolbar/previewobjectbar.xml
index 46e606e..85c5ef2 100644
--- a/main/sw/uiconfig/swform/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/swform/toolbar/previewobjectbar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument
1.0//EN" "toolbar.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,16 +9,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -33,11 +33,11 @@
<toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
<toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPagePreView"/>
diff --git a/main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
b/main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
index 46e606e..85c5ef2 100644
--- a/main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/swreport/toolbar/previewobjectbar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument
1.0//EN" "toolbar.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,16 +9,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -33,11 +33,11 @@
<toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
<toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPagePreView"/>
diff --git a/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
b/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
index 46e606e..85c5ef2 100644
--- a/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/swriter/toolbar/previewobjectbar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument
1.0//EN" "toolbar.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,16 +9,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -33,11 +33,11 @@
<toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
<toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPagePreView"/>
diff --git a/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
b/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
index 46e606e..85c5ef2 100644
--- a/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
+++ b/main/sw/uiconfig/swxform/toolbar/previewobjectbar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument
1.0//EN" "toolbar.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,16 +9,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -33,11 +33,11 @@
<toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages"/>
<toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PreviewZoom"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomMinus"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomPlus"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
<toolbar:toolbaritem xlink:href=".uno:PrintPagePreView"/>
