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 701181a Fixed minor issues with UI and help
701181a is described below
commit 701181a70686d0af3beb0de9c58f2e00c6a8c121
Author: mseidel <[email protected]>
AuthorDate: Wed Apr 8 19:20:04 2020 +0200
Fixed minor issues with UI and help
(cherry picked from commit 1673b41ccca2e8351b3f388eb3cad66ccef1c3d1)
---
.../source/text/swriter/01/05040600.xhp | 12 +--
main/sc/source/core/src/compiler.src | 98 +++++++++++-----------
main/sc/source/ui/formdlg/dwfunctr.src | 2 +-
3 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/main/helpcontent2/source/text/swriter/01/05040600.xhp
b/main/helpcontent2/source/text/swriter/01/05040600.xhp
index dd8c0ab..3738f40 100644
--- a/main/helpcontent2/source/text/swriter/01/05040600.xhp
+++ b/main/helpcontent2/source/text/swriter/01/05040600.xhp
@@ -2,7 +2,7 @@
<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,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.
- *
+ *
***********************************************************-->
@@ -68,7 +68,7 @@
<bookmark xml-lang="en-US"
branch="hid/sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINETYPE" id="bm_id3149098"
localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151253" role="heading" level="2" l10n="U"
oldref="19">Weight</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149105" role="paragraph" l10n="U"
oldref="20"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINETYPE">Select the
formatting style for the separator line. If you do not want a separator line,
choose "0.0 pt".</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149105" role="paragraph" l10n="U"
oldref="20"><ahelp hid="SW:LISTBOX:TP_FOOTNOTE_PAGE:DLB_LINETYPE">Select the
formatting style for the separator line. If you do not want a separator line,
choose "0.00 pt".</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEDIST" id="bm_id3147098"
localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149828" role="heading" level="2" l10n="U"
oldref="21">Spacing</paragraph>
@@ -76,4 +76,4 @@
<paragraph xml-lang="en-US" id="par_id3155145" role="tip" l10n="CHG"
oldref="24">To specify the spacing between two footnotes, choose <item
type="menuitem">Format - Paragraph</item>, and then click the <emph>Indents
& Spacing</emph> tab.</paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/main/sc/source/core/src/compiler.src
b/main/sc/source/core/src/compiler.src
index 51c4cf5..54a3ae2 100644
--- a/main/sc/source/core/src/compiler.src
+++ b/main/sc/source/core/src/compiler.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,69 +7,69 @@
* 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.
- *
+ *
*************************************************************/
+
#include "sc.hrc" // Definition RID_XXX
#include <formula/compiler.hrc> // Definition SC_OPCODE_XXX (interne OpCodes)
-
-
Resource RID_FUNCTION_CATEGORIES
{
- String 1
- {
- Text[ en-US ] = "Database" ;
- };
- String 2
- {
- Text[ en-US ] = "Date&Time" ;
- };
- String 3
- {
- Text[ en-US ] = "Financial" ;
- };
- String 4
- {
- Text[ en-US ] = "Information" ;
- };
- String 5
- {
- Text[ en-US ] = "Logical" ;
- };
- String 6
- {
- Text[ en-US ] = "Mathematical" ;
- };
- String 7
- {
- Text[ en-US ] = "Array" ;
- };
- String 8
- {
- Text[ en-US ] = "Statistical" ;
- };
- String 9
- {
- Text[ en-US ] = "Spreadsheet" ;
- };
- String 10
- {
- Text[ en-US ] = "Text" ;
- };
- String 11
- {
- Text[ en-US ] = "Add-in" ;
+ String 1
+ {
+ Text [ en-US ] = "Database" ;
+ };
+ String 2
+ {
+ Text [ en-US ] = "Date & Time" ;
+ };
+ String 3
+ {
+ Text [ en-US ] = "Financial" ;
+ };
+ String 4
+ {
+ Text [ en-US ] = "Information" ;
+ };
+ String 5
+ {
+ Text [ en-US ] = "Logical" ;
+ };
+ String 6
+ {
+ Text [ en-US ] = "Mathematical" ;
+ };
+ String 7
+ {
+ Text [ en-US ] = "Array" ;
+ };
+ String 8
+ {
+ Text [ en-US ] = "Statistical" ;
+ };
+ String 9
+ {
+ Text [ en-US ] = "Spreadsheet" ;
+ };
+ String 10
+ {
+ Text [ en-US ] = "Text" ;
+ };
+ String 11
+ {
+ Text [ en-US ] = "Add-in" ;
};
};
+// ********************************************************************** EOF
diff --git a/main/sc/source/ui/formdlg/dwfunctr.src
b/main/sc/source/ui/formdlg/dwfunctr.src
index e7cd63b..e3258c0 100644
--- a/main/sc/source/ui/formdlg/dwfunctr.src
+++ b/main/sc/source/ui/formdlg/dwfunctr.src
@@ -56,7 +56,7 @@ DockingWindow FID_FUNCTION_BOX
< "Last Used" ; Default ; > ;
< "All" ; Default ; > ;
< "Database" ; Default ; > ;
- < "Date&Time" ; Default ; > ;
+ < "Date & Time" ; Default ; > ;
< "Financial" ; Default ; > ;
< "Information" ; Default ; > ;
< "Logical" ; Default ; > ;
