loleaflet/src/map/handler/Map.WOPI.js | 3 +++
tools/Config.cpp | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 0d056a4dbf59f0768d637215012205668dd48453
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Nov 28 16:38:25 2018 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Mar 6 09:30:31 2019 +0100
Display image url for buttons inserted with postMessage 'Insert_Button'
There was no <style> element in the <head>.
So we need to create it when it's not there.
Change-Id: Id0202b194e1438bd96401851d35e1f1630a78d8e
(cherry picked from commit a9008c844dcd13220a89e259af484f1ea1573583)
Reviewed-on: https://gerrit.libreoffice.org/68793
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/loleaflet/src/map/handler/Map.WOPI.js
b/loleaflet/src/map/handler/Map.WOPI.js
index 3784b7108..ce92fdc81 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -152,6 +152,9 @@ L.Map.WOPI = L.Handler.extend({
&& msg.Values.imgurl) {
if (this._map._permission === 'edit') {
// add the css rule for the
image
+ var style = $('html > head >
style');
+ if (style.length == 0)
+ $('html >
head').append('<style/>');
$('html > head >
style').append('.w2ui-icon.' + msg.Values.id + '{background: url(' +
msg.Values.imgurl + ') no-repeat center !important; }');
// add the item to the toolbar
commit 5e2653337b537d19cd8c876532b07a7b95e84963
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Jan 9 10:28:25 2019 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Mar 6 09:30:13 2019 +0100
loolconfig: Only show "config updated" message when something was changed
Change-Id: I2d2b1e4b57cccbbe6f5608f0468bc9dfed3fd120
Reviewed-on: https://gerrit.libreoffice.org/65997
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
(cherry picked from commit c377ca3fb2d1e28646bf64b38a641bc07ffb6bc4)
Reviewed-on: https://gerrit.libreoffice.org/68792
diff --git a/tools/Config.cpp b/tools/Config.cpp
index 0e2505283..2c257c601 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -300,6 +300,7 @@ int Config::main(const std::vector<std::string>& args)
{
std::cerr << "Valid for " << validDays << " days - setting
to config\n";
_loolConfig.setString("support_key", supportKeyString);
+ changed = true;
}
}
}
@@ -307,8 +308,8 @@ int Config::main(const std::vector<std::string>& args)
{
std::cerr << "Removing empty support key\n";
_loolConfig.remove("support_key");
+ changed = true;
}
- changed = true;
}
#endif
else if (args[0] == "set")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
