[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source

Gülşah Köse (via logerrit) logerrit at kemper.freedesktop.org
Wed May 5 12:23:30 UTC 2021


 sw/source/core/edit/edfcol.cxx |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit 4fb142c13d9cea0290cae05831a3aeea234f821d
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Tue Apr 27 00:33:18 2021 +0300
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed May 5 14:22:55 2021 +0200

    Fix broken TOX in Online.
    
    1. Open a German file in the Online
    2. Insert a new paragraph, and change its style to "Ueberschrift 1"
    3. Go to the Table of Content, and choose "Update Index"
    4. See the index got destroyed, and when you look at the list of
       styles, the "Ueberschrift 1" has disappeared, and "Heading 1"
       appeared instead.
    
    This reverts part of:
    commit ca435be45f316120b9df6c9d547b781ed975817d
    writer: handle styles in multiple languages for online
    
    Change-Id: I82e46b3cf7824df6efdbb4b2a16716153ddae0df
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114683
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index af77410ccdcf..b6d8f0b4296e 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -2201,16 +2201,6 @@ void SwEditShell::SetTextFormatColl(SwTextFormatColl *pFormat,
 
     SwRewriter aRewriter;
 
-    // in online we can have multiple languages, use universal name then
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        OUString aName;
-        sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(pLocal->GetName(), SwGetPoolIdFromName::TxtColl);
-        SwStyleNameMapper::FillProgName(nId, aName);
-        if (!aName.isEmpty())
-            pLocal->SetName(aName);
-    }
-
     aRewriter.AddRule(UndoArg1, pLocal->GetName());
 
     GetDoc()->GetIDocumentUndoRedo().StartUndo(SwUndoId::SETFMTCOLL, &aRewriter);


More information about the Libreoffice-commits mailing list