[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/dlg/prltempl.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d42f178418a255ebba902b9bdea63effe2fd2b70
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Oct 1 15:49:27 2023 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Oct 2 13:38:46 2023 +0200

    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.st...@allotropia.de>

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