You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/02/06 15:37:33 UTC
[openoffice] branch AOO41X updated (a246698 -> 152bbaf)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from a246698 Remove 'old-style' shadow from Calc preview
new 59c54f2 Changed order of Zoom In/Out in Page Preview toolbar (Writer)
new 152bbaf Changed order of Zoom In/Out in Page Preview toolbar (Calc)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/helpcontent2/source/text/scalc/main0210.xhp | 14 +++++++-------
main/helpcontent2/source/text/swriter/main0210.xhp | 11 +++++------
main/sc/uiconfig/scalc/toolbar/previewbar.xml | 10 +++++-----
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 ++++++------
9 files changed, 54 insertions(+), 55 deletions(-)
[openoffice] 02/02: Changed order of Zoom In/Out in Page Preview toolbar (Calc)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 152bbaf08a6a215faa6c9a8ce5d465b3d106865e
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Aug 7 21:44:51 2020 +0200
Changed order of Zoom In/Out in Page Preview toolbar (Calc)
(cherry picked from commit f21749b3994a33d5b98ab18d1bc479bc10695883)
---
main/helpcontent2/source/text/scalc/main0210.xhp | 14 +++++++-------
main/sc/uiconfig/scalc/toolbar/previewbar.xml | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/main/helpcontent2/source/text/scalc/main0210.xhp b/main/helpcontent2/source/text/scalc/main0210.xhp
index 54b57d5..025f267 100644
--- a/main/helpcontent2/source/text/scalc/main0210.xhp
+++ b/main/helpcontent2/source/text/scalc/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,20 +10,20 @@
* 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.
- *
+ *
***********************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textscalcmain0210xml" indexer="include" status="PUBLISH">
@@ -50,10 +50,10 @@
<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/10050000.xhp#massstabvergroessern"/>
-<embed href="text/scalc/02/10050000.xhp#sygross"/>
<embed href="text/scalc/02/10060000.xhp#massstabverkleinern"/>
<embed href="text/scalc/02/10060000.xhp#syklein"/>
+<embed href="text/scalc/02/10050000.xhp#massstabvergroessern"/>
+<embed href="text/scalc/02/10050000.xhp#sygross"/>
<paragraph role="heading" id="hd_id3147394" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/scalc/01/05070000.xhp" name="Page Format">Page Format</link></paragraph>
<embed href="text/scalc/01/05070000.xhp#seitetext"/>
<embed href="text/shared/02/10100000.xhp#schliessen"/>
diff --git a/main/sc/uiconfig/scalc/toolbar/previewbar.xml b/main/sc/uiconfig/scalc/toolbar/previewbar.xml
index d4a34f1..370b345 100644
--- a/main/sc/uiconfig/scalc/toolbar/previewbar.xml
+++ b/main/sc/uiconfig/scalc/toolbar/previewbar.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.
- *
+ *
***********************************************************-->
@@ -29,8 +29,8 @@
<toolbar:toolbaritem xlink:href=".uno:FirstPage"/>
<toolbar:toolbaritem xlink:href=".uno:LastPage"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ZoomIn"/>
<toolbar:toolbaritem xlink:href=".uno:ZoomOut"/>
+ <toolbar:toolbaritem xlink:href=".uno:ZoomIn"/>
<toolbar:toolbaritem xlink:href=".uno:FullScreen"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:PageFormatDialog"/>
[openoffice] 01/02: Changed order of Zoom In/Out in Page Preview toolbar (Writer)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 59c54f2efccb4598f3fff8f266e7c6dace5bb173
Author: mseidel <ms...@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"/>