From cd6751b6e24554e9ff506a20e4ecf9ace37f7f40 Mon Sep 17 00:00:00 2001
From: ivysrono <ivysrono@users.noreply.github.com>
Date: Sun, 9 Oct 2016 18:07:28 +0800
Subject: [PATCH 1/2] Update LibreOffice-mixedcontent.xml

---
 .../rules/LibreOffice-mixedcontent.xml        | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/LibreOffice-mixedcontent.xml b/src/chrome/content/rules/LibreOffice-mixedcontent.xml
index 377dddeb32cd..d8eb0601b201 100644
--- a/src/chrome/content/rules/LibreOffice-mixedcontent.xml
+++ b/src/chrome/content/rules/LibreOffice-mixedcontent.xml
@@ -1,10 +1,32 @@
 <!--
 	For rules not causing false/broken MCB, see LibreOffice.xml.
 -->
-<ruleset name="LibreOffice (mixedcontent)" platform="mixedcontent">
+
+<ruleset name="LibreOffice (mixedcontent)">
+	
 	<target host="extensions.libreoffice.org" />
+
+	<exclusion pattern="^http://extensions\.libreoffice\.org/$" />
+
+	<rule from="^http://extensions\.libreoffice\.org/(.+)(\.css|\.gif|\.js|\.png|\/logo|\/screenshot_thumb)$" to="https://extensions.libreoffice.org/$1$2" />
+
+		<test url="http://extensions.libreoffice.org/portal_css/tdf-liboextcenter/base-cachekey-b1f7cdd3561ef0c2a61da9b6b54b4512.css" />
+		<test url="http://extensions.libreoffice.org/spinner.gif" />
+		<test url="http://extensions.libreoffice.org/portal_javascripts/tdf-liboextcenter/resourceplone.app.jquery-cachekey-5e4abae81e4993339678053c3c284262.js" />
+		<test url="http://extensions.libreoffice.org/liboextcenter2.png" />
+		<test url="http://extensions.libreoffice.org/extension-center/multisave/logo" />
+		<test url="http://extensions.libreoffice.org/extension-center/copy-only-visible-cells/screenshot_thumb" />
+
+
 	<target host="templates.libreoffice.org" />
 
-	<rule from="^http:"
- 		to="https:" />
+	<exclusion pattern="^http://templates\.libreoffice\.org/$" />
+
+	<rule from="^http://templates\.libreoffice\.org/(.+)(\.css|\.gif|\.js|\.png)$" to="https://templates.libreoffice.org/$1$2" />
+
+		<test url="http://templates.libreoffice.org/portal_css/tdf-libotemplatecenter/reset-cachekey-0aac182c157025798abb328e3400d9bd.css" />
+		<test url="http://templates.libreoffice.org/spinner.gif" />
+		<test url="http://templates.libreoffice.org/portal_javascripts/tdf-libotemplatecenter/resourceplone.app.jquery-cachekey-de7e0f44aa2d0fb5ce41e13a00b7f27c.js" />
+		<test url="http://templates.libreoffice.org/liboextcenter2.png" />
+
  </ruleset>

From 5b1afdedc53048115afaa0a1c2dbecc906c541f5 Mon Sep 17 00:00:00 2001
From: ivysrono <ivysrono@users.noreply.github.com>
Date: Sun, 9 Oct 2016 18:15:02 +0800
Subject: [PATCH 2/2] Update LibreOffice-mixedcontent.xml

---
 src/chrome/content/rules/LibreOffice-mixedcontent.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/chrome/content/rules/LibreOffice-mixedcontent.xml b/src/chrome/content/rules/LibreOffice-mixedcontent.xml
index d8eb0601b201..91a45140d2c5 100644
--- a/src/chrome/content/rules/LibreOffice-mixedcontent.xml
+++ b/src/chrome/content/rules/LibreOffice-mixedcontent.xml
@@ -14,6 +14,7 @@
 		<test url="http://extensions.libreoffice.org/spinner.gif" />
 		<test url="http://extensions.libreoffice.org/portal_javascripts/tdf-liboextcenter/resourceplone.app.jquery-cachekey-5e4abae81e4993339678053c3c284262.js" />
 		<test url="http://extensions.libreoffice.org/liboextcenter2.png" />
+		<test url="http://extensions.libreoffice.org/portal_css/tdf-liboextcenter/pfeil6.png" />
 		<test url="http://extensions.libreoffice.org/extension-center/multisave/logo" />
 		<test url="http://extensions.libreoffice.org/extension-center/copy-only-visible-cells/screenshot_thumb" />
 
@@ -28,5 +29,6 @@
 		<test url="http://templates.libreoffice.org/spinner.gif" />
 		<test url="http://templates.libreoffice.org/portal_javascripts/tdf-libotemplatecenter/resourceplone.app.jquery-cachekey-de7e0f44aa2d0fb5ce41e13a00b7f27c.js" />
 		<test url="http://templates.libreoffice.org/liboextcenter2.png" />
+		<test url="http://templates.libreoffice.org/libotemplatecenter03.png" />
 
  </ruleset>