[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source

Heiko Tietze (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 23 05:04:44 UTC 2021


 sw/source/core/doc/DocumentStylePoolManager.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 4b5dd477bbe1647c6c60374da2e4cabcf5b6b58b
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Mon Jul 19 16:40:50 2021 +0200
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Fri Jul 23 07:04:10 2021 +0200

    Resolves tdf#143066 - Language set to None for indices
    
    Disables spell-checking on ToC
    
    Change-Id: I6601d8c54974fcc70564292176a71a80d91020e9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119222
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
    (cherry picked from commit 137a1d5380e310a43d36932c643e1331a94fd70d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119265
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index ff0657aaff48..1971b15e509e 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -810,7 +810,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
         case RES_POOLCOLL_GREETING:             // Greeting
         case RES_POOLCOLL_REGISTER_BASE:        // Base indexes
         case RES_POOLCOLL_SIGNATURE:            // Signatures
-        case RES_POOLCOLL_TABLE:                // Tabele content
+        case RES_POOLCOLL_TABLE:                // Table content
             {
                 SwFormatLineNumber aLN;
                 aLN.SetCountLines( false );
@@ -820,6 +820,14 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
                     aSet.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
                     aSet.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
                 }
+                // tdf#143066 : set language to 'none' to prevent spell checking for indices
+                if (nId == RES_POOLCOLL_REGISTER_BASE)
+                {
+                    aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) );
+                    aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) );
+                    aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE ) );
+                }
+                break;
             }
             break;
 
@@ -995,7 +1003,6 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
                 aSet.Put( aLN );
             }
             break;
-
         // User defined indexes:
         case RES_POOLCOLL_TOX_USERH:            // Header
             lcl_SetRegister( m_rDoc, aSet, 0, true, false );


More information about the Libreoffice-commits mailing list