[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sw/source
GülÅah Köse (via logerrit)
logerrit at kemper.freedesktop.org
Mon May 10 07:00:58 UTC 2021
sw/source/core/edit/edfcol.cxx | 10 ----------
1 file changed, 10 deletions(-)
New commits:
commit 410d1ff92edaa0cf544ee79e77711c1eb2283b22
Author: Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Tue Apr 27 00:33:18 2021 +0300
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon May 10 09:00:13 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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115299
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 1dfcbf7f2d66..c0173e60d057 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -2195,16 +2195,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