commit d42f178418a255ebba902b9bdea63effe2fd2b70
author Caolán McNamara <caolan.mcnamara@collabora.com> Sun Oct 01 15:49:27 2023 +0100
committer Michael Stahl <michael.stahl@allotropia.de> Mon Oct 02 13:38:46 2023 +0200
tree 1cb05651e67f28caf66d1549d37dc0a1a0ea99b3
parent ee1cc05d42c5f4f0ac2f856debc65cd1a03240b3

Resolves: tdf#157515 only remove RID_SVXPAGE_PARA_ASIAN once

Change-Id: I65faa99444636c5bc5b21008d4cfb144fbcafb83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157451
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

sd/source/ui/dlg/prltempl.cxx

diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 869f13c..e7b77a4 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -141,7 +141,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(SfxObjectShell const * pDocSh,
    AddTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGN_PARAGRAPH ), nullptr );
    AddTabPage( "RID_SVXPAGE_BKG", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr);

    if( !SvtCJKOptions::IsAsianTypographyEnabled() )
    if (!SvtCJKOptions::IsAsianTypographyEnabled() || bBackground)
        RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" );

    if (bBackground)
@@ -160,7 +160,6 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(SfxObjectShell const * pDocSh,
        RemoveTabPage( "RID_SVXPAGE_NUM_OPTIONS");
        RemoveTabPage( "RID_SVXPAGE_TABULATOR");
        RemoveTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH");
        RemoveTabPage( "RID_SVXPAGE_PARA_ASIAN" );
        RemoveTabPage( "RID_SVXPAGE_BKG" );
    }