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 42cc4b92ff Cleaning up Help files (work in progress) 42cc4b92ff is described below commit 42cc4b92ff7c957031755e4ea7c731fb40f9d53a Author: mseidel <msei...@apache.org> AuthorDate: Sat Dec 16 15:39:48 2023 +0100 Cleaning up Help files (work in progress) (cherry picked from commit e6d02bbf2c09290b4ab7add5fb0544a34395cff7) --- main/helpcontent2/source/text/scalc/01/solver.xhp | 14 ++-- .../source/text/schart/01/04050000.xhp | 15 ++-- .../helpcontent2/source/text/schart/01/type_xy.xhp | 15 ++-- .../source/text/sdraw/guide/rotate_object.xhp | 21 +++--- .../source/text/shared/01/05100200.xhp | 18 ++--- .../source/text/shared/01/selectcertificate.xhp | 15 ++-- .../source/text/shared/autopi/01090210.xhp | 15 ++-- .../source/text/shared/autopi/01120000.xhp | 15 ++-- .../source/text/shared/autopi/startup.xhp | 15 ++-- .../source/text/shared/guide/ms_user.xhp | 18 ++--- .../source/text/shared/guide/redlining_accept.xhp | 15 ++-- .../source/text/shared/guide/start_parameters.xhp | 11 ++- .../source/text/shared/optionen/01130200.xhp | 57 ++++++++-------- .../source/text/shared/optionen/online_update.xhp | 79 +++++++++++----------- .../text/shared/optionen/serverauthentication.xhp | 11 ++- 15 files changed, 142 insertions(+), 192 deletions(-) diff --git a/main/helpcontent2/source/text/scalc/01/solver.xhp b/main/helpcontent2/source/text/scalc/01/solver.xhp index 171c3631f8..8eccf970d3 100644 --- a/main/helpcontent2/source/text/scalc/01/solver.xhp +++ b/main/helpcontent2/source/text/scalc/01/solver.xhp @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - <!--*********************************************************** - * + * * 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 @@ -11,21 +9,19 @@ * 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="textscalc01solverxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Solver</title> diff --git a/main/helpcontent2/source/text/schart/01/04050000.xhp b/main/helpcontent2/source/text/schart/01/04050000.xhp index 6e3134959e..4bd708f52a 100644 --- a/main/helpcontent2/source/text/schart/01/04050000.xhp +++ b/main/helpcontent2/source/text/schart/01/04050000.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textschart0104050000xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Y Error Bars</title> diff --git a/main/helpcontent2/source/text/schart/01/type_xy.xhp b/main/helpcontent2/source/text/schart/01/type_xy.xhp index 8a1580f8f3..6702ca55ca 100644 --- a/main/helpcontent2/source/text/schart/01/type_xy.xhp +++ b/main/helpcontent2/source/text/schart/01/type_xy.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textschart01type_xyxhp" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Chart Type XY</title> diff --git a/main/helpcontent2/source/text/sdraw/guide/rotate_object.xhp b/main/helpcontent2/source/text/sdraw/guide/rotate_object.xhp index 2c2f0ef665..c64ff656ba 100644 --- a/main/helpcontent2/source/text/sdraw/guide/rotate_object.xhp +++ b/main/helpcontent2/source/text/sdraw/guide/rotate_object.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textsdrawguiderotate_objectxml" indexer="include"> <title id="tit" xml-lang="en-US">Rotating Objects</title> @@ -45,14 +42,13 @@ <tablecell> <paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="E"> <image id="img_id3154729" src="res/commandimagelist/sc_toggleobjectrotatemode.png" width="0.564cm" height="0.564cm"><alt id="alt_id3154729" xml-lang="en-US">Icon</alt> - </image></paragraph> +</image></paragraph> </tablecell> <tablecell> <paragraph role="paragraph" id="par_id3150716" xml-lang="en-US" l10n="CHG" oldref="14">Select the object you want to rotate. On the <emph>Mode</emph> toolbar in $[officename] Draw or on the <emph>Drawing</emph> bar in $[officename] Impress, click the <emph>Rotate</emph> icon.</paragraph> </tablecell> </tablerow> </table> - <paragraph role="paragraph" id="par_id3149021" xml-lang="en-US" l10n="U" oldref="69">Move the pointer to a corner handle so that the pointer changes to a rotate symbol. Drag the handle to rotate the object.</paragraph> <paragraph role="paragraph" id="par_id0930200803002335" xml-lang="en-US" l10n="NEW">Hold down the Shift key to restrict the rotation to multiples of 15 degrees.</paragraph> <paragraph role="paragraph" id="par_id0930200803002463" xml-lang="en-US" l10n="NEW">Right-click the object to open the context menu. Choose Position and Size - Rotation to enter an exact rotation value.</paragraph> @@ -61,11 +57,10 @@ <tablecell> <paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="E"> <image id="img_id3154023" src="res/helpimg/rotate.png" width="5.424cm" height="3.916cm"><alt id="alt_id3154023" xml-lang="en-US">Icon</alt> - </image></paragraph> +</image></paragraph> </tablecell> </tablerow> </table> - <paragraph role="paragraph" id="par_id3166424" xml-lang="en-US" l10n="U" oldref="16">To change the pivot point, drag the small circle in the center of the object to a new location.</paragraph> <paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="U" oldref="28">To skew the object vertically or horizontally, drag one of the side handles.</paragraph> <section id="relatedtopics"> diff --git a/main/helpcontent2/source/text/shared/01/05100200.xhp b/main/helpcontent2/source/text/shared/01/05100200.xhp index 4b38652e8b..25aed42836 100644 --- a/main/helpcontent2/source/text/shared/01/05100200.xhp +++ b/main/helpcontent2/source/text/shared/01/05100200.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textshared0105100200xhp" status="PUBLISH"> <title id="tit" xml-lang="en-US">Split Cells</title> @@ -53,14 +50,13 @@ <tablecell> <paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="E"> <image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.423cm" height="0.423cm"><alt id="alt_id3147275" xml-lang="en-US">Icon</alt> - </image></paragraph> +</image></paragraph> </tablecell> <tablecell> <paragraph role="paragraph" id="par_id3150616" xml-lang="en-US" l10n="U" oldref="84">Split Cells</paragraph> </tablecell> </tablerow> </table> - </section> </section> <!-- removed HID SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT --> diff --git a/main/helpcontent2/source/text/shared/01/selectcertificate.xhp b/main/helpcontent2/source/text/shared/01/selectcertificate.xhp index 2510f55215..6fa7f92fdb 100644 --- a/main/helpcontent2/source/text/shared/01/selectcertificate.xhp +++ b/main/helpcontent2/source/text/shared/01/selectcertificate.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textshared01selectcertificatexhp" indexer="include"> <title id="tit" xml-lang="en-US">Select Certificate</title> diff --git a/main/helpcontent2/source/text/shared/autopi/01090210.xhp b/main/helpcontent2/source/text/shared/autopi/01090210.xhp index e86209cb2e..d713288aaf 100644 --- a/main/helpcontent2/source/text/shared/autopi/01090210.xhp +++ b/main/helpcontent2/source/text/shared/autopi/01090210.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textsharedautopi01090210xml" indexer="include"> <title id="tit" xml-lang="en-US">Form Wizard - Add Subform Fields</title> diff --git a/main/helpcontent2/source/text/shared/autopi/01120000.xhp b/main/helpcontent2/source/text/shared/autopi/01120000.xhp index 9e4844c168..9a0eca056f 100644 --- a/main/helpcontent2/source/text/shared/autopi/01120000.xhp +++ b/main/helpcontent2/source/text/shared/autopi/01120000.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textsharedautopi01120000xml" indexer="include"> <title id="tit" xml-lang="en-US">Group Element Wizard</title> diff --git a/main/helpcontent2/source/text/shared/autopi/startup.xhp b/main/helpcontent2/source/text/shared/autopi/startup.xhp index 613bde199c..dc87adb8ae 100644 --- a/main/helpcontent2/source/text/shared/autopi/startup.xhp +++ b/main/helpcontent2/source/text/shared/autopi/startup.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textsharedautopistartupxhp" indexer="include"> <title id="tit" xml-lang="en-US">Start-up Wizard</title> diff --git a/main/helpcontent2/source/text/shared/guide/ms_user.xhp b/main/helpcontent2/source/text/shared/guide/ms_user.xhp index 9a1069948a..4b94ea94bd 100644 --- a/main/helpcontent2/source/text/shared/guide/ms_user.xhp +++ b/main/helpcontent2/source/text/shared/guide/ms_user.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textsharedguidems_userxml" indexer="include"> <title id="tit" xml-lang="en-US">Using Microsoft Office and $[officename]</title> @@ -81,7 +78,6 @@ </tablecell> </tablerow> </table> - <paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2" l10n="U" oldref="12">Saving as a Microsoft Office File</paragraph> <list type="ordered"> <listitem> @@ -100,7 +96,7 @@ <paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format and ODF settings</emph> area, first select a document type, then select the file type for saving.</paragraph> </listitem> </list> -<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="18">From now on, if you save a document, the <emph>File type </emph>will be set according to your choice. Of course, you still can select another file type in the file save dialog.</paragraph> +<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="18">From now on, if you save a document, the <emph>File type</emph> will be set according to your choice. Of course, you still can select another file type in the file save dialog.</paragraph> <switch select="sys"> <case select="WIN"> <paragraph role="heading" id="hd_id3156423" xml-lang="en-US" level="2" l10n="CHG" oldref="19">Opening Microsoft Office Files by Default</paragraph> diff --git a/main/helpcontent2/source/text/shared/guide/redlining_accept.xhp b/main/helpcontent2/source/text/shared/guide/redlining_accept.xhp index 959f0f8036..74cdb819ea 100644 --- a/main/helpcontent2/source/text/shared/guide/redlining_accept.xhp +++ b/main/helpcontent2/source/text/shared/guide/redlining_accept.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,21 +9,19 @@ * 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="textsharedguideredlining_acceptxml" indexer="include"> <title id="tit" xml-lang="en-US">Accepting or Rejecting Changes</title> diff --git a/main/helpcontent2/source/text/shared/guide/start_parameters.xhp b/main/helpcontent2/source/text/shared/guide/start_parameters.xhp index 083b2a020a..8f6f94296f 100644 --- a/main/helpcontent2/source/text/shared/guide/start_parameters.xhp +++ b/main/helpcontent2/source/text/shared/guide/start_parameters.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - <!--*********************************************************** - * + * * 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 +9,18 @@ * 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="textsharedguidestart_parametersxml" indexer="include" status="PUBLISH"> diff --git a/main/helpcontent2/source/text/shared/optionen/01130200.xhp b/main/helpcontent2/source/text/shared/optionen/01130200.xhp index 3437573325..2fe7acd0c2 100644 --- a/main/helpcontent2/source/text/shared/optionen/01130200.xhp +++ b/main/helpcontent2/source/text/shared/optionen/01130200.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,42 +9,40 @@ * 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="textsharedoptionen01130200xml" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">Microsoft Office</title> - <filename>/text/shared/optionen/01130200.xhp</filename> - </topic> - </meta> - <body> - <section id="office1"> - <paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01130200.xhp" name="Microsoft Office">Microsoft Office</link></paragraph> - <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="2">Specifies the settings for importing and exporting Microsoft Office OLE objects.</paragraph> - </section> - <paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="7">These settings are valid when no Microsoft OLE server exists (for example, in UNIX) or when there is no $[officename] OLE server ready for editing the OLE objects.</paragraph> - <paragraph xml-lang="en-US" id="par_id0107200910364795" role="paragraph" l10n="NEW">If an OLE server is active for the embedded object, then the OLE server will be used to handle the object.</paragraph> - <paragraph xml-lang="en-US" id="par_id0107200910364725" role="paragraph" l10n="NEW">If no OLE server is active for MathType objects, then embedded MathType objects can be converted to %PRODUCTNAME Math objects. For this conversion, the embedded MathType objects must not exceed the MathType 3.1 specifications.<comment>mail answer by Thomas Lange re i97686</comment></paragraph> - <section id="howtoget"> - <embed href="text/shared/00/00000406.xhp#etsofi2"/> - </section> +<topic id="textsharedoptionen01130200xml" indexer="include" status="PUBLISH"> +<title xml-lang="en-US" id="tit">Microsoft Office</title> +<filename>/text/shared/optionen/01130200.xhp</filename> +</topic> +</meta> +<body> +<section id="office1"> +<paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01130200.xhp" name="Microsoft Office">Microsoft Office</link></paragraph> +<paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="2">Specifies the settings for importing and exporting Microsoft Office OLE objects.</paragraph> +</section> +<paragraph xml-lang="en-US" id="par_id3159233" role="paragraph" l10n="U" oldref="7">These settings are valid when no Microsoft OLE server exists (for example, in UNIX) or when there is no $[officename] OLE server ready for editing the OLE objects.</paragraph> +<paragraph xml-lang="en-US" id="par_id0107200910364795" role="paragraph" l10n="NEW">If an OLE server is active for the embedded object, then the OLE server will be used to handle the object.</paragraph> +<paragraph xml-lang="en-US" id="par_id0107200910364725" role="paragraph" l10n="NEW">If no OLE server is active for MathType objects, then embedded MathType objects can be converted to %PRODUCTNAME Math objects. For this conversion, the embedded MathType objects must not exceed the MathType 3.1 specifications.<comment>mail answer by Thomas Lange re i97686</comment></paragraph> +<section id="howtoget"> +<embed href="text/shared/00/00000406.xhp#etsofi2"/> +</section> <bookmark xml-lang="en-US" branch="hid/CUI_HID_OFAPAGE_MSFLTR2_CLB" id="bm_id3158430" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3146798" role="heading" level="2" l10n="U" oldref="3">List Box</paragraph> - <paragraph xml-lang="en-US" id="par_id3150670" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S). </ahelp></paragraph> - <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph> - <paragraph xml-lang="en-US" id="par_id3153880" role="paragraph" l10n="U" oldref="6">Mark the box in the [S] column in front of the entry if a $[officename] OLE object is to be converted into the specified Microsoft OLE object when a document is saved in a Microsoft file format.</paragraph> - </body> -</helpdocument> \ No newline at end of file +<paragraph xml-lang="en-US" id="par_id3150670" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_OFAPAGE_MSFLTR2_CLB">The<emph> List Box </emph>field displays the entries for the pair of OLE objects that can be converted when loading into $[officename] (L) and/or when saving into a Microsoft format (S).</ahelp></paragraph> +<paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="5">Mark the box in the [L] column in front of the entry if a Microsoft OLE object is to be converted into the specified $[officename] OLE object when a Microsoft document is loaded into $[officename].</paragraph> +<paragraph xml-lang="en-US" id="par_id3153880" role="paragraph" l10n="U" oldref="6">Mark the box in the [S] column in front of the entry if a $[officename] OLE object is to be converted into the specified Microsoft OLE object when a document is saved in a Microsoft file format.</paragraph> +</body> +</helpdocument> diff --git a/main/helpcontent2/source/text/shared/optionen/online_update.xhp b/main/helpcontent2/source/text/shared/optionen/online_update.xhp index 7bc7bfa1bf..05120569f5 100644 --- a/main/helpcontent2/source/text/shared/optionen/online_update.xhp +++ b/main/helpcontent2/source/text/shared/optionen/online_update.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - + <!--*********************************************************** - * + * * 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,65 +9,63 @@ * 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="textsharedoptionenonlineupdatexhp" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">Online Update</title> - <filename>/text/shared/optionen/online_update.xhp</filename> - </topic> - </meta> - <body> - <section id="online_update"> +<topic id="textsharedoptionenonlineupdatexhp" indexer="include" status="PUBLISH"> +<title xml-lang="en-US" id="tit">Online Update</title> +<filename>/text/shared/optionen/online_update.xhp</filename> +</topic> +</meta> +<body> +<section id="online_update"> <bookmark xml-lang="en-US" branch="index" id="bm_id7657094"><bookmark_value>update options</bookmark_value> - <bookmark_value>online update options</bookmark_value> - <bookmark_value>options;online update</bookmark_value> - <bookmark_value>online updates; checking automatically</bookmark_value> - <bookmark_value>updates; checking automatically</bookmark_value> - <bookmark_value>Internet; checking for updates</bookmark_value> +<bookmark_value>online update options</bookmark_value> +<bookmark_value>options;online update</bookmark_value> +<bookmark_value>online updates; checking automatically</bookmark_value> +<bookmark_value>updates; checking automatically</bookmark_value> +<bookmark_value>Internet; checking for updates</bookmark_value> </bookmark> <paragraph xml-lang="en-US" id="hd_id29297" role="heading" level="1" l10n="NEW"><link href="text/shared/optionen/online_update.xhp">Online Update</link></paragraph> - <paragraph xml-lang="en-US" id="par_id8754844" role="paragraph" l10n="NEW">Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME.</paragraph> - </section> - <section id="howtoget"> - <embed href="text/shared/00/00000406.xhp#online_update"/> - </section> +<paragraph xml-lang="en-US" id="par_id8754844" role="paragraph" l10n="NEW">Specifies some options for the automatic notification and downloading of online updates to %PRODUCTNAME.</paragraph> +</section> +<section id="howtoget"> +<embed href="text/shared/00/00000406.xhp#online_update"/> +</section> <bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK" id="bm_id877101" localize="false"/> <paragraph xml-lang="en-US" id="hd_id2189397" role="heading" level="2" l10n="NEW">Check for updates automatically</paragraph> - <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNA [...] - <paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph> - <paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph> - <paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph> +<paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - P [...] +<paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph> +<paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph> +<paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph> <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY" id="bm_id3116855" localize="false"/> <paragraph xml-lang="en-US" id="hd_id266426" role="heading" level="3" l10n="NEW">Every Day</paragraph> - <paragraph xml-lang="en-US" id="par_id3031098" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a day.</ahelp></paragraph> +<paragraph xml-lang="en-US" id="par_id3031098" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a day.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK" id="bm_id9302041" localize="false"/> <paragraph xml-lang="en-US" id="hd_id8276619" role="heading" level="3" l10n="NEW">Every Week</paragraph> - <paragraph xml-lang="en-US" id="par_id7824030" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a week. This is the default setting.</ahelp></paragraph> +<paragraph xml-lang="en-US" id="par_id7824030" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a week. This is the default setting.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH" id="bm_id5097201" localize="false"/> <paragraph xml-lang="en-US" id="hd_id7534104" role="heading" level="3" l10n="NEW">Every Month</paragraph> - <paragraph xml-lang="en-US" id="par_id209051" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a month.</ahelp></paragraph> +<paragraph xml-lang="en-US" id="par_id209051" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed once a month.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW" id="bm_id5540025" localize="false"/> <paragraph xml-lang="en-US" id="hd_id1418805" role="heading" level="3" l10n="NEW">Check now</paragraph> - <paragraph xml-lang="en-US" id="par_id1743522" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed now.</ahelp></paragraph><comment>Autodownload help id is in shared/01/online_update.xhp</comment> +<paragraph xml-lang="en-US" id="par_id1743522" role="paragraph" l10n="NEW"><ahelp hid=".">A check will be performed now.</ahelp></paragraph><comment>Autodownload help id is in shared/01/online_update.xhp</comment> <paragraph xml-lang="en-US" id="hd_id5994140" role="heading" level="2" l10n="NEW">Download updates automatically</paragraph> - <paragraph xml-lang="en-US" id="par_id7870113" role="paragraph" l10n="NEW"><ahelp hid=".">Select to download an available online update file automatically to the specified folder.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="hd_id3051545" role="heading" level="3" l10n="NEW">Download destination</paragraph> - <paragraph xml-lang="en-US" id="par_id3061311" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the selected folder to store the downloaded files.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="hd_id4814905" role="heading" level="3" l10n="NEW">Change</paragraph> - <paragraph xml-lang="en-US" id="par_id2143925" role="paragraph" l10n="NEW"><ahelp hid=".">Click to show a dialog box where you can select another folder.</ahelp></paragraph> - </body> -</helpdocument> \ No newline at end of file +<paragraph xml-lang="en-US" id="par_id7870113" role="paragraph" l10n="NEW"><ahelp hid=".">Select to download an available online update file automatically to the specified folder.</ahelp></paragraph> +<paragraph xml-lang="en-US" id="hd_id3051545" role="heading" level="3" l10n="NEW">Download destination</paragraph> +<paragraph xml-lang="en-US" id="par_id3061311" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the selected folder to store the downloaded files.</ahelp></paragraph> +<paragraph xml-lang="en-US" id="hd_id4814905" role="heading" level="3" l10n="NEW">Change</paragraph> +<paragraph xml-lang="en-US" id="par_id2143925" role="paragraph" l10n="NEW"><ahelp hid=".">Click to show a dialog box where you can select another folder.</ahelp></paragraph> +</body> +</helpdocument> diff --git a/main/helpcontent2/source/text/shared/optionen/serverauthentication.xhp b/main/helpcontent2/source/text/shared/optionen/serverauthentication.xhp index fe195f7b1c..8f888f91ae 100644 --- a/main/helpcontent2/source/text/shared/optionen/serverauthentication.xhp +++ b/main/helpcontent2/source/text/shared/optionen/serverauthentication.xhp @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - <!--*********************************************************** - * + * * 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 +9,18 @@ * 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="textsharedoptionenserverauthenticationxhp" indexer="include" status="PUBLISH">