cui/inc/tipoftheday.hrc | 12
++--
offapi/com/sun/star/sheet/SheetCell.idl | 2
offapi/com/sun/star/sheet/SheetCellRange.idl | 2
offapi/com/sun/star/sheet/SheetCellRanges.idl | 2
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 2
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 28
+++++-----
sc/qa/uitest/search_replace/tdf35020.py | 2
sw/qa/uitest/findReplace/tdf119462.py | 2
8 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 18c97df0dcb348134d3ceac022a799338e02d7f5
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat May 2 22:56:41 2020 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun May 3 07:01:08 2020 +0200
Related tdf#131125: Improperly used ampersand
Really search all occurences of Find & Replace
Change-Id: I1c1301451afa4d339902a275594ecb4cd46030db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93331
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index bbceb25af47a..15c23a398908 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -55,7 +55,7 @@ const std::tuple<const char*, OUString, OUString>
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDFs)
with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice";,
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Optimize your table layout with Table ▸
Size ▸ Distribute Rows / Columns Evenly."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find & Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools ▸
Options ▸ %PRODUCTNAME ▸ View ▸ User Interface ▸ Icon style."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can display a number as a fraction
(0.125 = 1/8): Format ▸ Cells, Number ▸ Fraction."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove a hyperlink but keep its text,
right-click on the hyperlink, and use “Remove Hyperlink”."), "",
"tipoftheday_w.png"},
@@ -93,7 +93,7 @@ const std::tuple<const char*, OUString, OUString>
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Data ▸ Validity allows you to create
drop-down lists where the user selects a value instead of typing."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/validity.html";,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Hold down %MOD1 and turn the mouse wheel to
change the zoom factor."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has great extensions to
increase your productivity—check them out."),
"https://extensions.libreoffice.org";, ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to count words for just one particular
paragraph style? Use Edit ▸ Find & Replace, click Paragraph Styles, select the
style in Find, and click Find All. Read the result in the status bar."), "",
"tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to count words for just one particular
paragraph style? Use Edit ▸ Find and Replace, click Paragraph Styles, select
the style in Find, and click Find All. Read the result in the status bar."),
"", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Generate fully customized PDF documents
with the exact format, image compression, comments, access rights, password,
etc., via File ▸ Export as PDF."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer includes LibreLogo: simple Logo-like
programming environment with turtle vector graphics, DTP and graphic design."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/librelogo/LibreLogo.html";,
"tipoftheday_w.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Construct your own 2D shapes in Draw.
Select two or more objects, and explore possibilities with Shape ▸ Combine,
Shape ▸ Merge, Shape ▸ Subtract, and Shape ▸ Intersect."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/sdraw/guide/combine_etc.html";,
"tipoftheday_d.png"},
@@ -107,7 +107,7 @@ const std::tuple<const char*, OUString, OUString>
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Did you know that you can attach comments
to portions of text? Just use the shortcut %MOD1+%MOD2+C."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to move one or more paragraphs? No
need to cut and paste: Use the keyboard shortcut %MOD1+%MOD2+Arrow (Up/Down)"),
"", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined
template or current document per Tools ▸ Options ▸ %PRODUCTNAME Writer ▸ Basic
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage",
"tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01040300.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to find words containing more than 10
characters? Edit ▸ Find & Replace ▸ Search ▸ [a-z]{10,} ▸ Other Options ▸ check
Regular expressions."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to find words containing more than 10
characters? Edit ▸ Find and Replace ▸ Search ▸ [a-z]{10,} ▸ Other Options ▸
check Regular expressions."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Open a CSV file as a new sheet in the
current spreadsheet via Sheet ▸ Sheet from file."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Typing in bold, italics, or underlined in
Writer you can continue with the default attributes using just the shortcut
%MOD1+Shift+X (remove direct character formats)."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use %MOD1+%MOD2+Shift+V to paste the
contents of the clipboard as unformatted text."), "", "tipoftheday_w.png"},
@@ -161,7 +161,7 @@ const std::tuple<const char*, OUString, OUString>
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Play music throughout a slideshow by
assigning the sound to the first slide transition without clicking the “Apply
to All Slides” button."), "", "tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME Calc does not calculate from
left to right but respects the order Parentheses – Exponents – Multiplication –
Division – Addition – Subtraction."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Get %PRODUCTNAME documentation and free
user guide books at:"), "http://www.libreoffice.org/get-help/documentation";,
""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to remove all <> at once and keep the
text inside? Edit ▸ Find & Replace: Search = [<>], Replace = blank and check
“Regular expressions” under Other options."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/02100001.html";,
""}, //local help missing
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to remove all <> at once and keep the
text inside? Edit ▸ Find and Replace: Search = [<>], Replace = blank and check
“Regular expressions” under Other options."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/02100001.html";,
""}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to present a report written with
Writer? File ▸ Send ▸ Outline to Presentation automatically creates a slideshow
from the outline."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to manage the presentation of
hyperlinks in a spreadsheet? Insert them with the HYPERLINK function."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060109.html";,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Uncheck Tools ▸ Options ▸ %PRODUCTNAME Calc
▸ View ▸ Zoom: “Synchronize sheets” so that each sheet in Calc has its own zoom
factor."), "", "tipoftheday_c.png"},
@@ -199,7 +199,7 @@ const std::tuple<const char*, OUString, OUString>
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "You want to start working with Basic
macros? Take a look at the examples under Tools ▸ Macros ▸ Edit Macros."), "",
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Apply Heading paragraph styles in Writer
with shortcut keys: %MOD1+1 applies Heading 1, %MOD1+2 applies Heading 2,
etc."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Do not get lost in large documents. Use the
Navigator (F5) to find your way through the content."), "", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Edit ▸ Find & Replace lets you insert
special characters directly: right click in input fields or press
Shift+%MOD1+S."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Edit ▸ Find and Replace lets you insert
special characters directly: right click in input fields or press
Shift+%MOD1+S."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need custom contents for metadata
properties? File ▸ Properties ▸ Custom Properties tab lets you create what you
want."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to see, but not print, an object in
Draw? Draw it on a layer for which the “Printable” flag is not set (right click
on the tab and “Modify Layer”)."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To insert the current date in your
document, use Insert ▸ Field ▸ Date."), "", "tipoftheday_w.png"},
@@ -242,7 +242,7 @@ const std::tuple<const char*, OUString, OUString>
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to jump to a particular page by its
number? Click the left-most statusbar entry or use Edit ▸ Go To Page… or press
%MOD1+G."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME supports over 150
languages."),
"https://wiki.documentfoundation.org/Language_support_of_LibreOffice";, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Uncheck Slide Show ▸ Settings ▸
Presentation always on top if you need another program displays its window to
the front of your presentation."), "", "tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to find the words in bold in a Writer
document? Edit ▸ Find & Replace ▸ Other options ▸ Attributes ▸ Font weight."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/finding.html";,
"tipoftheday_w.png"}, //local help missing
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to find the words in bold in a Writer
document? Edit ▸ Find and Replace ▸ Other options ▸ Attributes ▸ Font
weight."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/finding.html";,
"tipoftheday_w.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows
alphabetically or numerically per Tools ▸ Sort."),
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/06100000.html
{ NC_("RID_CUI_TIPOFTHEDAY", "To insert a paragraph before (after) a
section, press %MOD2+Enter at the beginning (end) of the section."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a template center to
create good looking documents—check it out."),
"http://templates.libreoffice.org/template-center";, ""},
diff --git a/offapi/com/sun/star/sheet/SheetCell.idl
b/offapi/com/sun/star/sheet/SheetCell.idl
index 8d85585d0c74..0f3303c4953c 100644
--- a/offapi/com/sun/star/sheet/SheetCell.idl
+++ b/offapi/com/sun/star/sheet/SheetCell.idl
@@ -111,7 +111,7 @@ published service SheetCell
interface com::sun::star::document::XActionLockable;
- /** provides "Find & Replace" functionality.
+ /** provides "Find and Replace" functionality.
<p>The property
com::sun::star::util::SearchDescriptor::SearchWords
diff --git a/offapi/com/sun/star/sheet/SheetCellRange.idl
b/offapi/com/sun/star/sheet/SheetCellRange.idl
index 0361a1af4ef1..f6a5cbf6feb7 100644
--- a/offapi/com/sun/star/sheet/SheetCellRange.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRange.idl
@@ -101,7 +101,7 @@ published service SheetCellRange
service com::sun::star::sheet::SheetRangesQuery;
- /** provides "Find & Replace" functionality.
+ /** provides "Find and Replace" functionality.
<p>The property
com::sun::star::util::SearchDescriptor::SearchWords
diff --git a/offapi/com/sun/star/sheet/SheetCellRanges.idl
b/offapi/com/sun/star/sheet/SheetCellRanges.idl
index a0f98cdd5aa0..a62ee4cee15a 100644
--- a/offapi/com/sun/star/sheet/SheetCellRanges.idl
+++ b/offapi/com/sun/star/sheet/SheetCellRanges.idl
@@ -82,7 +82,7 @@ published service SheetCellRanges
service com::sun::star::sheet::SheetRangesQuery;
- /** provides "Find & Replace" functionality.
+ /** provides "Find and Replace" functionality.
<p>The property
com::sun::star::util::SearchDescriptor::SearchWords
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 63ba3c86a285..7c4898dfa272 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5423,7 +5423,7 @@
</node>
<node oor:name=".uno:SearchDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Find & Rep~lace...</value>
+ <value xml:lang="en-US">Find and Rep~lace...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f55a7ce1280e..3f16090e118c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5952,7 +5952,7 @@
<prop oor:name="IsWholeWordsOnly" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search for whole words only.</desc>
</info>
@@ -5961,7 +5961,7 @@
<prop oor:name="IsBackwards" oor:type="xs:boolean" oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search backwards.</desc>
</info>
@@ -5970,7 +5970,7 @@
<prop oor:name="IsUseWildcard" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search with the use of wildcards.</desc>
</info>
@@ -5979,7 +5979,7 @@
<prop oor:name="IsUseRegularExpression" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search with the use of regular expressions.</desc>
</info>
@@ -5988,7 +5988,7 @@
<prop oor:name="IsSearchForStyles" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search for styles only.</desc>
</info>
@@ -5997,7 +5997,7 @@
<prop oor:name="IsSimilaritySearch" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search with similarity.</desc>
</info>
@@ -6006,7 +6006,7 @@
<prop oor:name="IsMatchCase" oor:type="xs:boolean" oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search as case sensitive.</desc>
</info>
@@ -6015,7 +6015,7 @@
<prop oor:name="IsIgnoreDiacritics_CTL" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search ignores diacritics, not only CTL
though.</desc>
</info>
@@ -6024,7 +6024,7 @@
<prop oor:name="IsIgnoreKashida_CTL" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search with the use of CTL option.</desc>
</info>
@@ -6033,28 +6033,28 @@
<prop oor:name="IsUseAsianOptions" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: -->
<!-- OldLocation: -->
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies search with the use of Asian options.</desc>
</info>
<value>false</value>
</prop>
<prop oor:name="ComponentSearchGroupLabel" oor:type="xs:string"
oor:localized="true">
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies the divider label in case of a component-based search
extension.</desc>
</info>
</prop>
<prop oor:name="ComponentSearchCommandLabel1" oor:type="xs:string"
oor:localized="true">
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies the label of the first component-based search
command.</desc>
</info>
</prop>
<prop oor:name="ComponentSearchCommandLabel2" oor:type="xs:string"
oor:localized="true">
- <!-- UIHints: Edit/Find & Replace -->
+ <!-- UIHints: Edit/Find and Replace -->
<info>
<desc>Specifies the label of the second component-based search
command.</desc>
@@ -6068,7 +6068,7 @@
<value>false</value>
</prop>
<prop oor:name="IsSearchFormatted" oor:type="xs:boolean"
oor:nillable="false">
- <!-- UIHints: Edit / Find & Replace -->
+ <!-- UIHints: Edit / Find and Replace -->
<info>
<desc>Specifies if formatted display strings are searched instead of
cell content (Calc).</desc>
</info>
diff --git a/sc/qa/uitest/search_replace/tdf35020.py
b/sc/qa/uitest/search_replace/tdf35020.py
index 0b2eec87ef9b..a0412697ed2b 100644
--- a/sc/qa/uitest/search_replace/tdf35020.py
+++ b/sc/qa/uitest/search_replace/tdf35020.py
@@ -18,7 +18,7 @@ import pathlib
def get_url_for_data_file(file_name):
return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-#Bug 35020 - Find & Replace changes case of sheet name in formulas
+#Bug 35020 - Find and Replace changes case of sheet name in formulas
class tdf35020(UITestCase):
def test_tdf39959_find_replace_all_sheets(self):
diff --git a/sw/qa/uitest/findReplace/tdf119462.py
b/sw/qa/uitest/findReplace/tdf119462.py
index b58b2f9242ae..e87cd8e7b856 100644
--- a/sw/qa/uitest/findReplace/tdf119462.py
+++ b/sw/qa/uitest/findReplace/tdf119462.py
@@ -20,7 +20,7 @@ class tdf119462(UITestCase):
writer_doc = self.ui_test.create_doc_in_start_center("writer")
document = self.ui_test.get_component()
xWriterDoc = self.xUITest.getTopFocusWindow()
- #1. Choose Edit > Find & Replace
+ #1. Choose Edit > Find and Replace
self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog")
xDialog = self.xUITest.getTopFocusWindow()
#2. Choose Format
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
