From adb203bc05e3e36173cbd46b9951f79821a81799 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:27:54 +0200 Subject: Merging upstream version 4:24.2.1. Signed-off-by: Daniel Baumann --- .../source/text/sbasic/shared/03/sf_database.xhp | 20 ++++++++++---------- .../source/text/sbasic/shared/03/sf_intro.xhp | 2 +- .../source/text/shared/01/graphic_size_check.xhp | 1 + helpcontent2/source/text/shared/06/youtubevideos.xhp | 4 ++-- .../source/text/swriter/guide/spellcheck_dialog.xhp | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) (limited to 'helpcontent2/source/text') diff --git a/helpcontent2/source/text/sbasic/shared/03/sf_database.xhp b/helpcontent2/source/text/sbasic/shared/03/sf_database.xhp index 852fb6a0f4..b898e0549b 100644 --- a/helpcontent2/source/text/sbasic/shared/03/sf_database.xhp +++ b/helpcontent2/source/text/sbasic/shared/03/sf_database.xhp @@ -68,10 +68,10 @@ - NONE + NONE - 0 + 0 Transaction handling is disabled and the database is set to the default auto-commit mode. @@ -79,10 +79,10 @@ - READ_UNCOMMITTED + READ_UNCOMMITTED - 1 + 1 Dirty reads, non-repeatable reads and phantom reads can occur. @@ -91,10 +91,10 @@ - READ_COMMITTED + READ_COMMITTED - 2 + 2 Dirty reads are prevented, however non-repeatable reads and phantom reads can occur. @@ -103,10 +103,10 @@ - REPEATABLE_READ + REPEATABLE_READ - 4 + 4 Dirty reads and non-repeatable reads are prevented. However, phantom reads can occur. @@ -115,10 +115,10 @@ - SERIALIZABLE + SERIALIZABLE - 8 + 8 Dirty reads, non-repeatable reads and phantom reads are prevented. diff --git a/helpcontent2/source/text/sbasic/shared/03/sf_intro.xhp b/helpcontent2/source/text/sbasic/shared/03/sf_intro.xhp index dced4f25b9..02e8d5a864 100644 --- a/helpcontent2/source/text/sbasic/shared/03/sf_intro.xhp +++ b/helpcontent2/source/text/sbasic/shared/03/sf_intro.xhp @@ -191,7 +191,7 @@ In this case, set the environment variable PYTHONPATH as follows before starting the Python interpreter: - export PYTHONPATH=/usr/lib/libreoffice/program:/usr/lib/python3/dist-packages + export PYTHONPATH=/usr/lib/libreoffice/program:/usr/lib/python3/dist-packages The location of these files will be different for each operating system and %PRODUCTNAME installation method.
diff --git a/helpcontent2/source/text/shared/01/graphic_size_check.xhp b/helpcontent2/source/text/shared/01/graphic_size_check.xhp index 92020fcbcb..c864034f4b 100644 --- a/helpcontent2/source/text/shared/01/graphic_size_check.xhp +++ b/helpcontent2/source/text/shared/01/graphic_size_check.xhp @@ -17,6 +17,7 @@ + graphic size;check check;graphic size diff --git a/helpcontent2/source/text/shared/06/youtubevideos.xhp b/helpcontent2/source/text/shared/06/youtubevideos.xhp index fbd5e80785..d511f66160 100644 --- a/helpcontent2/source/text/shared/06/youtubevideos.xhp +++ b/helpcontent2/source/text/shared/06/youtubevideos.xhp @@ -11,13 +11,13 @@ - YouTube Videos + YouTube Videos /text/shared/06/youtubevideos.xhp
- + diff --git a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp index 0e61d3e40b..cb70371fbe 100644 --- a/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp +++ b/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp @@ -35,7 +35,7 @@

Checking Spelling and Grammar

You can manually check the spelling and grammar of a text selection or the entire document. -To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the extensions web page. +To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the extensions web page. The spellcheck starts at the current cursor position, or at the beginning of the text selection. -- cgit v1.2.3