commit 9150c8c09645be12849cdb5aad484ee344b7b313
author Caolán McNamara <caolan.mcnamara@collabora.com> Sun Oct 01 15:49:27 2023 +0100
committer Caolán McNamara <caolan.mcnamara@collabora.com> Sun Oct 01 21:10:23 2023 +0200
tree b1ecf1890e6012ab37086c9d3dcad7f3bded2f54
parent fe2031b993721dbe40d71684f4609ee3cf018958

Resolves: tdf#157515 only remove RID_SVXPAGE_PARA_ASIAN once

Change-Id: I65faa99444636c5bc5b21008d4cfb144fbcafb83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157447
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

sd/source/ui/dlg/prltempl.cxx

diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 7ae5519..d7305eb 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" );
    }