[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-4' - 21 commits - configure.ac debian/changelog debian/control ios/Mobile ios/Mobile.xcodeproj loleaflet/css loleaflet/html loleaflet/images loleaflet/js loleaflet/plugins loleaflet/src loolwsd.spec.in net/FakeSocket.cpp test/UnitWOPISaveAs.cpp test/WopiTestServer.hpp wsd/ClientSession.cpp wsd/DocumentBroker.cpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Mar 22 13:07:58 UTC 2019
configure.ac | 2
debian/changelog | 6
debian/control | 2
ios/Mobile.xcodeproj/project.pbxproj | 314 +++++++++++++++++
ios/Mobile/Document.mm | 5
ios/Mobile/DocumentViewController.mm | 6
loleaflet/css/loleaflet.css | 6
loleaflet/css/menubar.css | 10
loleaflet/css/toolbar.css | 5
loleaflet/html/loleaflet.html.m4 | 3
loleaflet/images/fr010.svg | 2
loleaflet/images/fr011.svg | 2
loleaflet/images/fr012.svg | 2
loleaflet/images/fr02.svg | 2
loleaflet/images/fr03.svg | 2
loleaflet/images/fr04.svg | 2
loleaflet/images/fr05.svg | 2
loleaflet/images/fr06.svg | 2
loleaflet/images/fr07.svg | 2
loleaflet/images/fr08.svg | 2
loleaflet/images/fr09.svg | 2
loleaflet/images/icon-set-bars-half.svg | 3
loleaflet/images/icon-set-bars-one-quarter.svg | 3
loleaflet/images/lc_calloutshapes.line-callout-1.svg | 7
loleaflet/images/lc_calloutshapes.line-callout-2.svg | 7
loleaflet/images/lc_calloutshapes.line-callout-3.svg | 7
loleaflet/images/lc_checkbox.svg | 2
loleaflet/images/lc_conditionalformatdialog.svg | 11
loleaflet/images/lc_copy.svg | 7
loleaflet/images/lc_cut.svg | 7
loleaflet/images/lc_flowchartshapes.svg | 11
loleaflet/images/lc_formattedfield.svg | 15
loleaflet/images/lc_fullscreen.svg | 2
loleaflet/images/lc_paste.svg | 7
loleaflet/images/lc_radiobutton.svg | 2
loleaflet/images/lc_rejecttrackedchange.svg | 273 +-------------
loleaflet/images/lc_starshapes.signet.svg | 7
loleaflet/images/lc_starshapes.svg | 7
loleaflet/images/lc_symbolshapes.quad-bevel.svg | 11
loleaflet/images/savemodified_large.svg | 16
loleaflet/js/toolbar.js | 19 -
loleaflet/plugins/path-transform/src/Path.Transform.js | 2
loleaflet/src/control/Control.LokDialog.js | 30 +
loleaflet/src/control/Control.Menubar.js | 39 +-
loleaflet/src/layer/vector/CircleMarker.js | 4
loleaflet/src/map/Map.js | 10
loolwsd.spec.in | 2
net/FakeSocket.cpp | 2
test/UnitWOPISaveAs.cpp | 7
test/WopiTestServer.hpp | 2
wsd/ClientSession.cpp | 14
wsd/DocumentBroker.cpp | 10
52 files changed, 527 insertions(+), 400 deletions(-)
New commits:
commit 57641b938301c80705145e639ac332dfed48fd5e
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Mar 22 14:07:30 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:07:30 2019 +0100
Bump package version to 4.0.3-1
Change-Id: I40b17ba6fdd7e91df89ec6f443c29d0be36c9679
diff --git a/configure.ac b/configure.ac
index 5fa429d4d..dace37db4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [4.0.2], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [4.0.3], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 0e04a583e..5e64c5a49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.3-1) unstable; urgency=medium
+
+ * see the git log: http://col.la/coolcd4
+
+ -- Andras Timar <andras.timar at collabora.com> Fri, 22 Mar 2019 13:30:00 +0100
+
loolwsd (4.0.2-1) unstable; urgency=medium
* see the git log: http://col.la/coolcd4
diff --git a/debian/control b/debian/control
index dea19d390..9cc21e560 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3-gnutls, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libxml2, libxslt1.1, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.26), collaboraofficebasis6.0-core (>= 6.0.10.26), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.26), collaboraofficebasis6.0-images (>= 6.0.10.26), collaboraofficebasis6.0-impress (>= 6.0.10.26), collaboraofficebasis6.0-ooofonts (>= 6.0.10.26), collaboraofficebasis6.0-writer (>= 6.0.10.26), collaboraoffice6.0 (>= 6.0.10.26), collaboraoffice6.0-ure (>= 6.0.10.26), collaboraofficebasis6.0-en-us (>= 6.0.10.26), collaboraofficebasis6.0-draw (>= 6.0.10.26), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.26), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.26)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3-gnutls, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0, libxml2, libxslt1.1, libsm6, libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, collaboraofficebasis6.0-calc (>= 6.0.10.27), collaboraofficebasis6.0-core (>= 6.0.10.27), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.27), collaboraofficebasis6.0-images (>= 6.0.10.27), collaboraofficebasis6.0-impress (>= 6.0.10.27), collaboraofficebasis6.0-ooofonts (>= 6.0.10.27), collaboraofficebasis6.0-writer (>= 6.0.10.27), collaboraoffice6.0 (>= 6.0.10.27), collaboraoffice6.0-ure (>= 6.0.10.27), collaboraofficebasis6.0-en-us (>= 6.0.10.27), collaboraofficebasis6.0-draw (>= 6.0.10.27), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.27), collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.27)
Conflicts: collaboraofficebasis6.0-gnome-integration, collaboraofficebasis6.0-kde-integration
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 9e0a2af24..2e142b093 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python-polib
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice6.0 >= 6.0.10.26 collaboraoffice6.0-ure >= 6.0.10.26 collaboraofficebasis6.0-core >= 6.0.10.26 collaboraofficebasis6.0-writer >= 6.0.10.26 collaboraofficebasis6.0-impress >= 6.0.10.26 collaboraofficebasis6.0-graphicfilter >= 6.0.10.26 collaboraofficebasis6.0-en-US >= 6.0.10.26 collaboraofficebasis6.0-calc >= 6.0.10.26 collaboraofficebasis6.0-ooofonts >= 6.0.10.26 collaboraofficebasis6.0-images >= 6.0.10.26 collaboraofficebasis6.0-draw >= 6.0.10.26 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.26 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.26
+Requires: collaboraoffice6.0 >= 6.0.10.27 collaboraoffice6.0-ure >= 6.0.10.27 collaboraofficebasis6.0-core >= 6.0.10.27 collaboraofficebasis6.0-writer >= 6.0.10.27 collaboraofficebasis6.0-impress >= 6.0.10.27 collaboraofficebasis6.0-graphicfilter >= 6.0.10.27 collaboraofficebasis6.0-en-US >= 6.0.10.27 collaboraofficebasis6.0-calc >= 6.0.10.27 collaboraofficebasis6.0-ooofonts >= 6.0.10.27 collaboraofficebasis6.0-images >= 6.0.10.27 collaboraofficebasis6.0-draw >= 6.0.10.27 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.27 collaboraofficebasis6.0-ooolinguistic >= 6.0.10.27
Conflicts: collaboraofficebasis6.0-kde-integration collaboraofficebasis6.0-gnome-integration
Requires(post): coreutils grep sed
%if 0%{?rhel} == 6
commit fc9785edf8f19fd1ded88aa5f89b8b5a5fe2e8d6
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 21 16:04:58 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:05:26 2019 +0100
Make the image resize and rotate handles larger in a mobile app
diff --git a/loleaflet/plugins/path-transform/src/Path.Transform.js b/loleaflet/plugins/path-transform/src/Path.Transform.js
index 50171d4ea..f7efd72cc 100644
--- a/loleaflet/plugins/path-transform/src/Path.Transform.js
+++ b/loleaflet/plugins/path-transform/src/Path.Transform.js
@@ -534,7 +534,7 @@ L.Handler.PathTransform = L.Handler.extend({
L.PathTransform.pointOnLine(
map.latLngToLayerPoint(bottom),
map.latLngToLayerPoint(topPoint),
- this.options.handleLength)
+ (window.ThisIsAMobileApp ? this.options.handleLength * 3 : this.options.handleLength))
);
this._handleLine = new L.Polyline([topPoint, handlerPosition],
diff --git a/loleaflet/src/layer/vector/CircleMarker.js b/loleaflet/src/layer/vector/CircleMarker.js
index 837471440..fd9a2e1fa 100644
--- a/loleaflet/src/layer/vector/CircleMarker.js
+++ b/loleaflet/src/layer/vector/CircleMarker.js
@@ -14,6 +14,8 @@ L.CircleMarker = L.Path.extend({
L.setOptions(this, options);
this._latlng = L.latLng(latlng);
this._radius = this.options.radius;
+ if (window.ThisIsAMobileApp)
+ this._radius *= 3;
},
setLatLng: function (latlng) {
@@ -28,6 +30,8 @@ L.CircleMarker = L.Path.extend({
setRadius: function (radius) {
this.options.radius = this._radius = radius;
+ if (window.ThisIsAMobileApp)
+ this._radius *= 3;
return this.redraw();
},
commit 784bce4dcb1b245dd9a605ba693e2581492d2370
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 21 14:25:15 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:05:21 2019 +0100
tdf#124055: Idle timeout is pointless in mobile apps
We don't want to unload the document and show any "Idle document -
please click to reload and resume editing" overlay.
What the iOS (and presumably Android) app *would* need, though, is
proper restore functionality. I.e. if you have a document open, and
the app is put in the background (i.e. the user does something else),
and the OS kills it (as is perfectly normal for iOS or Android to do
to idle background apps), then when the user returs to the app, it
should reopen the same document and restore the view location and zoom
level.
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index d9b205801..31d952101 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -257,10 +257,11 @@ void DocumentBroker::pollThread()
LOG_INF("Doc [" << _docKey << "] attached to child [" << _childProcess->getPid() << "].");
static const bool AutoSaveEnabled = !std::getenv("LOOL_NO_AUTOSAVE");
+
+#ifndef MOBILEAPP
static const size_t IdleDocTimeoutSecs = LOOLWSD::getConfigValue<int>(
"per_document.idle_timeout_secs", 3600);
-#ifndef MOBILEAPP
// Used to accumulate B/W deltas.
uint64_t adminSent = 0;
uint64_t adminRecv = 0;
@@ -331,9 +332,11 @@ void DocumentBroker::pollThread()
last30SecCheckTime = std::chrono::steady_clock::now();
}
+ if (false)
+ ;
+#ifndef MOBILEAPP
// Remove idle documents after 1 hour.
- const bool idle = (isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs);
- if (idle)
+ else if ((isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs))
{
// Stop if there is nothing to save.
LOG_INF("Autosaving idle DocumentBroker for docKey [" << getDocKey() << "] to kill.");
@@ -343,6 +346,7 @@ void DocumentBroker::pollThread()
stop("idle");
}
}
+#endif
else if (_sessions.empty() && (isLoaded() || _markToDestroy))
{
// If all sessions have been removed, no reason to linger.
commit 8f6c2be17c3b540f784fa0954078d779ad5b2cbf
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Mar 20 16:55:31 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:05:17 2019 +0100
tdf#122544: Disable the 'closemobile' button while tunnelled dialog is showing
Sure, I would have preferred to fix the actual bug instead, but that
was much harder. See bug report for some notes about what I tried.
Now done for iOS app only (window.ThisIsTheiOSApp), probably should be
done for any mobile app (window.ThisIsAMobileApp).
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index a4a23254d..c7917d8cb 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -3,7 +3,7 @@
* L.Control.LokDialog used for displaying LOK dialogs
*/
-/* global $ L Hammer */
+/* global $ L Hammer w2ui */
L.WinUtil = {
};
@@ -343,6 +343,8 @@ L.Control.LokDialog = L.Control.extend({
},
_launchDialog: function(id, leftTwips, topTwips, width, height, title) {
+ if (window.ThisIsTheiOSApp)
+ w2ui['editbar'].disable('closemobile');
this.onCloseCurrentPopUp();
var dialogContainer = L.DomUtil.create('div', 'lokdialog', document.body);
L.DomUtil.setStyle(dialogContainer, 'padding', '0px');
@@ -528,6 +530,8 @@ L.Control.LokDialog = L.Control.extend({
},
_onDialogClose: function(dialogId, notifyBackend) {
+ if (window.ThisIsTheiOSApp)
+ w2ui['editbar'].enable('closemobile');
if (notifyBackend)
this._sendCloseWindow(dialogId);
$('#' + this._toStrId(dialogId)).remove();
commit e1cc51025f8964b58d9a86d811f07aa6c84a9ff1
Author: Tor Lillqvist <tml at iki.fi>
AuthorDate: Wed Mar 20 15:12:31 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:05:13 2019 +0100
Add references to source files from svl/source/items for debugging goodness
diff --git a/ios/Mobile.xcodeproj/project.pbxproj b/ios/Mobile.xcodeproj/project.pbxproj
index 5dada06a9..46a3b2029 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -416,6 +416,39 @@
BE80E45C21B6CEF100859C97 /* TemplateSectionHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemplateSectionHeaderView.h; sourceTree = "<group>"; };
BE80E45D21B6CEF200859C97 /* TemplateSectionHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TemplateSectionHeaderView.m; sourceTree = "<group>"; };
BE80E46721B7066C00859C97 /* Templates */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Templates; sourceTree = "<group>"; };
+ BE8C0372223FC4EB0048B7EA /* stringio.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringio.cxx; path = "../../ios-device/svl/source/items/stringio.cxx"; sourceTree = "<group>"; };
+ BE8C0373223FC4EB0048B7EA /* itemprop.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = itemprop.cxx; path = "../../ios-device/svl/source/items/itemprop.cxx"; sourceTree = "<group>"; };
+ BE8C0374223FC4EB0048B7EA /* itemset.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = itemset.cxx; path = "../../ios-device/svl/source/items/itemset.cxx"; sourceTree = "<group>"; };
+ BE8C0375223FC4EB0048B7EA /* macitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = macitem.cxx; path = "../../ios-device/svl/source/items/macitem.cxx"; sourceTree = "<group>"; };
+ BE8C0376223FC4EB0048B7EA /* poolcach.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = poolcach.cxx; path = "../../ios-device/svl/source/items/poolcach.cxx"; sourceTree = "<group>"; };
+ BE8C0377223FC4EB0048B7EA /* ilstitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ilstitem.cxx; path = "../../ios-device/svl/source/items/ilstitem.cxx"; sourceTree = "<group>"; };
+ BE8C0378223FC4EC0048B7EA /* intitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intitem.cxx; path = "../../ios-device/svl/source/items/intitem.cxx"; sourceTree = "<group>"; };
+ BE8C0379223FC4EC0048B7EA /* globalnameitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = globalnameitem.cxx; path = "../../ios-device/svl/source/items/globalnameitem.cxx"; sourceTree = "<group>"; };
+ BE8C037A223FC4EC0048B7EA /* imageitm.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imageitm.cxx; path = "../../ios-device/svl/source/items/imageitm.cxx"; sourceTree = "<group>"; };
+ BE8C037B223FC4EC0048B7EA /* stylepool.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stylepool.cxx; path = "../../ios-device/svl/source/items/stylepool.cxx"; sourceTree = "<group>"; };
+ BE8C037C223FC4EC0048B7EA /* custritm.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = custritm.cxx; path = "../../ios-device/svl/source/items/custritm.cxx"; sourceTree = "<group>"; };
+ BE8C037D223FC4EC0048B7EA /* stritem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stritem.cxx; path = "../../ios-device/svl/source/items/stritem.cxx"; sourceTree = "<group>"; };
+ BE8C037E223FC4EC0048B7EA /* rectitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rectitem.cxx; path = "../../ios-device/svl/source/items/rectitem.cxx"; sourceTree = "<group>"; };
+ BE8C037F223FC4EC0048B7EA /* style.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = style.cxx; path = "../../ios-device/svl/source/items/style.cxx"; sourceTree = "<group>"; };
+ BE8C0380223FC4EC0048B7EA /* grabbagitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = grabbagitem.cxx; path = "../../ios-device/svl/source/items/grabbagitem.cxx"; sourceTree = "<group>"; };
+ BE8C0381223FC4EC0048B7EA /* flagitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = flagitem.cxx; path = "../../ios-device/svl/source/items/flagitem.cxx"; sourceTree = "<group>"; };
+ BE8C0382223FC4EC0048B7EA /* poolio.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = poolio.cxx; path = "../../ios-device/svl/source/items/poolio.cxx"; sourceTree = "<group>"; };
+ BE8C0383223FC4EC0048B7EA /* srchitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = srchitem.cxx; path = "../../ios-device/svl/source/items/srchitem.cxx"; sourceTree = "<group>"; };
+ BE8C0384223FC4EC0048B7EA /* cintitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cintitem.cxx; path = "../../ios-device/svl/source/items/cintitem.cxx"; sourceTree = "<group>"; };
+ BE8C0385223FC4EC0048B7EA /* IndexedStyleSheets.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = IndexedStyleSheets.cxx; path = "../../ios-device/svl/source/items/IndexedStyleSheets.cxx"; sourceTree = "<group>"; };
+ BE8C0386223FC4EC0048B7EA /* itemiter.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = itemiter.cxx; path = "../../ios-device/svl/source/items/itemiter.cxx"; sourceTree = "<group>"; };
+ BE8C0387223FC4EC0048B7EA /* poolitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = poolitem.cxx; path = "../../ios-device/svl/source/items/poolitem.cxx"; sourceTree = "<group>"; };
+ BE8C0388223FC4EC0048B7EA /* aeitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = aeitem.cxx; path = "../../ios-device/svl/source/items/aeitem.cxx"; sourceTree = "<group>"; };
+ BE8C0389223FC4ED0048B7EA /* whiter.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = whiter.cxx; path = "../../ios-device/svl/source/items/whiter.cxx"; sourceTree = "<group>"; };
+ BE8C038A223FC4ED0048B7EA /* slstitm.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slstitm.cxx; path = "../../ios-device/svl/source/items/slstitm.cxx"; sourceTree = "<group>"; };
+ BE8C038B223FC4ED0048B7EA /* lckbitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lckbitem.cxx; path = "../../ios-device/svl/source/items/lckbitem.cxx"; sourceTree = "<group>"; };
+ BE8C038C223FC4ED0048B7EA /* visitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = visitem.cxx; path = "../../ios-device/svl/source/items/visitem.cxx"; sourceTree = "<group>"; };
+ BE8C038D223FC4ED0048B7EA /* itempool.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = itempool.cxx; path = "../../ios-device/svl/source/items/itempool.cxx"; sourceTree = "<group>"; };
+ BE8C038E223FC4ED0048B7EA /* cenumitm.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cenumitm.cxx; path = "../../ios-device/svl/source/items/cenumitm.cxx"; sourceTree = "<group>"; };
+ BE8C038F223FC4ED0048B7EA /* sitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sitem.cxx; path = "../../ios-device/svl/source/items/sitem.cxx"; sourceTree = "<group>"; };
+ BE8C0390223FC4ED0048B7EA /* rngitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rngitem.cxx; path = "../../ios-device/svl/source/items/rngitem.cxx"; sourceTree = "<group>"; };
+ BE8C0391223FC4ED0048B7EA /* ptitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ptitem.cxx; path = "../../ios-device/svl/source/items/ptitem.cxx"; sourceTree = "<group>"; };
+ BE8C0392223FC4ED0048B7EA /* int64item.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = int64item.cxx; path = "../../ios-device/svl/source/items/int64item.cxx"; sourceTree = "<group>"; };
BE8D77272136762500AC58EA /* Mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Mobile.app; sourceTree = BUILT_PRODUCTS_DIR; };
BE8D772A2136762500AC58EA /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
BE8D772B2136762500AC58EA /* AppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
@@ -1137,6 +1170,7 @@
BEB6521A216F5D4600B8C09A /* sal */,
BE93D43C216D555C007A39F4 /* sfx2 */,
BE34D1892190712C00815297 /* sc */,
+ BE8C0370223FC4AC0048B7EA /* svl */,
BEB0E5DC21CA93950085A0CF /* svx */,
BE34D10C218B667400815297 /* sw */,
BEB6524B216FD09400B8C09A /* tools */,
@@ -1239,6 +1273,54 @@
name = cppuhelper;
sourceTree = "<group>";
};
+ BE8C0370223FC4AC0048B7EA /* svl */ = {
+ isa = PBXGroup;
+ children = (
+ BE8C0371223FC4BD0048B7EA /* items */,
+ );
+ name = svl;
+ sourceTree = "<group>";
+ };
+ BE8C0371223FC4BD0048B7EA /* items */ = {
+ isa = PBXGroup;
+ children = (
+ BE8C0388223FC4EC0048B7EA /* aeitem.cxx */,
+ BE8C038E223FC4ED0048B7EA /* cenumitm.cxx */,
+ BE8C0384223FC4EC0048B7EA /* cintitem.cxx */,
+ BE8C037C223FC4EC0048B7EA /* custritm.cxx */,
+ BE8C0381223FC4EC0048B7EA /* flagitem.cxx */,
+ BE8C0379223FC4EC0048B7EA /* globalnameitem.cxx */,
+ BE8C0380223FC4EC0048B7EA /* grabbagitem.cxx */,
+ BE8C0377223FC4EB0048B7EA /* ilstitem.cxx */,
+ BE8C037A223FC4EC0048B7EA /* imageitm.cxx */,
+ BE8C0385223FC4EC0048B7EA /* IndexedStyleSheets.cxx */,
+ BE8C0392223FC4ED0048B7EA /* int64item.cxx */,
+ BE8C0378223FC4EC0048B7EA /* intitem.cxx */,
+ BE8C0386223FC4EC0048B7EA /* itemiter.cxx */,
+ BE8C038D223FC4ED0048B7EA /* itempool.cxx */,
+ BE8C0373223FC4EB0048B7EA /* itemprop.cxx */,
+ BE8C0374223FC4EB0048B7EA /* itemset.cxx */,
+ BE8C038B223FC4ED0048B7EA /* lckbitem.cxx */,
+ BE8C0375223FC4EB0048B7EA /* macitem.cxx */,
+ BE8C0376223FC4EB0048B7EA /* poolcach.cxx */,
+ BE8C0382223FC4EC0048B7EA /* poolio.cxx */,
+ BE8C0387223FC4EC0048B7EA /* poolitem.cxx */,
+ BE8C0391223FC4ED0048B7EA /* ptitem.cxx */,
+ BE8C037E223FC4EC0048B7EA /* rectitem.cxx */,
+ BE8C0390223FC4ED0048B7EA /* rngitem.cxx */,
+ BE8C038F223FC4ED0048B7EA /* sitem.cxx */,
+ BE8C038A223FC4ED0048B7EA /* slstitm.cxx */,
+ BE8C0383223FC4EC0048B7EA /* srchitem.cxx */,
+ BE8C0372223FC4EB0048B7EA /* stringio.cxx */,
+ BE8C037D223FC4EC0048B7EA /* stritem.cxx */,
+ BE8C037F223FC4EC0048B7EA /* style.cxx */,
+ BE8C037B223FC4EC0048B7EA /* stylepool.cxx */,
+ BE8C038C223FC4ED0048B7EA /* visitem.cxx */,
+ BE8C0389223FC4ED0048B7EA /* whiter.cxx */,
+ );
+ name = items;
+ sourceTree = "<group>";
+ };
BE8D771E2136762500AC58EA = {
isa = PBXGroup;
children = (
commit 4124fee313734eed2ca9675e1eb51e682d938284
Author: Tor Lillqvist <tml at iki.fi>
AuthorDate: Wed Mar 20 15:08:42 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:05:09 2019 +0100
tdf#122543: Ignore duplicate calls to loadFromContents on same Document
diff --git a/ios/Mobile/Document.mm b/ios/Mobile/Document.mm
index af4ae0a75..8550bc3e8 100644
--- a/ios/Mobile/Document.mm
+++ b/ios/Mobile/Document.mm
@@ -49,6 +49,11 @@
- (BOOL)loadFromContents:(id)contents ofType:(NSString *)typeName error:(NSError **)errorPtr {
+ // If this method is called a second time on the same Document object, just ignore it. This
+ // seems to happen occastionally when the device is awakened after sleep. See tdf#122543.
+ if (fakeClientFd >= 0)
+ return YES;
+
// If we are asked to empty the tile cache, do that now.
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"emptyTileCache"]) {
[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithUTF8String:LOOLWSD_CACHEDIR] error:nil];
diff --git a/ios/Mobile/DocumentViewController.mm b/ios/Mobile/DocumentViewController.mm
index 9a4503b41..1d70b2882 100644
--- a/ios/Mobile/DocumentViewController.mm
+++ b/ios/Mobile/DocumentViewController.mm
@@ -203,6 +203,12 @@
}
if (p[0].revents == POLLIN) {
int n = fakeSocketAvailableDataLength(self.document->fakeClientFd);
+ // I don't want to check for n being -1 here, even if
+ // that will lead to a crash (std::length_error from the
+ // below std::vector constructor), as n being -1 is a
+ // sign of something being wrong elsewhere anyway, and I
+ // prefer to fix the root cause. Let's see how well this
+ // works out. See tdf#122543 for such a case.
if (n == 0)
return;
std::vector<char> buf(n);
commit 6aed13d921aaaa616d8ff6c0c80462cda9ebd9a5
Author: Tor Lillqvist <tml at iki.fi>
AuthorDate: Wed Mar 20 13:17:57 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:05:05 2019 +0100
When FAKESOCKET_LOG_ALWAYS_STDERR, output also the thread id
diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index a0e86f2a3..e230428aa 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -83,7 +83,7 @@ static std::string flush()
{
static bool alwaysStderr = std::getenv("FAKESOCKET_LOG_ALWAYS_STDERR") != nullptr;
if (alwaysStderr)
- std::cerr << loggingBuffer.str() << std::endl;
+ std::cerr << std::this_thread::get_id() << ":" << loggingBuffer.str() << std::endl;
else if (loggingCallback != nullptr)
loggingCallback(loggingBuffer.str());
loggingBuffer.str("");
commit fe7d30d731c7fefa62b10dc54ec0a02aae8a5871
Author: Eduard Ardeleanu <eduard-andrei.ardeleanu at 1and1.ro>
AuthorDate: Tue Mar 19 16:00:38 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:05:01 2019 +0100
fix: saveAs breaks when '%' character is used within the filename
Change-Id: I2df059abd67be88acae8bd44ae2c74be7778a595
Reviewed-on: https://gerrit.libreoffice.org/69424
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/test/UnitWOPISaveAs.cpp b/test/UnitWOPISaveAs.cpp
index 7d9be30f9..449100681 100644
--- a/test/UnitWOPISaveAs.cpp
+++ b/test/UnitWOPISaveAs.cpp
@@ -34,7 +34,7 @@ public:
void assertPutRelativeFileRequest(const Poco::Net::HTTPRequest& request) override
{
// spec says UTF-7...
- CPPUNIT_ASSERT_EQUAL(std::string("/jan/hole+AWE-ovsk+AP0-/hello world.pdf"), request.get("X-WOPI-SuggestedTarget"));
+ CPPUNIT_ASSERT_EQUAL(std::string("/jan/hole+AWE-ovsk+AP0-/hello world+ACU-1.pdf"), request.get("X-WOPI-SuggestedTarget"));
// make sure it is a pdf - or at least that it is larger than what it
// used to be
@@ -44,7 +44,8 @@ public:
bool filterSendMessage(const char* data, const size_t len, const WSOpCode /* code */, const bool /* flush */, int& /*unitReturn*/) override
{
const std::string message(data, len);
- const std::string expected("saveas: url=" + helpers::getTestServerURI() + "/something%20wopi/files/1?access_token=anything filename=hello%20world.pdf");
+
+ const std::string expected("saveas: url=" + helpers::getTestServerURI() + "/something%20wopi/files/1?access_token=anything filename=hello%20world%251.pdf");
if (message.find(expected) == 0)
{
// successfully exit the test if we also got the outgoing message
@@ -66,7 +67,7 @@ public:
initWebsocket("/wopi/files/0?access_token=anything");
helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "load url=" + _wopiSrc, testName);
- helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "saveas url=wopi:///jan/hole%C5%A1ovsk%C3%BD/hello%20world.pdf", testName);
+ helpers::sendTextFrame(*_ws->getLOOLWebSocket(), "saveas url=wopi:///jan/hole%C5%A1ovsk%C3%BD/hello%20world%251.pdf", testName);
SocketPoll::wakeupWorld();
_phase = Phase::Polling;
diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index cc951f9c6..3e95c3b8b 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -166,7 +166,7 @@ protected:
assertPutRelativeFileRequest(request);
std::string wopiURL = helpers::getTestServerURI() + "/something wopi/files/1?access_token=anything";
- std::string content = "{ \"Name\":\"hello world.pdf\", \"Url\":\"" + wopiURL + "\" }";
+ std::string content = "{ \"Name\":\"hello world%1.pdf\", \"Url\":\"" + wopiURL + "\" }";
std::ostringstream oss;
oss << "HTTP/1.1 200 OK\r\n"
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index f3afc4efc..665056f30 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -800,12 +800,12 @@ bool ClientSession::handleKitToClientMessage(const char* buffer, const int lengt
return false;
}
- std::string url, wopiFilename;
- Poco::URI::decode(encodedURL, url);
+ // Save-as completed, inform the ClientSession.
+ std::string wopiFilename;
Poco::URI::decode(encodedWopiFilename, wopiFilename);
- // Save-as completed, inform the ClientSession.
- Poco::URI resultURL(url);
+ // URI constructor implicitly decodes when it gets std::string as param
+ Poco::URI resultURL(encodedURL);
if (resultURL.getScheme() == "file")
{
std::string relative(resultURL.getPath());
@@ -816,7 +816,11 @@ bool ClientSession::handleKitToClientMessage(const char* buffer, const int lengt
const Path path(docBroker->getJailRoot(), relative);
if (Poco::File(path).exists())
{
- resultURL.setPath(path.toString());
+ // Encode path for special characters (i.e '%') since Poco::URI::setPath implicitly decodes the input param
+ std::string encodedPath;
+ Poco::URI::encode(path.toString(), "", encodedPath);
+
+ resultURL.setPath(encodedPath);
}
else
{
commit 0aaef48f31506bfb2d2c09fb6b45210734b5b431
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Mar 19 13:04:17 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:04:58 2019 +0100
Don't hide last modification if height is small
Change-Id: Ic8986e8a9c36bd1c4ede9e604b07d93974c1a05f
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index c9a590215..fbc9bddc7 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -105,7 +105,7 @@ body {
background: url('images/baseline-edit-24px.svg') no-repeat center !important;
}
- at media (max-width: 900px),(max-device-height: 900px) {
+ at media (max-width: 900px) {
#menu-last-mod {
display: none;
}
commit 40672c2e4a00194037faec523b56f8383c147cda
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Mar 19 10:07:50 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:04:54 2019 +0100
Escape username
In case of guest users it was possible to inject html.
Change-Id: I642de3efa0fa03cd2a8d63834605f46eacd0f464
Reviewed-on: https://gerrit.libreoffice.org/69410
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
Tested-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 5a5020bfb..71327fa7c 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2369,11 +2369,16 @@ function updateUserListCount() {
}
}
+function escapeHtml(input) {
+ return $('<div>').text(input).html();
+}
+
function onAddView(e) {
+ var username = escapeHtml(e.username);
$('#tb_actionbar_item_userlist')
.w2overlay({
class: 'loleaflet-font',
- html: userJoinedPopupMessage.replace('%user', e.username),
+ html: userJoinedPopupMessage.replace('%user', username),
style: 'padding: 5px'
});
clearTimeout(userPopupTimeout);
@@ -2383,7 +2388,6 @@ function onAddView(e) {
userPopupTimeout = null;
}, 3000);
- var username = e.username;
var color = L.LOUtil.rgbToHex(map.getViewColor(e.viewId));
if (e.viewId === map._docLayer._viewId) {
username = _('You');
commit d6d6a06059d0ed9700e5f91d19514055407d1beb
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 14 09:39:15 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:04:50 2019 +0100
Add sort buttons to the toolbar in Calc
Change-Id: Ifc700afdf3fbd93656e07c9295f2c07f246659d8
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index dfaeefaa7..5a5020bfb 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -778,6 +778,9 @@ function createToolbar() {
{type: 'button', id: 'incrementindent', img: 'incrementindent', hint: _UNO('.uno:IncrementIndent', '', true), uno: 'IncrementIndent', hidden: true, disabled: true},
{type: 'button', id: 'decrementindent', img: 'decrementindent', hint: _UNO('.uno:DecrementIndent', '', true), uno: 'DecrementIndent', hidden: true, disabled: true},
{type: 'break', id: 'breakindent', hidden: true},
+ {type: 'button', id: 'sortascending', img: 'sortascending', hint: _UNO('.uno:SortAscending', 'spreadsheet', true), uno: 'SortAscending', disabled: true, hidden: true},
+ {type: 'button', id: 'sortdescending', img: 'sortdescending', hint: _UNO('.uno:SortDescending', 'spreadsheet', true), uno: 'SortDescending', disabled: true, hidden: true},
+ {type: 'break', id: 'breaksorting', hidden: true},
{type: 'drop', id: 'conditionalformaticonset', img: 'conditionalformatdialog', hint: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet', true), hidden: true,
html: '<table id="conditionalformatmenu-grid"><tr>' +
'<td class="w2ui-tb-image w2ui-icon iconset00" onclick="setConditionalFormatIconSet(0)"/><td class="w2ui-tb-image w2ui-icon iconset01" onclick="setConditionalFormatIconSet(1)"/><td class="w2ui-tb-image w2ui-icon iconset02" onclick="setConditionalFormatIconSet(2)"/></tr><tr>' +
@@ -1565,7 +1568,7 @@ function onDocLayerInit() {
toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'conditionalformaticonset',
'numberformatcurrency', 'numberformatpercent',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'togglemergecells', 'breakmergecells',
- 'setborderstyle');
+ 'setborderstyle', 'sortascending', 'sortdescending', 'breaksorting');
toolbarUp.remove('styles');
statusbar.remove('prev', 'next', 'prevnextbreak');
commit be4f5f004137e0f27a925181c04a046fd17224a3
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Feb 3 17:32:25 2019 -0500
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:04:45 2019 +0100
leaflet: align drop-down lists with parent combobox
This ensures that child-windows are aligned correctly
with their parents.
Change-Id: I3c491fb34083f26c7d376924ab04fbce83103f22
Reviewed-on: https://gerrit.libreoffice.org/68250
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
Tested-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index b8b7d7ed3..a4a23254d 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -644,12 +644,12 @@ L.Control.LokDialog = L.Control.extend({
var dialogTitle = $('.lokdialog_notitle');
if (dialogTitle != null && dialogTitle.length == 0) {
var dialogTitleBar = $('.ui-dialog-titlebar');
- top += dialogTitleBar.height() * L.getDpiScaleFactor();
+ top += dialogTitleBar.outerHeight() * L.getDpiScaleFactor();
}
floatingCanvas.id = strId + '-floating';
L.DomUtil.setStyle(floatingCanvas, 'position', 'absolute');
- L.DomUtil.setStyle(floatingCanvas, 'left', left + 'px'); // yes, it's necessary to append 'px'
+ L.DomUtil.setStyle(floatingCanvas, 'left', (left - 1) + 'px'); // Align drop-down list with parent.
L.DomUtil.setStyle(floatingCanvas, 'top', top + 'px');
// attach events
commit 67b0dfced2abd4a4e5ee415d60a823edafeda737
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat Feb 9 20:20:03 2019 -0500
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:04:18 2019 +0100
leaflet: child windows are top-level now
This allows for expanding context-menus
since the child submenu is no longer bound
by the main context-menu, which is the parent.
Change-Id: I88a24c2f16e08f98648eb01f97c0fdaff509461f
Reviewed-on: https://gerrit.libreoffice.org/68251
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 3253338d4..b8b7d7ed3 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -628,16 +628,25 @@ L.Control.LokDialog = L.Control.extend({
},
_removeDialogChild: function(id) {
- if (typeof id === 'number')
- id = this._toStrId(id);
- $('#' + id + '-floating').remove();
+ $('#' + this._toStrId(id) + '-floating').remove();
},
_createDialogChild: function(childId, parentId, top, left) {
var strId = this._toStrId(parentId);
- var dialogContainer = L.DomUtil.get(strId);
+ var dialogContainer = L.DomUtil.get(strId).parentNode;
var floatingCanvas = L.DomUtil.create('canvas', 'lokdialogchild-canvas', dialogContainer);
$(floatingCanvas).hide(); // Hide to avoid flickering while we set the dimensions.
+
+ // Since child windows are now top-level, their 'top' offset
+ // needs adjusting. If we are in a dialog, our top is from the
+ // dialog body, not the title bar, which is a separate div.
+ // This doesn't apply for context menus, which don't have titles.
+ var dialogTitle = $('.lokdialog_notitle');
+ if (dialogTitle != null && dialogTitle.length == 0) {
+ var dialogTitleBar = $('.ui-dialog-titlebar');
+ top += dialogTitleBar.height() * L.getDpiScaleFactor();
+ }
+
floatingCanvas.id = strId + '-floating';
L.DomUtil.setStyle(floatingCanvas, 'position', 'absolute');
L.DomUtil.setStyle(floatingCanvas, 'left', left + 'px'); // yes, it's necessary to append 'px'
commit eab7f9a21eb6f7b2086607d7288577a4e4b1fa20
Author: Tor Lillqvist <tml at iki.fi>
AuthorDate: Thu Mar 14 00:44:58 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:04:08 2019 +0100
Add more source file references for breakpointing goodness
diff --git a/ios/Mobile.xcodeproj/project.pbxproj b/ios/Mobile.xcodeproj/project.pbxproj
index eada2b66d..5dada06a9 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -342,6 +342,40 @@
BE5EB5DB2140480B00E0826C /* ICU.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = ICU.dat; path = ../../../ICU.dat; sourceTree = "<group>"; };
BE636210215101D000F4237E /* WebSocketHandler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = WebSocketHandler.hpp; sourceTree = "<group>"; };
BE6362C12153B5B500F4237E /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+ BE7AECDD22393D3D00B117D2 /* watermarkdialog.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = watermarkdialog.cxx; path = "../../ios-device/sw/source/uibase/dialog/watermarkdialog.cxx"; sourceTree = "<group>"; };
+ BE7AECDE22393D3D00B117D2 /* wordcountwrapper.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wordcountwrapper.cxx; path = "../../ios-device/sw/source/uibase/dialog/wordcountwrapper.cxx"; sourceTree = "<group>"; };
+ BE7AECDF22393D3D00B117D2 /* SwSpellDialogChildWindow.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SwSpellDialogChildWindow.cxx; path = "../../ios-device/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx"; sourceTree = "<group>"; };
+ BE7AECE022393D3D00B117D2 /* regionsw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regionsw.cxx; path = "../../ios-device/sw/source/uibase/dialog/regionsw.cxx"; sourceTree = "<group>"; };
+ BE7AECE122393D3D00B117D2 /* swwrtshitem.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swwrtshitem.cxx; path = "../../ios-device/sw/source/uibase/dialog/swwrtshitem.cxx"; sourceTree = "<group>"; };
+ BE7AECE222393D3D00B117D2 /* swabstdlg.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swabstdlg.cxx; path = "../../ios-device/sw/source/uibase/dialog/swabstdlg.cxx"; sourceTree = "<group>"; };
+ BE7AECE42239694700B117D2 /* thumbpos.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = thumbpos.hxx; path = "../../ios-device/vcl/source/control/thumbpos.hxx"; sourceTree = "<group>"; };
+ BE7AECE52239694700B117D2 /* longcurr.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = longcurr.cxx; path = "../../ios-device/vcl/source/control/longcurr.cxx"; sourceTree = "<group>"; };
+ BE7AECE62239694700B117D2 /* fixedhyper.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fixedhyper.cxx; path = "../../ios-device/vcl/source/control/fixedhyper.cxx"; sourceTree = "<group>"; };
+ BE7AECE72239694700B117D2 /* prgsbar.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prgsbar.cxx; path = "../../ios-device/vcl/source/control/prgsbar.cxx"; sourceTree = "<group>"; };
+ BE7AECE82239694700B117D2 /* edit.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = edit.cxx; path = "../../ios-device/vcl/source/control/edit.cxx"; sourceTree = "<group>"; };
+ BE7AECE92239694700B117D2 /* morebtn.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = morebtn.cxx; path = "../../ios-device/vcl/source/control/morebtn.cxx"; sourceTree = "<group>"; };
+ BE7AECEA2239694700B117D2 /* listbox.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listbox.cxx; path = "../../ios-device/vcl/source/control/listbox.cxx"; sourceTree = "<group>"; };
+ BE7AECEB2239694700B117D2 /* spinfld.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinfld.cxx; path = "../../ios-device/vcl/source/control/spinfld.cxx"; sourceTree = "<group>"; };
+ BE7AECEC2239694700B117D2 /* notebookbar.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = notebookbar.cxx; path = "../../ios-device/vcl/source/control/notebookbar.cxx"; sourceTree = "<group>"; };
+ BE7AECED2239694700B117D2 /* fixed.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fixed.cxx; path = "../../ios-device/vcl/source/control/fixed.cxx"; sourceTree = "<group>"; };
+ BE7AECEE2239694700B117D2 /* menubtn.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menubtn.cxx; path = "../../ios-device/vcl/source/control/menubtn.cxx"; sourceTree = "<group>"; };
+ BE7AECEF2239694700B117D2 /* field2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = field2.cxx; path = "../../ios-device/vcl/source/control/field2.cxx"; sourceTree = "<group>"; };
+ BE7AECF02239694700B117D2 /* imgctrl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imgctrl.cxx; path = "../../ios-device/vcl/source/control/imgctrl.cxx"; sourceTree = "<group>"; };
+ BE7AECF12239694700B117D2 /* tabctrl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabctrl.cxx; path = "../../ios-device/vcl/source/control/tabctrl.cxx"; sourceTree = "<group>"; };
+ BE7AECF22239694700B117D2 /* scrbar.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrbar.cxx; path = "../../ios-device/vcl/source/control/scrbar.cxx"; sourceTree = "<group>"; };
+ BE7AECF32239694700B117D2 /* button.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button.cxx; path = "../../ios-device/vcl/source/control/button.cxx"; sourceTree = "<group>"; };
+ BE7AECF42239694700B117D2 /* combobox.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cxx; path = "../../ios-device/vcl/source/control/combobox.cxx"; sourceTree = "<group>"; };
+ BE7AECF52239694700B117D2 /* quickselectionengine.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = quickselectionengine.cxx; path = "../../ios-device/vcl/source/control/quickselectionengine.cxx"; sourceTree = "<group>"; };
+ BE7AECF62239694700B117D2 /* spinbtn.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinbtn.cxx; path = "../../ios-device/vcl/source/control/spinbtn.cxx"; sourceTree = "<group>"; };
+ BE7AECF72239694800B117D2 /* slider.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slider.cxx; path = "../../ios-device/vcl/source/control/slider.cxx"; sourceTree = "<group>"; };
+ BE7AECF82239694800B117D2 /* field.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = field.cxx; path = "../../ios-device/vcl/source/control/field.cxx"; sourceTree = "<group>"; };
+ BE7AECF92239694800B117D2 /* listctrl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrl.cxx; path = "../../ios-device/vcl/source/control/listctrl.cxx"; sourceTree = "<group>"; };
+ BE7AECFA2239694800B117D2 /* ctrl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrl.cxx; path = "../../ios-device/vcl/source/control/ctrl.cxx"; sourceTree = "<group>"; };
+ BE7AECFB2239694800B117D2 /* group.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = group.cxx; path = "../../ios-device/vcl/source/control/group.cxx"; sourceTree = "<group>"; };
+ BE7AECFC2239694800B117D2 /* imp_listbox.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imp_listbox.cxx; path = "../../ios-device/vcl/source/control/imp_listbox.cxx"; sourceTree = "<group>"; };
+ BE7AECFD2239694800B117D2 /* throbber.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = throbber.cxx; path = "../../ios-device/vcl/source/control/throbber.cxx"; sourceTree = "<group>"; };
+ BE7AECFF2239B79600B117D2 /* dummies.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dummies.cxx; path = "../../ios-device/vcl/ios/dummies.cxx"; sourceTree = "<group>"; };
+ BE7AED002239B79600B117D2 /* iosinst.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = iosinst.cxx; path = "../../ios-device/vcl/ios/iosinst.cxx"; sourceTree = "<group>"; };
BE80E43121AD92F600859C97 /* Fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Fonts; path = Mobile/Fonts; sourceTree = SOURCE_ROOT; };
BE80E43421B562F500859C97 /* servicemanager.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = servicemanager.cxx; path = "../../ios-device/cppuhelper/source/servicemanager.cxx"; sourceTree = "<group>"; };
BE80E43521B562F500859C97 /* component_context.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = component_context.cxx; path = "../../ios-device/cppuhelper/source/component_context.cxx"; sourceTree = "<group>"; };
@@ -567,6 +601,72 @@
BEB6524E216FD0CA00B8C09A /* stream.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stream.cxx; path = "../../ios-device/tools/source/stream/stream.cxx"; sourceTree = "<group>"; };
BEB6524F216FD0CA00B8C09A /* strmwnt.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strmwnt.cxx; path = "../../ios-device/tools/source/stream/strmwnt.cxx"; sourceTree = "<group>"; };
BEB65250216FD0CA00B8C09A /* strmunx.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strmunx.cxx; path = "../../ios-device/tools/source/stream/strmunx.cxx"; sourceTree = "<group>"; };
+ BEF7F1B22236AFF700CB3AEA /* octree.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = octree.cxx; path = "../../ios-device/vcl/source/gdi/octree.cxx"; sourceTree = "<group>"; };
+ BEF7F1B32236AFF700CB3AEA /* salmisc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salmisc.cxx; path = "../../ios-device/vcl/source/gdi/salmisc.cxx"; sourceTree = "<group>"; };
+ BEF7F1B42236AFF700CB3AEA /* hatch.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hatch.cxx; path = "../../ios-device/vcl/source/gdi/hatch.cxx"; sourceTree = "<group>"; };
+ BEF7F1B52236AFF800CB3AEA /* bmpacc3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpacc3.cxx; path = "../../ios-device/vcl/source/gdi/bmpacc3.cxx"; sourceTree = "<group>"; };
+ BEF7F1B62236AFF800CB3AEA /* pdffontcache.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdffontcache.cxx; path = "../../ios-device/vcl/source/gdi/pdffontcache.cxx"; sourceTree = "<group>"; };
+ BEF7F1B72236AFF800CB3AEA /* impanmvw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = impanmvw.cxx; path = "../../ios-device/vcl/source/gdi/impanmvw.cxx"; sourceTree = "<group>"; };
+ BEF7F1B82236AFF800CB3AEA /* textlayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textlayout.cxx; path = "../../ios-device/vcl/source/gdi/textlayout.cxx"; sourceTree = "<group>"; };
+ BEF7F1B92236AFF800CB3AEA /* impgraph.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = impgraph.cxx; path = "../../ios-device/vcl/source/gdi/impgraph.cxx"; sourceTree = "<group>"; };
+ BEF7F1BA2236AFF800CB3AEA /* metaact.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = metaact.cxx; path = "../../ios-device/vcl/source/gdi/metaact.cxx"; sourceTree = "<group>"; };
+ BEF7F1BB2236AFF800CB3AEA /* animate.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animate.cxx; path = "../../ios-device/vcl/source/gdi/animate.cxx"; sourceTree = "<group>"; };
+ BEF7F1BC2236AFF800CB3AEA /* alpha.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = alpha.cxx; path = "../../ios-device/vcl/source/gdi/alpha.cxx"; sourceTree = "<group>"; };
+ BEF7F1BD2236AFF800CB3AEA /* regionband.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regionband.cxx; path = "../../ios-device/vcl/source/gdi/regionband.cxx"; sourceTree = "<group>"; };
+ BEF7F1BE2236AFF800CB3AEA /* jobset.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jobset.cxx; path = "../../ios-device/vcl/source/gdi/jobset.cxx"; sourceTree = "<group>"; };
+ BEF7F1BF2236AFF800CB3AEA /* base14.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = base14.cxx; path = "../../ios-device/vcl/source/gdi/base14.cxx"; sourceTree = "<group>"; };
+ BEF7F1C02236AFF800CB3AEA /* print.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = print.cxx; path = "../../ios-device/vcl/source/gdi/print.cxx"; sourceTree = "<group>"; };
+ BEF7F1C12236AFF800CB3AEA /* oldprintadaptor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = oldprintadaptor.cxx; path = "../../ios-device/vcl/source/gdi/oldprintadaptor.cxx"; sourceTree = "<group>"; };
+ BEF7F1C22236AFF800CB3AEA /* gdimtf.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gdimtf.cxx; path = "../../ios-device/vcl/source/gdi/gdimtf.cxx"; sourceTree = "<group>"; };
+ BEF7F1C32236AFF800CB3AEA /* region.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = region.cxx; path = "../../ios-device/vcl/source/gdi/region.cxx"; sourceTree = "<group>"; };
+ BEF7F1C42236AFF800CB3AEA /* genVerticalOrientationData.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = genVerticalOrientationData.pl; path = "../../ios-device/vcl/source/gdi/genVerticalOrientationData.pl"; sourceTree = "<group>"; };
+ BEF7F1C52236AFF800CB3AEA /* graph.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graph.cxx; path = "../../ios-device/vcl/source/gdi/graph.cxx"; sourceTree = "<group>"; };
+ BEF7F1C62236AFF800CB3AEA /* bitmap4.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap4.cxx; path = "../../ios-device/vcl/source/gdi/bitmap4.cxx"; sourceTree = "<group>"; };
+ BEF7F1C72236AFF800CB3AEA /* pdffontcache.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = pdffontcache.hxx; path = "../../ios-device/vcl/source/gdi/pdffontcache.hxx"; sourceTree = "<group>"; };
+ BEF7F1C82236AFF800CB3AEA /* scrptrun.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrptrun.cxx; path = "../../ios-device/vcl/source/gdi/scrptrun.cxx"; sourceTree = "<group>"; };
+ BEF7F1C92236AFF800CB3AEA /* vectorgraphicdata.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vectorgraphicdata.cxx; path = "../../ios-device/vcl/source/gdi/vectorgraphicdata.cxx"; sourceTree = "<group>"; };
+ BEF7F1CA2236AFF800CB3AEA /* pdfextoutdevdata.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfextoutdevdata.cxx; path = "../../ios-device/vcl/source/gdi/pdfextoutdevdata.cxx"; sourceTree = "<group>"; };
+ BEF7F1CB2236AFF800CB3AEA /* bmpfast.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpfast.cxx; path = "../../ios-device/vcl/source/gdi/bmpfast.cxx"; sourceTree = "<group>"; };
+ BEF7F1CC2236AFF900CB3AEA /* pdfwriter_impl2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfwriter_impl2.cxx; path = "../../ios-device/vcl/source/gdi/pdfwriter_impl2.cxx"; sourceTree = "<group>"; };
+ BEF7F1CD2236AFF900CB3AEA /* impbmp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = impbmp.cxx; path = "../../ios-device/vcl/source/gdi/impbmp.cxx"; sourceTree = "<group>"; };
+ BEF7F1CE2236AFF900CB3AEA /* pdfwriter.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfwriter.cxx; path = "../../ios-device/vcl/source/gdi/pdfwriter.cxx"; sourceTree = "<group>"; };
+ BEF7F1CF2236AFF900CB3AEA /* pngwrite.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pngwrite.cxx; path = "../../ios-device/vcl/source/gdi/pngwrite.cxx"; sourceTree = "<group>"; };
+ BEF7F1D02236AFF900CB3AEA /* salgdiimpl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdiimpl.cxx; path = "../../ios-device/vcl/source/gdi/salgdiimpl.cxx"; sourceTree = "<group>"; };
+ BEF7F1D12236AFF900CB3AEA /* virdev.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = virdev.cxx; path = "../../ios-device/vcl/source/gdi/virdev.cxx"; sourceTree = "<group>"; };
+ BEF7F1D22236AFF900CB3AEA /* gradient.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gradient.cxx; path = "../../ios-device/vcl/source/gdi/gradient.cxx"; sourceTree = "<group>"; };
+ BEF7F1D32236AFF900CB3AEA /* FileDefinitionWidgetDraw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FileDefinitionWidgetDraw.cxx; path = "../../ios-device/vcl/source/gdi/FileDefinitionWidgetDraw.cxx"; sourceTree = "<group>"; };
+ BEF7F1D42236AFF900CB3AEA /* graphictools.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphictools.cxx; path = "../../ios-device/vcl/source/gdi/graphictools.cxx"; sourceTree = "<group>"; };
+ BEF7F1D52236AFF900CB3AEA /* pdfwriter_impl.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = pdfwriter_impl.hxx; path = "../../ios-device/vcl/source/gdi/pdfwriter_impl.hxx"; sourceTree = "<group>"; };
+ BEF7F1D62236AFF900CB3AEA /* regband.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regband.cxx; path = "../../ios-device/vcl/source/gdi/regband.cxx"; sourceTree = "<group>"; };
+ BEF7F1D72236AFF900CB3AEA /* print3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = print3.cxx; path = "../../ios-device/vcl/source/gdi/print3.cxx"; sourceTree = "<group>"; };
+ BEF7F1D82236AFF900CB3AEA /* impvect.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = impvect.hxx; path = "../../ios-device/vcl/source/gdi/impvect.hxx"; sourceTree = "<group>"; };
+ BEF7F1D92236AFF900CB3AEA /* CommonSalLayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommonSalLayout.cxx; path = "../../ios-device/vcl/source/gdi/CommonSalLayout.cxx"; sourceTree = "<group>"; };
+ BEF7F1DA2236AFF900CB3AEA /* pngread.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pngread.cxx; path = "../../ios-device/vcl/source/gdi/pngread.cxx"; sourceTree = "<group>"; };
+ BEF7F1DB2236AFF900CB3AEA /* WidgetDefinitionReader.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WidgetDefinitionReader.cxx; path = "../../ios-device/vcl/source/gdi/WidgetDefinitionReader.cxx"; sourceTree = "<group>"; };
+ BEF7F1DC2236AFFA00CB3AEA /* bitmap3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap3.cxx; path = "../../ios-device/vcl/source/gdi/bitmap3.cxx"; sourceTree = "<group>"; };
+ BEF7F1DD2236AFFA00CB3AEA /* bmpacc2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpacc2.cxx; path = "../../ios-device/vcl/source/gdi/bmpacc2.cxx"; sourceTree = "<group>"; };
+ BEF7F1DE2236AFFA00CB3AEA /* configsettings.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = configsettings.cxx; path = "../../ios-device/vcl/source/gdi/configsettings.cxx"; sourceTree = "<group>"; };
+ BEF7F1DF2236AFFA00CB3AEA /* extoutdevdata.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = extoutdevdata.cxx; path = "../../ios-device/vcl/source/gdi/extoutdevdata.cxx"; sourceTree = "<group>"; };
+ BEF7F1E02236AFFA00CB3AEA /* bitmapex.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bitmapex.cxx; path = "../../ios-device/vcl/source/gdi/bitmapex.cxx"; sourceTree = "<group>"; };
+ BEF7F1E12236AFFA00CB3AEA /* sallayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sallayout.cxx; path = "../../ios-device/vcl/source/gdi/sallayout.cxx"; sourceTree = "<group>"; };
+ BEF7F1E22236AFFA00CB3AEA /* wall.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wall.cxx; path = "../../ios-device/vcl/source/gdi/wall.cxx"; sourceTree = "<group>"; };
+ BEF7F1E32236AFFA00CB3AEA /* WidgetDefinition.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WidgetDefinition.cxx; path = "../../ios-device/vcl/source/gdi/WidgetDefinition.cxx"; sourceTree = "<group>"; };
+ BEF7F1E42236AFFA00CB3AEA /* salgdilayout.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdilayout.cxx; path = "../../ios-device/vcl/source/gdi/salgdilayout.cxx"; sourceTree = "<group>"; };
+ BEF7F1E52236AFFA00CB3AEA /* mapmod.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mapmod.cxx; path = "../../ios-device/vcl/source/gdi/mapmod.cxx"; sourceTree = "<group>"; };
+ BEF7F1E62236AFFA00CB3AEA /* lineinfo.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lineinfo.cxx; path = "../../ios-device/vcl/source/gdi/lineinfo.cxx"; sourceTree = "<group>"; };
+ BEF7F1E72236AFFA00CB3AEA /* svmconverter.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svmconverter.cxx; path = "../../ios-device/vcl/source/gdi/svmconverter.cxx"; sourceTree = "<group>"; };
+ BEF7F1E82236AFFA00CB3AEA /* gfxlink.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gfxlink.cxx; path = "../../ios-device/vcl/source/gdi/gfxlink.cxx"; sourceTree = "<group>"; };
+ BEF7F1E92236AFFA00CB3AEA /* dibtools.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dibtools.cxx; path = "../../ios-device/vcl/source/gdi/dibtools.cxx"; sourceTree = "<group>"; };
+ BEF7F1EA2236AFFB00CB3AEA /* bmpacc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bmpacc.cxx; path = "../../ios-device/vcl/source/gdi/bmpacc.cxx"; sourceTree = "<group>"; };
+ BEF7F1EB2236AFFB00CB3AEA /* impvect.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = impvect.cxx; path = "../../ios-device/vcl/source/gdi/impvect.cxx"; sourceTree = "<group>"; };
+ BEF7F1EC2236AFFB00CB3AEA /* cvtgrf.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cvtgrf.cxx; path = "../../ios-device/vcl/source/gdi/cvtgrf.cxx"; sourceTree = "<group>"; };
+ BEF7F1ED2236AFFB00CB3AEA /* VerticalOrientationData.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = VerticalOrientationData.cxx; path = "../../ios-device/vcl/source/gdi/VerticalOrientationData.cxx"; sourceTree = "<group>"; };
+ BEF7F1EE2236AFFB00CB3AEA /* print2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = print2.cxx; path = "../../ios-device/vcl/source/gdi/print2.cxx"; sourceTree = "<group>"; };
+ BEF7F1EF2236AFFB00CB3AEA /* pdfwriter_impl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfwriter_impl.cxx; path = "../../ios-device/vcl/source/gdi/pdfwriter_impl.cxx"; sourceTree = "<group>"; };
+ BEF7F1F02236AFFB00CB3AEA /* gdimetafiletools.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gdimetafiletools.cxx; path = "../../ios-device/vcl/source/gdi/gdimetafiletools.cxx"; sourceTree = "<group>"; };
+ BEF7F1F12236AFFB00CB3AEA /* bitmap.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap.cxx; path = "../../ios-device/vcl/source/gdi/bitmap.cxx"; sourceTree = "<group>"; };
+ BEF7F1F22236AFFB00CB3AEA /* salnativewidgets-none.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "salnativewidgets-none.cxx"; path = "../../ios-device/vcl/source/gdi/salnativewidgets-none.cxx"; sourceTree = "<group>"; };
+ BEF7F1F32236AFFB00CB3AEA /* embeddedfontshelper.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = embeddedfontshelper.cxx; path = "../../ios-device/vcl/source/gdi/embeddedfontshelper.cxx"; sourceTree = "<group>"; };
BEFB1EDF21C29CC70081D757 /* L10n.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = L10n.h; sourceTree = "<group>"; };
BEFB1EE021C29CC70081D757 /* L10n.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = L10n.mm; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -640,6 +740,7 @@
isa = PBXGroup;
children = (
BE34D10E218B669000815297 /* app */,
+ BE7AECDC22393D1200B117D2 /* dialog */,
BE34D120218B674400815297 /* shells */,
);
name = uibase;
@@ -1045,6 +1146,61 @@
name = Core;
sourceTree = "<group>";
};
+ BE7AECDC22393D1200B117D2 /* dialog */ = {
+ isa = PBXGroup;
+ children = (
+ BE7AECE022393D3D00B117D2 /* regionsw.cxx */,
+ BE7AECE222393D3D00B117D2 /* swabstdlg.cxx */,
+ BE7AECDF22393D3D00B117D2 /* SwSpellDialogChildWindow.cxx */,
+ BE7AECE122393D3D00B117D2 /* swwrtshitem.cxx */,
+ BE7AECDD22393D3D00B117D2 /* watermarkdialog.cxx */,
+ BE7AECDE22393D3D00B117D2 /* wordcountwrapper.cxx */,
+ );
+ name = dialog;
+ sourceTree = "<group>";
+ };
+ BE7AECE32239692A00B117D2 /* control */ = {
+ isa = PBXGroup;
+ children = (
+ BE7AECF32239694700B117D2 /* button.cxx */,
+ BE7AECF42239694700B117D2 /* combobox.cxx */,
+ BE7AECFA2239694800B117D2 /* ctrl.cxx */,
+ BE7AECE82239694700B117D2 /* edit.cxx */,
+ BE7AECF82239694800B117D2 /* field.cxx */,
+ BE7AECEF2239694700B117D2 /* field2.cxx */,
+ BE7AECED2239694700B117D2 /* fixed.cxx */,
+ BE7AECE62239694700B117D2 /* fixedhyper.cxx */,
+ BE7AECFB2239694800B117D2 /* group.cxx */,
+ BE7AECF02239694700B117D2 /* imgctrl.cxx */,
+ BE7AECFC2239694800B117D2 /* imp_listbox.cxx */,
+ BE7AECEA2239694700B117D2 /* listbox.cxx */,
+ BE7AECF92239694800B117D2 /* listctrl.cxx */,
+ BE7AECE52239694700B117D2 /* longcurr.cxx */,
+ BE7AECEE2239694700B117D2 /* menubtn.cxx */,
+ BE7AECE92239694700B117D2 /* morebtn.cxx */,
+ BE7AECEC2239694700B117D2 /* notebookbar.cxx */,
+ BE7AECE72239694700B117D2 /* prgsbar.cxx */,
+ BE7AECF52239694700B117D2 /* quickselectionengine.cxx */,
+ BE7AECF22239694700B117D2 /* scrbar.cxx */,
+ BE7AECF72239694800B117D2 /* slider.cxx */,
+ BE7AECF62239694700B117D2 /* spinbtn.cxx */,
+ BE7AECEB2239694700B117D2 /* spinfld.cxx */,
+ BE7AECF12239694700B117D2 /* tabctrl.cxx */,
+ BE7AECFD2239694800B117D2 /* throbber.cxx */,
+ BE7AECE42239694700B117D2 /* thumbpos.hxx */,
+ );
+ name = control;
+ sourceTree = "<group>";
+ };
+ BE7AECFE2239B76F00B117D2 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ BE7AECFF2239B79600B117D2 /* dummies.cxx */,
+ BE7AED002239B79600B117D2 /* iosinst.cxx */,
+ );
+ name = ios;
+ sourceTree = "<group>";
+ };
BE80E43321B5629300859C97 /* cppuhelper */ = {
isa = PBXGroup;
children = (
@@ -1135,7 +1291,10 @@
isa = PBXGroup;
children = (
BE93D421216CAA59007A39F4 /* app */,
+ BE7AECFE2239B76F00B117D2 /* ios */,
+ BE7AECE32239692A00B117D2 /* control */,
BEB0E5DA21CA7C330085A0CF /* filter */,
+ BEF7F1B12236AFCC00CB3AEA /* gdi */,
BE58E1312187938700249358 /* headless */,
BEB0E5E721D642420085A0CF /* outdev */,
BEB0E5DF21CA9DA20085A0CF /* quartz */,
@@ -1441,6 +1600,79 @@
name = stream;
sourceTree = "<group>";
};
+ BEF7F1B12236AFCC00CB3AEA /* gdi */ = {
+ isa = PBXGroup;
+ children = (
+ BEF7F1BC2236AFF800CB3AEA /* alpha.cxx */,
+ BEF7F1BB2236AFF800CB3AEA /* animate.cxx */,
+ BEF7F1BF2236AFF800CB3AEA /* base14.cxx */,
+ BEF7F1F12236AFFB00CB3AEA /* bitmap.cxx */,
+ BEF7F1DC2236AFFA00CB3AEA /* bitmap3.cxx */,
+ BEF7F1C62236AFF800CB3AEA /* bitmap4.cxx */,
+ BEF7F1E02236AFFA00CB3AEA /* bitmapex.cxx */,
+ BEF7F1EA2236AFFB00CB3AEA /* bmpacc.cxx */,
+ BEF7F1DD2236AFFA00CB3AEA /* bmpacc2.cxx */,
+ BEF7F1B52236AFF800CB3AEA /* bmpacc3.cxx */,
+ BEF7F1CB2236AFF800CB3AEA /* bmpfast.cxx */,
+ BEF7F1D92236AFF900CB3AEA /* CommonSalLayout.cxx */,
+ BEF7F1DE2236AFFA00CB3AEA /* configsettings.cxx */,
+ BEF7F1EC2236AFFB00CB3AEA /* cvtgrf.cxx */,
+ BEF7F1E92236AFFA00CB3AEA /* dibtools.cxx */,
+ BEF7F1F32236AFFB00CB3AEA /* embeddedfontshelper.cxx */,
+ BEF7F1DF2236AFFA00CB3AEA /* extoutdevdata.cxx */,
+ BEF7F1D32236AFF900CB3AEA /* FileDefinitionWidgetDraw.cxx */,
+ BEF7F1F02236AFFB00CB3AEA /* gdimetafiletools.cxx */,
+ BEF7F1C22236AFF800CB3AEA /* gdimtf.cxx */,
+ BEF7F1C42236AFF800CB3AEA /* genVerticalOrientationData.pl */,
+ BEF7F1E82236AFFA00CB3AEA /* gfxlink.cxx */,
+ BEF7F1D22236AFF900CB3AEA /* gradient.cxx */,
+ BEF7F1C52236AFF800CB3AEA /* graph.cxx */,
+ BEF7F1D42236AFF900CB3AEA /* graphictools.cxx */,
+ BEF7F1B42236AFF700CB3AEA /* hatch.cxx */,
+ BEF7F1B72236AFF800CB3AEA /* impanmvw.cxx */,
+ BEF7F1CD2236AFF900CB3AEA /* impbmp.cxx */,
+ BEF7F1B92236AFF800CB3AEA /* impgraph.cxx */,
+ BEF7F1EB2236AFFB00CB3AEA /* impvect.cxx */,
+ BEF7F1D82236AFF900CB3AEA /* impvect.hxx */,
+ BEF7F1BE2236AFF800CB3AEA /* jobset.cxx */,
+ BEF7F1E62236AFFA00CB3AEA /* lineinfo.cxx */,
+ BEF7F1E52236AFFA00CB3AEA /* mapmod.cxx */,
+ BEF7F1BA2236AFF800CB3AEA /* metaact.cxx */,
+ BEF7F1B22236AFF700CB3AEA /* octree.cxx */,
+ BEF7F1C12236AFF800CB3AEA /* oldprintadaptor.cxx */,
+ BEF7F1CA2236AFF800CB3AEA /* pdfextoutdevdata.cxx */,
+ BEF7F1B62236AFF800CB3AEA /* pdffontcache.cxx */,
+ BEF7F1C72236AFF800CB3AEA /* pdffontcache.hxx */,
+ BEF7F1EF2236AFFB00CB3AEA /* pdfwriter_impl.cxx */,
+ BEF7F1D52236AFF900CB3AEA /* pdfwriter_impl.hxx */,
+ BEF7F1CC2236AFF900CB3AEA /* pdfwriter_impl2.cxx */,
+ BEF7F1CE2236AFF900CB3AEA /* pdfwriter.cxx */,
+ BEF7F1DA2236AFF900CB3AEA /* pngread.cxx */,
+ BEF7F1CF2236AFF900CB3AEA /* pngwrite.cxx */,
+ BEF7F1C02236AFF800CB3AEA /* print.cxx */,
+ BEF7F1EE2236AFFB00CB3AEA /* print2.cxx */,
+ BEF7F1D72236AFF900CB3AEA /* print3.cxx */,
+ BEF7F1D62236AFF900CB3AEA /* regband.cxx */,
+ BEF7F1C32236AFF800CB3AEA /* region.cxx */,
+ BEF7F1BD2236AFF800CB3AEA /* regionband.cxx */,
+ BEF7F1D02236AFF900CB3AEA /* salgdiimpl.cxx */,
+ BEF7F1E42236AFFA00CB3AEA /* salgdilayout.cxx */,
+ BEF7F1E12236AFFA00CB3AEA /* sallayout.cxx */,
+ BEF7F1B32236AFF700CB3AEA /* salmisc.cxx */,
+ BEF7F1F22236AFFB00CB3AEA /* salnativewidgets-none.cxx */,
+ BEF7F1C82236AFF800CB3AEA /* scrptrun.cxx */,
+ BEF7F1E72236AFFA00CB3AEA /* svmconverter.cxx */,
+ BEF7F1B82236AFF800CB3AEA /* textlayout.cxx */,
+ BEF7F1C92236AFF800CB3AEA /* vectorgraphicdata.cxx */,
+ BEF7F1ED2236AFFB00CB3AEA /* VerticalOrientationData.cxx */,
+ BEF7F1D12236AFF900CB3AEA /* virdev.cxx */,
+ BEF7F1E22236AFFA00CB3AEA /* wall.cxx */,
+ BEF7F1E32236AFFA00CB3AEA /* WidgetDefinition.cxx */,
+ BEF7F1DB2236AFF900CB3AEA /* WidgetDefinitionReader.cxx */,
+ );
+ name = gdi;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
commit eabd71fe7169d863485dad95686a32f0349ed6c7
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Mar 13 11:52:22 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Mar 22 14:03:56 2019 +0100
colibre: Update to the latest versions from master.
Change-Id: I4358a89b48bd4165bdc059a09e7e794599a9d842
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 3c2534b17..b60a95806 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -146,7 +146,7 @@ w2ui-toolbar {
.closebuttonimage {
display: none;
- background: url('images/lc_closedoc.svg') no-repeat center !important;
+ background: url('images/closedoc.svg') no-repeat center !important;
}
#tb_actionbar_item_left {
diff --git a/loleaflet/images/lc_closedoc.svg b/loleaflet/images/closedoc.svg
similarity index 100%
rename from loleaflet/images/lc_closedoc.svg
rename to loleaflet/images/closedoc.svg
diff --git a/loleaflet/images/fr010.svg b/loleaflet/images/fr010.svg
index 2abd79823..7536661e2 100644
--- a/loleaflet/images/fr010.svg
+++ b/loleaflet/images/fr010.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 22h20v-20h-20zm2-2v-16h16v16z" fill="#eac282"/><path d="m4 20h16v-16h-16z" fill="#fff"/><path d="m-13 4h2v16h-2z" fill="#eac282" transform="rotate(-90)"/><path d="m-22 11h20v2h-20z" fill="#4d82b8" transform="rotate(-90)"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 22h20v-20h-20zm2-2v-16h16v16z" fill="#808080"/><path d="m4 20h16v-16h-16z" fill="#fff"/><path d="m-13 4h2v16h-2z" fill="#808080" transform="rotate(-90)"/><path d="m-22 11h20v2h-20z" fill="#eac282" transform="rotate(-90)"/></svg>
diff --git a/loleaflet/images/fr011.svg b/loleaflet/images/fr011.svg
index 4bae209d4..34dc994ac 100644
--- a/loleaflet/images/fr011.svg
+++ b/loleaflet/images/fr011.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#eac282"/><path d="m4 4v16h16v-16z" fill="#fff"/><path d="m11 4h2v16h-2z" fill="#eac282"/><path d="m2 11h20v2h-20z" fill="#4d82b8"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#808080"/><path d="m4 4v16h16v-16z" fill="#fff"/><path d="m11 4h2v16h-2z" fill="#808080"/><path d="m2 11h20v2h-20z" fill="#eac282"/></svg>
diff --git a/loleaflet/images/fr012.svg b/loleaflet/images/fr012.svg
index 5bfdbf1d8..af5629880 100644
--- a/loleaflet/images/fr012.svg
+++ b/loleaflet/images/fr012.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#eac282"/><path d="m4 4v16h16v-16z" fill="#fff"/><path d="m11 4h2v16h-2z" fill="#eac282"/><path d="m2 11h20v2h-20z" fill="#eac282"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#808080"/><path d="m4 4v16h16v-16z" fill="#fff"/><path d="m11 4h2v16h-2z" fill="#808080"/><path d="m2 11h20v2h-20z" fill="#808080"/></svg>
diff --git a/loleaflet/images/fr02.svg b/loleaflet/images/fr02.svg
index 3056082d3..f4fd6aae0 100644
--- a/loleaflet/images/fr02.svg
+++ b/loleaflet/images/fr02.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h2v-2-16-2z" fill="#eac282"/><path d="m4 2v20h18v-20z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h2v-2-16-2z" fill="#808080"/><path d="m4 2v20h18v-20z" fill="#fff"/></svg>
diff --git a/loleaflet/images/fr03.svg b/loleaflet/images/fr03.svg
index 099540ed0..001e5f1d7 100644
--- a/loleaflet/images/fr03.svg
+++ b/loleaflet/images/fr03.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m22 2v20h-2v-2-16-2z" fill="#eac282"/><path d="m20 2v20h-18v-20z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m22 2v20h-2v-2-16-2z" fill="#808080"/><path d="m20 2v20h-18v-20z" fill="#fff"/></svg>
diff --git a/loleaflet/images/fr04.svg b/loleaflet/images/fr04.svg
index 1502e4659..471fe585f 100644
--- a/loleaflet/images/fr04.svg
+++ b/loleaflet/images/fr04.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h2v-2-16-2z" fill="#eac282"/><path d="m4 2v20h16v-20z" fill="#fff"/><path d="m22 2v20h-2v-2-16-2z" fill="#eac282"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h2v-2-16-2z" fill="#808080"/><path d="m4 2v20h16v-20z" fill="#fff"/><path d="m22 2v20h-2v-2-16-2z" fill="#808080"/></svg>
diff --git a/loleaflet/images/fr05.svg b/loleaflet/images/fr05.svg
index 90387ad39..c2440ad29 100644
--- a/loleaflet/images/fr05.svg
+++ b/loleaflet/images/fr05.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2h20v2h-2-16-2z" fill="#eac282"/><path d="m2 4h20v18h-20z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2h20v2h-2-16-2z" fill="#808080"/><path d="m2 4h20v18h-20z" fill="#fff"/></svg>
diff --git a/loleaflet/images/fr06.svg b/loleaflet/images/fr06.svg
index 02a35eb80..3385e4330 100644
--- a/loleaflet/images/fr06.svg
+++ b/loleaflet/images/fr06.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 22h20v-2h-2-16-2z" fill="#eac282"/><path d="m2 20h20v-18h-20z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 22h20v-2h-2-16-2z" fill="#808080"/><path d="m2 20h20v-18h-20z" fill="#fff"/></svg>
diff --git a/loleaflet/images/fr07.svg b/loleaflet/images/fr07.svg
index 8b02198cd..a83aeff32 100644
--- a/loleaflet/images/fr07.svg
+++ b/loleaflet/images/fr07.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2h20v2h-2-16-2z" fill="#eac282"/><path d="m2 4h20v16h-20z" fill="#fff"/><path d="m2 22h20v-2h-2-16-2z" fill="#eac282"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2h20v2h-2-16-2z" fill="#808080"/><path d="m2 4h20v16h-20z" fill="#fff"/><path d="m2 22h20v-2h-2-16-2z" fill="#808080"/></svg>
diff --git a/loleaflet/images/fr08.svg b/loleaflet/images/fr08.svg
index 6ccfec3b8..99c960860 100644
--- a/loleaflet/images/fr08.svg
+++ b/loleaflet/images/fr08.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#eac282"/><path d="m4 4v16h16v-16z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v20h20v-20zm2 2h16v16h-16z" fill="#808080"/><path d="m4 4v16h16v-16z" fill="#fff"/></svg>
diff --git a/loleaflet/images/fr09.svg b/loleaflet/images/fr09.svg
index ebfe3e6cd..035a30eff 100644
--- a/loleaflet/images/fr09.svg
+++ b/loleaflet/images/fr09.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 4v16h20v-16z" fill="#fff"/><g fill="#eac282"><path d="m2 11h20v2h-20z"/><path d="m2 2h20v2h-20z"/><path d="m2 20h20v2h-20z"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2 4v16h20v-16z" fill="#fff"/><g fill="#808080"><path d="m2 11h20v2h-20z"/><path d="m2 2h20v2h-20z"/><path d="m2 20h20v2h-20z"/></g></svg>
diff --git a/loleaflet/images/icon-set-bars-half.svg b/loleaflet/images/icon-set-bars-half.svg
index e6d2f9287..d1d47de1d 100644
--- a/loleaflet/images/icon-set-bars-half.svg
+++ b/loleaflet/images/icon-set-bars-half.svg
@@ -1 +1,2 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">/><g fill="#808080"><path d="m1 10c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm0 1h1v4h-1z"/><path d="m1 11h1v4h-1z" opacity=".5"/><path d="m5 7c-.554 0-1 .446-1 1v7c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-7c0-.554-.446-1-1-1zm0 1h1v7h-1z"/><path d="m5 8h1v7h-1z" opacity=".5"/></g><g fill="#4d82b8"><path d="m9 3c-.554 0-1 .446-1 1v11c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-11c0-.554-.446-1-1-1zm0 1h1v11h-1z"/><path d="m9 4h1v11h-1z" opacity=".5"/><path d="m13 0c-.554 0-1 .446-1 1v14c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-14c0-.554-.446-1-1-1zm0 1h1v14h-1z"/><path d="m13 1h1v14h-1z" opacity=".5"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+/><g fill="#4d82b8"><path d="m1 10c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm0 1h1v4h-1z"/><path d="m1 11h1v4h-1z" opacity=".5"/><path d="m5 7c-.554 0-1 .446-1 1v7c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-7c0-.554-.446-1-1-1zm0 1h1v7h-1z"/><path d="m5 8h1v7h-1z" opacity=".5"/></g><path d="m9 3c-.554 0-1 .446-1 1v11c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-11c0-.554-.446-1-1-1zm0 1h1v11h-1z" fill="#808080"/><path d="m9 4h1v11h-1z" fill="#808080" opacity=".5"/><path d="m13 0c-.554 0-1 .446-1 1v14c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-14c0-.554-.446-1-1-1zm0 1h1v14h-1z" fill="#808080"/><path d="m13 1h1v14h-1z" fill="#808080" opacity=".5"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/icon-set-bars-one-quarter.svg b/loleaflet/images/icon-set-bars-one-quarter.svg
index 5d0a325de..a3f2eab47 100644
--- a/loleaflet/images/icon-set-bars-one-quarter.svg
+++ b/loleaflet/images/icon-set-bars-one-quarter.svg
@@ -1 +1,2 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">/><g fill="#808080"><path d="m1 10c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm0 1h1v4h-1z"/><path d="m1 11h1v4h-1z" opacity=".5"/><path d="m5 7c-.554 0-1 .446-1 1v7c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-7c0-.554-.446-1-1-1zm0 1h1v7h-1z"/><path d="m5 8h1v7h-1z" opacity=".5"/><path d="m9 3c-.554 0-1 .446-1 1v11c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-11c0-.554-.446-1-1-1zm0 1h1v11h-1z"/><path d="m9 4h1v11h-1z" opacity=".5"/></g><path d="m13 0c-.554 0-1 .446-1 1v14c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-14c0-.554-.446-1-1-1zm0 1h1v14h-1z" fill="#4d82b8"/><path d="m13 1h1v14h-1z" fill="#4d82b8" opacity=".5"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+/><g fill="#4d82b8"><path d="m1 10c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm0 1h1v4h-1z"/><path d="m1 11h1v4h-1z" opacity=".5"/><path d="m5 7c-.554 0-1 .446-1 1v7c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-7c0-.554-.446-1-1-1zm0 1h1v7h-1z"/><path d="m5 8h1v7h-1z" opacity=".5"/><path d="m9 3c-.554 0-1 .446-1 1v11c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-11c0-.554-.446-1-1-1zm0 1h1v11h-1z"/><path d="m9 4h1v11h-1z" opacity=".5"/></g><path d="m13 0c-.554 0-1 .446-1 1v14c0 .554.446 1 1 1h1c .554 0 1-.446 1-1v-14c0-.554-.446-1-1-1zm0 1h1v14h-1z" fill="#808080"/><path d="m13 1h1v14h-1z" fill="#808080" opacity=".5"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_calloutshapes.line-callout-1.svg b/loleaflet/images/lc_calloutshapes.line-callout-1.svg
index da2f1b03b..d193fc19c 100644
--- a/loleaflet/images/lc_calloutshapes.line-callout-1.svg
+++ b/loleaflet/images/lc_calloutshapes.line-callout-1.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#4d4d4d"
- d="M 10 4 L 10 16 L 20 16 L 20 4 L 10 4 z M 6.1875 9 C 5.4817077 12.606692 4.7519992 16.208754 4.03125 19.8125 L 4 20 L 6 20 C 6.8177316 16.346927 7.3281877 12.621637 8.28125 9 L 6.1875 9 z "
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9.5 2.5v14h12v-14zm-5 6-2 13h3l2-13z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_calloutshapes.line-callout-2.svg b/loleaflet/images/lc_calloutshapes.line-callout-2.svg
index b98c2239d..a7a17eec4 100644
--- a/loleaflet/images/lc_calloutshapes.line-callout-2.svg
+++ b/loleaflet/images/lc_calloutshapes.line-callout-2.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#4d4d4d"
- d="M 10 4 L 10 9 L 6.1875 9 C 5.4817077 12.606692 4.7519992 16.208754 4.03125 19.8125 L 4 20 L 6 20 L 7.8125 11 L 10 11 L 10 16 L 20 16 L 20 4 L 10 4 z "
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m9.5 2.5v6h-4l-3.0000045 13h3.0000045l2-10h2v5h11.999995v-14z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_calloutshapes.line-callout-3.svg b/loleaflet/images/lc_calloutshapes.line-callout-3.svg
index ca5d06401..813ec0516 100644
--- a/loleaflet/images/lc_calloutshapes.line-callout-3.svg
+++ b/loleaflet/images/lc_calloutshapes.line-callout-3.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#4d4d4d"
- d="M 10 4 L 10 16 L 20 16 L 20 4 L 10 4 z M 6 9 L 6 20 L 8 20 L 8 9 L 6 9 z "
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m8.5 2.5v14h12v-14zm-5 6v13h3v-13z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_checkbox.svg b/loleaflet/images/lc_checkbox.svg
index 8cce0f055..b51663f90 100644
--- a/loleaflet/images/lc_checkbox.svg
+++ b/loleaflet/images/lc_checkbox.svg
@@ -1 +1 @@
-<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g fill="#4d4d4d" transform="translate(1 -1029.3622)"><path d="m6 4c-1.108 0-2 .8919999-2 2l0 12c0 1.108.892 2 2 2l12 0c1.108 0 2-.892 2-2l0-12c0-1.1080001-.892-2-2-2l-12 0zm0 1l12 0c .554 0 1 .4459999 1 1l0 12c0 .554-.446 1-1 1l-12 0c-.554 0-1-.446-1-1l0-12c0-.5540001.446-1 1-1z" overflow="visible" transform="translate(-1 1029.3622)"/><rect height="12" overflow="visible" rx="1" ry="0" transform="translate(-1 1029.3622)" width="12" x="6" y="6.0000172"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h18c.554 0 1-.446 1-1v-18c0-.554-.446-1-1-1zm0 1h18v18h-18z" fill="#808080"/><path d="m3 3h18v18h-18z" fill="#fff"/><path d="m19.074219 5a.9696394.9696394 0 0 0 -.81836.3847656l-8.7363278 11.2460934-3.9082031-3.353515a.9696394.9696394 0 1 0 -1.2617187 1.472656l4.6796875 4.015625a.9696394.9696394 0 0 0 1.3964841-.140625l9.361328-12.0507812a.9696394.9696394 0 0 0 -.71289-1.5742188z" fill="#808080" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_conditionalformatdialog.svg b/loleaflet/images/lc_conditionalformatdialog.svg
index 421ff9da6..c1872558f 100644
--- a/loleaflet/images/lc_conditionalformatdialog.svg
+++ b/loleaflet/images/lc_conditionalformatdialog.svg
@@ -1,10 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#4d4d4d"
- d="M 8 4 C 6.9282 7.8182 4 10.072941 4 12.181641 C 4 14.290341 5.79086 16 8 16 C 10.20914 16 12 14.290341 12 12.181641 C 12 10.072941 9.0718 7.8182 8 4 z M 10.75 10.232422 A 3.4285713 3.2727273 0 0 1 11.427734 12.181641 A 3.4285713 3.2727273 0 0 1 8 15.455078 A 3.4285713 3.2727273 0 0 1 5.9628906 14.808594 A 3.9999998 3.8181818 0 0 0 6.8574219 14.908203 A 3.9999998 3.8181818 0 0 0 10.857422 11.091797 A 3.9999998 3.8181818 0 0 0 10.75 10.232422 z "
- />
- <path
- style="fill:#1d99f3"
- d="M 18.4375 13 L 17.283203 15 L 14 15 L 14 16 L 16.707031 16 L 16.128906 17 L 14 17 L 14 18 L 15.552734 18 L 14.6875 19.5 L 15.5625 20 L 16.716797 18 L 20 18 L 20 17 L 17.292969 17 L 17.871094 16 L 20 16 L 20 15 L 18.447266 15 L 19.3125 13.5 L 18.4375 13 z "
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m12 12h10v10h-10z" fill="#fff"/><path d="m3 3v15h7v-7c0-.554.446-1 1-1h10v-7z" fill="#fff"/><path d="m2 2v1 15c0 .554.446 1 1 1h7v-1h-1-1-5v-3h5 1 1v-1h-1-1-5v-3h5 1 1c0-.554.446-1 1-1h-2-1-5v-3h5 1 2v3h1v-3h8v3h1v-7-1zm1 1h5 1 2v3h-2-1-5zm9 0h8v3h-8z" fill="#808080"/><path d="m3 3h6v3h-6z" fill="#76a797"/><path d="m3 7h5v3h-5z" fill="#e68497"/><path d="m3 11h6v3h-6z" fill="#76a797"/><g fill="#e68497"><path d="m3 15h4v3h-4z"/><path d="m18.498047 12.994141a.50005.50005 0 0 0 -.457031.308593l-.728516 1.697266h-3.8125c-.277 0-.5.223-.5.5s.223.5.5.5h3.384766l-.857422 2h-2.527344c-.277 0-.5.223-.5.5s.223.5.5.5h2.099609l-.558593 1.302734a.50005.50005 0 1 0 .917968.394532l.726563-1.697266h3.814453c.277 0 .5-.223.5-.5s-.223-.5-.5-.5h-3.384766l.857422-2h2.527344c.277 0 .5-.223.5-.5s-.223-.5-.5-.5h-2.099609l.558593-1.302734a.50005.50005 0 0 0 -.460937-.703125z"/><path d="m12 11c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554
0 1-.446 1-1v-10c0-.554-.446-1-1-1zm0 1h10v10h-10z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_copy.svg b/loleaflet/images/lc_copy.svg
index ca07b05cd..f7dc958ce 100644
--- a/loleaflet/images/lc_copy.svg
+++ b/loleaflet/images/lc_copy.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#4d4d4d"
- d="M 5 4 L 5 5 L 5 18 L 6 18 L 8 18 L 9 18 L 9 19 L 9 20 L 15 20 L 19 16 L 19 15 L 19 8 L 19 7 L 17 7 L 17 4 L 16 4 L 6 4 L 5 4 z M 6 5 L 16 5 L 16 7 L 9 7 L 9 8 L 9 17 L 8 17 L 6 17 L 6 5 z M 10 8 L 18 8 L 18 15 L 15 15 L 14 15 L 14 16 L 14 19 L 10 19 L 10 8 z "
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 16h10v-9-1l-3-3h-7z" fill="#fff" fill-rule="evenodd"/><path d="m2.857422 2c-.474857 0-.857422.3825647-.857422.8574219v13.2851561c0 .474857.382565.857422.857422.857422h10.285156c.474857 0 .857422-.382565.857422-.857422v-10.142578l-1-1-2-2-1-1zm .142578 1h6v3.1425781c0 .474857.382565.8574219.857422.8574219h3.142578v9h-10zm7 .4140625 2.585938 2.5859375h-2.585938z" fill="#808080"/><rect fill="#4d82b8" height="1" ry=".5" width="8" x="4" y="13"/><rect fill="#4d82b8" height="1" ry=".5" width="8" x="4" y="10"/><path d="m11 21h10v-9-1l-3-3h-7z" fill="#fff" fill-rule="evenodd"/><path d="m10.857422 7c-.474857 0-.857422.3825647-.857422.8574219v13.2851561c0 .474857.382565.857422.857422.857422h10.285156c.474857 0 .857422-.382565.857422-.857422v-10.142578l-1-1-2-2-1-1zm .142578 1h6v3.142578c0 .474857.382565.857422.857422.857422h3.142578v9h-10zm7 .4140625 2.585938 2.5859375h-2.585938z" fill="#808080"/><rect fill="#4d82b8" heigh
t="1" ry=".5" width="8" x="12" y="18"/><rect fill="#4d82b8" height="1" ry=".5" width="8" x="12" y="15"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_cut.svg b/loleaflet/images/lc_cut.svg
index 4759d9061..be9564dfd 100644
--- a/loleaflet/images/lc_cut.svg
+++ b/loleaflet/images/lc_cut.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#4d4d4d"
- d="M 8.0117188,4 C 7.4343687,5 7.1335875,5 7.7109375,6 l 3.5410155,6.140625 -2.0585936,3.527344 C 8.7481026,15.256516 8.1568615,15 7.5,15 6.115,15 5,16.115 5,17.5 5,18.885 6.115,20 7.5,20 8.885,20 10,18.885 10,17.5 10,17.332897 9.98215,17.169477 9.951172,17.011719 l 1.162109,-2.013672 c 0.780419,-0.01 0.878798,-0.774603 1.333985,-0.785156 l 1.603515,2.78125 C 14.017588,17.157178 14,17.326875 14,17.5 14,18.885 15.115,20 16.5,20 17.885,20 19,18.885 19,17.5 19,16.115 17.885,15 16.5,15 c -0.653333,0 -1.241072,0.254586 -1.685547,0.662109 L 12.759766,12.140625 16.300781,6 C 16.878131,5 16.57735,5 16,4 L 12.005859,10.847656 8.0117188,4 Z M 12,12 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z M 7.5,16 C 8.331,16 9,16.669 9,17.5 9,18.331 8.331,19 7.5,19 6.669,19 6,18.331 6,17.5 6,16.669 6.669,16 7.5,16 Z m 9,0 C 17.331,16 18,16.669 18,17.5 18,18.331 17.331,19 16.5,19 15.669,19 15,18.331 15,17.5 15,16.669 15.669,16 16
.5,16 Z"
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m6.8730469 2c-.7423073 1.25-1.1290259 1.25-.3867188 2.5l4.5527339 7.675781-2.3339839 3.884766a4 4 0 0 1 1.0449219 1.556641l1.109375-1.869141c1.003396-.0125 1.129603-.969231 1.714844-.982422l1.683593 2.835937a4 4 0 0 1 1.044922-1.550781l-2.326172-3.875 4.552735-7.675781c.742308-1.25.355588-1.25-.386719-2.5l-5.134766 8.558594zm5.1269531 10c .356143 0 .642578.27875.642578.625s-.286435.625-.642578.625-.642578-.27875-.642578-.625.286435-.625.642578-.625z" fill="#808080"/><path d="m6 16a3 3 0 0 0 -3 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0 -3-3zm0 1a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2z" fill="#4d82b8"/><path d="m18 16a3 3 0 0 0 -3 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0 -3-3zm0 1a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_flowchartshapes.svg b/loleaflet/images/lc_flowchartshapes.svg
index d7a78f22e..d05bf917a 100644
--- a/loleaflet/images/lc_flowchartshapes.svg
+++ b/loleaflet/images/lc_flowchartshapes.svg
@@ -1,10 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#b3b3b3"
- d="M 5 5 L 5 19 L 19 19 L 19 5 L 5 5 z "
- />
- <path
- style="fill:#4d4d4d"
- d="M 4 4 L 4 5 L 4 20 L 5 20 L 19 20 L 20 20 L 20 5 L 20 4 L 4 4 z M 5 5 L 9 5 L 9 9 L 5 9 L 5 5 z M 10 5 L 19 5 L 19 9 L 10 9 L 10 5 z M 5 10 L 9 10 L 9 19 L 5 19 L 5 10 z M 10 10 L 19 10 L 19 19 L 10 19 L 10 10 z "
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m2.5 2.5v6h6v-6zm8 0v6h11v-6zm-8 8v11h6v-11zm8 0v11h11v-11z" fill="#fff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_formattedfield.svg b/loleaflet/images/lc_formattedfield.svg
index e55353adc..8a1fa05fa 100644
--- a/loleaflet/images/lc_formattedfield.svg
+++ b/loleaflet/images/lc_formattedfield.svg
@@ -1 +1,14 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m12 2v2c-.764653.0481821-1.330955.155961-1.902344.4257812-.5713887.2698205-1.047656.6129768-1.425781 1.0273438s-.6622049.8819758-.8554688 1.4023438c-.1848611.5107314-.2773437 1.0305424-.2773437 1.5605468 0 .7420058.1129689 1.3581504.3398437 1.8496094.2352779.481822.5417969.885252.9199219 1.212891s.8061984.592554 1.2851559.794922c.478959.192727 1.428655.582016 1.916016.726562v5c-.470555-.067456-1.671111-.183836-2.015625-.347656-.3361111-.173456-.6274131-.348029-.8710938-.521485-.2436805-.173456-.449132-.326027-.6171874-.460937-.1596528-.134911-.2931077-.203125-.4023438-.203125-.15125 0-.2780729.03814-.3789062.115234-.1008334.06745-.193316.173813-.2773438.31836l-.4785156.851562c.4789583.597459 1.0715104 1.091105 1.7773437 1.476563.7142362.385458 2.4149899.665483 3.2636719.771484v2h1.287109l-.0061-2.141678c.412864-.01485.718991-.184206 1.000212-.356369.571389-.279457 1.062874-.634719 1.474609-1.068359.411736-.443276.7
2684-.950981.945313-1.519532.226875-.568549.339844-1.178706.339844-1.833984 0-.70346-.121553-1.291486-.365235-1.763672-.235276-.481822-.550381-.87718-.945312-1.185547-.386527-.318002-.823186-.572897-1.310547-.765625-.487362-.202366-.699183-.386961-1.194949-.550781l.02307-4.9140624c.369722.057819.688142.1521993.957031.2871094.277292.1349102.513768.2713397.707031.40625.201667.1349102.369463.2553272.503907.3613281.142848.096364.2644.1445313.365234.1445313.117638 0 .210123-.032154.277344-.099609.07563-.077091.147623-.1753783.214844-.2910156l.50391-.9394536c-.403305-.4625492-.896742-.8478837-1.476534-1.15625-.579793-.308366-1.321509-.4643116-2.027343-.5703125v-2.0429687zm-.02539 3.8710938-.0094 4.5253902c-.294099-.106-.85316-.222383-1.113648-.347656-.252081-.1349108-.474703-.2834455-.667968-.4472655-.1848611-.173456-.3302173-.372112-.4394534-.59375-.1008333-.2312749-.1523437-.4961922-.1523437-.7949219 0-.2890933.0429252-.5620816.1269531-.8222656.092431-.2601839.2311544-.4969826.416016-.7
089844.193264-.2120017.439687-.3865741.742187-.5214844.3025-.1445465.669115-.2408802 1.097657-.2890624zm1.265228 7.4914592c.319305.106.170371.03574.447663.17065.285694.125274.530755.273811.732422.447266.210069.173456.374549.380183.492187.621093.126042.231276.189453.512206.189453.839844.000002.337276-.05678.654395-.166015.953125-.100835.289093-.258092.548023-.476563.779297-.21007.221638-.480885.410269-.808593.564453-.32771.144546-.277275.125517-.382779.144531z" fill="#808080"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path
+ style="fill:#ffffff"
+ d="M 3,6 H 21 V 20 H 3 Z"
+ />
+ <path
+ style="fill:#808080"
+ d="M 2 3 L 2 4 L 2 6 L 2 20 C 2 20.554 2.446 21 3 21 L 21 21 C 21.554 21 22 20.554 22 20 L 22 6 L 22 4 L 22 3 L 21 3 L 3 3 L 2 3 z M 3 6 L 21 6 L 21 20 L 3 20 L 3 6 z M 16.5 7 A 0.5 0.5 0 0 0 16.113281 7.1835938 L 7.1171875 18.177734 A 0.5 0.5 0 1 0 7.9 18.810547 L 16.9 7.8164062 A 0.5 0.5 0 0 0 16.5 7 z M 8 7 A 2 2 0 0 0 6 9 A 2 2 0 0 0 8 11 A 2 2 0 0 0 10 9 A 2 2 0 0 0 8 7 z M 8 8 A 1 1 0 0 1 9 9 A 1 1 0 0 1 8 10 A 1 1 0 0 1 7 9 A 1 1 0 0 1 8 8 z M 16 15 A 2 2 0 0 0 14 17 A 2 2 0 0 0 16 19 A 2 2 0 0 0 18 17 A 2 2 0 0 0 16 15 z M 16 16 A 1 1 0 0 1 17 17 A 1 1 0 0 1 16 18 A 1 1 0 0 1 15 17 A 1 1 0 0 1 16 16 z "
+ />
+ <path
+ style="fill:#4d82b8"
+ d="M 2,3 H 22 V 6 H 2 Z"
+ />
+</svg>
diff --git a/loleaflet/images/lc_fullscreen.svg b/loleaflet/images/lc_fullscreen.svg
index 53c560444..a788d66a9 100644
--- a/loleaflet/images/lc_fullscreen.svg
+++ b/loleaflet/images/lc_fullscreen.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect fill="#4D4D4D" height="20" ry="1" transform="rotate(90)" width="16" x="4" y="-22"/><path d="m5-21h14v18h-14z" fill="#fff" transform="rotate(90)"/><g fill="#4D4D4D" fill-rule="evenodd"><path d="m8.8516862 6.5133237c.1983055.199846.1976726.5223718-.00143.7214422l-3.6151934 3.6142691c-.3063808.30722-.8321661.117235-.8712983-.314836l-.3615198-3.9756962c-.0295972-.3186665.2376535-.5858492.5564018-.5562592l3.9767107.361427c.1197669.011134.2317749.064124.316329.1496531z"/><path d="m15.148318 6.5133247c-.198306.199846-.197673.5223718.0014.7214422l3.61522 3.6142681c.306381.307221.832165.117235.871297-.314836l.36152-3.9756952c.0296-.3186665-.237653-.5858492-.556402-.5562592l-3.976706.361427c-.119767.011134-.231775.064124-.316329.1496531z"/><path d="m8.8516862 17.486676c.1983055-.199846.1976726-.522372-.00143-.721442l-3.6151934-3.614269c-.3063808-.30722-.8321661-.117235-.8712983.314836l-.3615198 3.975696c-.029597.318666.2376535.
585849.5564018.556259l3.9767107-.361427c.1197669-.01113.2317749-.06412.316329-.149653z"/><path d="m15.148318 17.486675c-.198306-.199846-.197673-.522372.0014-.721442l3.61522-3.614268c.306381-.307221.832165-.117235.871297.314836l.36152 3.975695c.0296.318666-.237653.585849-.556402.556259l-3.976706-.361427c-.119767-.01113-.231775-.06412-.316329-.149653z"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect fill="#808080" height="20" ry="1" transform="rotate(90)" width="16" x="4" y="-22"/><path d="m5-21h14v18h-14z" fill="#fff" transform="rotate(90)"/><g fill="#4d82b8" fill-rule="evenodd"><path d="m8.8516862 6.5133237c.1983055.199846.1976726.5223718-.00143.7214422l-3.6151934 3.6142691c-.3063808.30722-.8321661.117235-.8712983-.314836l-.3615198-3.9756962c-.0295972-.3186665.2376535-.5858492.5564018-.5562592l3.9767107.361427c.1197669.011134.2317749.064124.316329.1496531z"/><path d="m15.148318 6.5133247c-.198306.199846-.197673.5223718.0014.7214422l3.61522 3.6142681c.306381.307221.832165.117235.871297-.314836l.36152-3.9756952c.0296-.3186665-.237653-.5858492-.556402-.5562592l-3.976706.361427c-.119767.011134-.231775.064124-.316329.1496531z"/><path d="m8.8516862 17.486676c.1983055-.199846.1976726-.522372-.00143-.721442l-3.6151934-3.614269c-.3063808-.30722-.8321661-.117235-.8712983.314836l-.3615198 3.975696c-.029597.318666.2376535.
585849.5564018.556259l3.9767107-.361427c.1197669-.01113.2317749-.06412.316329-.149653z"/><path d="m15.148318 17.486675c-.198306-.199846-.197673-.522372.0014-.721442l3.61522-3.614268c.306381-.307221.832165-.117235.871297.314836l.36152 3.975695c.0296.318666-.237653.585849-.556402.556259l-3.976706-.361427c-.119767-.01113-.231775-.06412-.316329-.149653z"/></g></svg>
\ No newline at end of file
diff --git a/loleaflet/images/lc_paste.svg b/loleaflet/images/lc_paste.svg
index 91a7c06e9..d20243747 100644
--- a/loleaflet/images/lc_paste.svg
+++ b/loleaflet/images/lc_paste.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path
- style="fill:#4d4d4d"
- d="M 8 4 L 8 6 L 6 6 L 5 6 L 5 20 L 6 20 L 19 20 L 19 19 L 19 6 L 18 6 L 16 6 L 16 4 L 8 4 z M 6 7 L 7 7 L 7 9 L 17 9 L 17 7 L 18 7 L 18 19 L 6 19 L 6 7 z M 8 10 L 8 11 L 16 11 L 16 10 L 8 10 z M 8 13 L 8 14 L 14 14 L 14 13 L 8 13 z M 8 16 L 8 17 L 11 17 L 11 16 L 8 16 z "
- />
- </svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 4c-.554 0-1 .446-1 1v16c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-16c0-.554-.446-1-1-1h-2v3h-10v-3z" fill="#eac282"/><path d="m12 2c-1.1046 0-2 .89543-2 2h-2v2h8v-2h-2c0-.13807-.005-.27605-.03125-.40625-.18649-.91137-1.00215-1.59375-1.96875-1.59375zm0 1c.41421 0 .75444.26608.90625.625.0506.11964.09375.23693.09375.375 0 .55228-.44771 1-1 1s-1-.44772-1-1 .44771-1 1-1z" fill="#808080"/><g transform="translate(-1 6)"><path d="m15 16h8v-6-1l-3-3h-5z" fill="#fff" fill-rule="evenodd"/><path d="m14.857422 5c-.474857 0-.857422.3825647-.857422.8574219v10.2851561c0 .474857.382565.857422.857422.857422h8.285156c.474857 0 .857422-.382565.857422-.857422v-7.142578l-1-1-2-2-1-1zm.142578 1h4v3.1425781c0 .474857.382565.8574219.857422.8574219h3.142578v6h-8zm5 .4140625 2.585938 2.5859375h-2.585938z" fill="#808080"/></g></svg>
\ No newline at end of file
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list