From 8ec8c9e42a5f4a98d36029b67711cc89c5e33a3f Mon Sep 17 00:00:00 2001 From: Seth Chaiklin Date: Sun, 6 Dec 2020 14:01:22 +0100 Subject: tdf#107229 simplify embedding for default template help ( source/text/shared/optionen/01040300.xhp ) * changed link from (shared/optionen/01040301.xhp ) to (shared/optionen/standard_template.xhp ). shared/optionen/01040301.xhp simply embeds all of "standard_template.xhp". No advantage in having a separate 01040301.xhp to embed into 01040300.xhp, because (a) makes relation to standard_template.xhp more difficult to see, and (b) the title in 01040301.xhp is only "change default template, but the reference from 01040300.xhp is also about customizing templates. * update to

,

( source/text/shared/optionen/01040301.xhp ) with this patch, 01040301.xhp is not used by other files now. Could possibly be deleted. * update to

Change-Id: I00b2ac9f9aad3865172ed985e3394492fa122d46 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107296 Tested-by: Jenkins Reviewed-by: Seth Chaiklin (cherry picked from commit 1f5e7cbaf41f21b72713814f1517be23f933258d) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107492 Reviewed-by: Adolfo Jayme Barrientos --- source/text/shared/optionen/01040300.xhp | 11 +++++------ source/text/shared/optionen/01040301.xhp | 6 +----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/source/text/shared/optionen/01040300.xhp b/source/text/shared/optionen/01040300.xhp index 090ac769f5..c030f7e338 100644 --- a/source/text/shared/optionen/01040300.xhp +++ b/source/text/shared/optionen/01040300.xhp @@ -1,6 +1,5 @@ - - + - + Basic Fonts @@ -41,15 +40,15 @@ -Basic Fonts +

Basic Fonts

Specifies the settings for the basic fonts in your documents. You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in %PRODUCTNAME - PreferencesTools - Options - Language Settings - Languages. -These settings define the basic fonts for the predefined templates. You can also modify or customize the default text templates. +These settings define the basic fonts for the predefined templates. You can also modify or customize the default text templates.
-Basic fonts +

Basic fonts

Default Specifies the font to be used for the Default Paragraph Style. The Default Paragraph Style font is used for nearly all Paragraph Styles, unless the Paragraph Style explicitly defines another font. diff --git a/source/text/shared/optionen/01040301.xhp b/source/text/shared/optionen/01040301.xhp index c2b59580de..634f796fa1 100644 --- a/source/text/shared/optionen/01040301.xhp +++ b/source/text/shared/optionen/01040301.xhp @@ -1,6 +1,4 @@ - -