From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 4 Feb 2016 21:22:14 +0000 (+0100)
Subject: The check for OpenOffice/LibreOffice was too restrictive
X-Git-Tag: 2.1.10~22
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=92ba7ca826e6ee582c0acf89f32fddd6b52eaa19;p=GitHub%2FWoltLab%2FWCF.git

The check for OpenOffice/LibreOffice was too restrictive
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index f3b5c70660..4c59bf41fd 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -1570,8 +1570,9 @@ RedactorPlugins.wbbcode = function() {
 			});
 			html = html.replace(/<\/h[1-6]>/g, '[/size]');
 			
-			// some fixes for paste from Microsoft Word / OpenOffice
-			if (/<p class="MsoNormal/.test(html) || /style="margin-bottom: 0cm"/.test(html)) {
+			// some fixes for paste from Microsoft Word / OpenOffice / LibreOffice
+			if (/<p class="MsoNormal/.test(html) || /margin-bottom: 0cm/.test(html)) {
+				console.debug("hit");
 				// fix weird newlines
 				html = html.replace(/([^>\s])\n([^<\s])/g, '$1 $2');