[Libreoffice-commits] online.git: loleaflet/html wsd/FileServer.cpp wsd/FileServer.hpp
Michael Meeks (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jan 16 16:21:56 UTC 2020
loleaflet/html/clipboard.html | 236 ------------------------------------------
wsd/FileServer.cpp | 28 ----
wsd/FileServer.hpp | 2
3 files changed, 5 insertions(+), 261 deletions(-)
New commits:
commit 1c754d5b113c3bcb96139b4854c789df9b8ca351
Author: Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Jan 15 12:34:50 2020 +0000
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Jan 16 17:21:38 2020 +0100
Revert "Serve a decidedly unpretty clipboard download page"
This reverts parts of commit da455c486a5cce661cac2e214374836b2096eccc.
Unfinished; also stream size calculation cannot have worked.
Change-Id: I39635fe5165b82dd36095d58cfefff4920ce3a35
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86845
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/loleaflet/html/clipboard.html b/loleaflet/html/clipboard.html
deleted file mode 100644
index 6d4f31985..000000000
--- a/loleaflet/html/clipboard.html
+++ /dev/null
@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<!-- saved from url=(0054)http://leafletjs.com/examples/quick-start-example.html -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Online Editor</title>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/select2.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/w2ui-1.5.rc1.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/leaflet.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/selectionMarkers.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/loleaflet.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/toolbar.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/partsPreviewControl.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/sidebar.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/scrollBar.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/searchControl.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/spreadsheet.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/editor.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/jquery.mCustomScrollbar.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/leaflet.draw.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/jquery.contextMenu.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/vex.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/vex-theme-plain.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/vex-theme-bottom-right-corner.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/sm-core-css.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/sm-simple.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/menubar.css" />
-<link rel="stylesheet" href="%SERVICE_ROOT%/loleaflet/%VERSION%/jquery-ui.css" />
-<!--%BRANDING_CSS%--> <!-- add your logo here -->
-<link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/uno-localizations-override.json" type="application/vnd.oftn.l10n+json"/>
-<link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
-<link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/locore-localizations.json" type="application/vnd.oftn.l10n+json" />
-<link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/>
-<link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json" />
-<style>
- /* FIXME: Move to .css */
- body {
- background-color: powderblue;
- }
- #clipboard-formats {
- width: 50%;
- }
- #clipboard-formats-row {
- text-align: center
- }
- </style>
-</head>
-
- <body style="user-select: none;">
- <table id="clipboard-formats" align="center" cellpadding=10>
- <tr>
- <th id="clipboard-formats-header">
- When copying larger pieces of your document to share them with other applications on your device,
- for security reasons, please select the button below to copy the downloaded data to your clipboard
- in your format of choice.
- </th>
- </tr>
- %CLIPBOARD_LINKS%
- </table>
-
- <!--%BRANDING_JS%--> <!-- logo onclick handler -->
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/hammerjs/hammer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/jquery/dist/jquery.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/jquery-mousewheel/jquery.mousewheel.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/jquery-contextmenu/dist/jquery.contextMenu.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/jquery-ui/jquery-ui.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/smartmenus/dist/jquery.smartmenus.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/timeago/jquery.timeago.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/timeago.js/dist/timeago.min.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/timeago.js/dist/timeago.locales.min.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/autolinker/dist/Autolinker.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/json-js/json2.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/l10n-for-node/l10n.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/select2/dist/js/select2.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/vex-js/js/vex.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/vex-js/js/vex.dialog.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/node_modules/@braintree/sanitize-url/dist.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/Leaflet.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/errormessages.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/unocommands.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/core/Log.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/core/Util.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/core/LOUtil.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/core/Class.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/core/Events.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/core/Socket.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/core/Browser.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geometry/Point.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geometry/Bounds.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geometry/Transformation.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/DomUtil.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/LatLng.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/LatLngBounds.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/projection/Projection.LonLat.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/projection/Projection.SphericalMercator.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/crs/CRS.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/crs/CRS.Simple.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/crs/CRS.Earth.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/crs/CRS.EPSG3857.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/crs/CRS.EPSG4326.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/Map.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/Layer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/projection/Projection.Mercator.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geo/crs/CRS.EPSG3395.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/tile/GridLayer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/tile/TileLayer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/ObjectFocusDarkOverlay.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/tile/TileLayer.WMS.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/tile/WriterTileLayer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/tile/ImpressTileLayer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/tile/CalcTileLayer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/ImageOverlay.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/ProgressOverlay.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/TextInput.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/Icon.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/Icon.Default.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/Marker.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/Cursor.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/DivIcon.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/Popup.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/Layer.Popup.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/Marker.Popup.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/LayerGroup.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/FeatureGroup.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/Renderer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/Path.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/Path.Popup.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geometry/LineUtil.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/Polyline.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/geometry/PolyUtil.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/Polygon.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/Rectangle.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/SVGGroup.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/CircleMarker.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/Circle.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/SVG.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/SVG.VML.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/vector/Canvas.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/GeoJSON.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/DomEvent.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/Draggable.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/core/Handler.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.Drag.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.Scroll.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.DoubleClickZoom.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/DomEvent.DoubleTap.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/DomEvent.Pointer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.TouchGesture.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.BoxZoom.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.Keyboard.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/DomEvent.MultiClick.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.Mouse.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.Print.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.SlideShow.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.FileInserter.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.StateChanges.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/handler/Map.WOPI.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/Marker.Drag.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.PartsPreview.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Header.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.ColumnHeader.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.MobileInput.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.ContextToolbar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.RowHeader.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.DocumentRepair.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.ContextMenu.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Menubar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/DomEvent.LongTap.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Tabs.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Permission.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Selection.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Scroll.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.LokDialog.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.AlertDialog.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Infobar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Attribution.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Scale.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Layers.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Search.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Permission.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Toolbar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Parts.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Scroll.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Styles.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Ruler.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/PosAnimation.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/anim/Map.PanAnimation.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/dom/PosAnimation.Timer.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/anim/Map.ZoomAnimation.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/anim/Map.FlyTo.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/map/ext/Map.Geolocation.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/AnnotationManager.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/control/Control.Scroll.Annotation.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/Annotation.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/src/layer/marker/DivOverlay.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/Leaflet.draw.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/draw/handler/Draw.Feature.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/draw/handler/Draw.Polyline.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/draw/handler/Draw.Polygon.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/draw/handler/Draw.SimpleShape.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/draw/handler/Draw.Rectangle.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/draw/handler/Draw.Circle.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/draw/handler/Draw.Marker.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/edit/handler/Edit.Marker.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/edit/handler/Edit.Poly.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/edit/handler/Edit.SimpleShape.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/edit/handler/Edit.Rectangle.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/edit/handler/Edit.Circle.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/ext/LatLngUtil.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/ext/GeometryUtil.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/ext/LineUtil.Intersect.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/ext/Polyline.Intersect.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/ext/Polygon.Intersect.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/Control.Draw.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/Toolbar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/Tooltip.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/draw/DrawToolbar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/edit/EditToolbar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/edit/handler/EditToolbar.Edit.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/draw-0.2.4/src/edit/handler/EditToolbar.Delete.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/path-transform/src/SVG.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/path-transform/src/SVG.VML.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/path-transform/src/Canvas.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/path-transform/src/Path.Drag.Transform.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/path-transform/src/Path.Drag.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/path-transform/src/Util.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/path-transform/src/Matrix.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/plugins/path-transform/src/Path.Transform.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/jquery.mCustomScrollbar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/w2ui-1.5.rc1.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/locale.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/toolbar.js" defer></script>
- <script src="%SERVICE_ROOT%/loleaflet/%VERSION%/main.js" defer></script>
-</body></html>
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 07ac439b3..95bd54f90 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -305,9 +305,9 @@ void FileServerRequestHandler::handleRequest(const HTTPRequest& request, Poco::M
throw Poco::FileNotFoundException("Invalid URI request: [" + requestUri.toString() + "].");
const std::string loleafletHtml = config.getString("loleaflet_html", "loleaflet.html");
- if (endPoint == loleafletHtml || endPoint == "clipboard.html")
+ if (endPoint == loleafletHtml)
{
- preprocessFile(request, message, socket, endPoint);
+ preprocessFile(request, message, socket);
return;
}
@@ -588,7 +588,7 @@ constexpr char BRANDING_UNSUPPORTED[] = "branding-unsupported";
#endif
void FileServerRequestHandler::preprocessFile(const HTTPRequest& request, Poco::MemoryInputStream& message,
- const std::shared_ptr<StreamSocket>& socket, const std::string& endPoint)
+ const std::shared_ptr<StreamSocket>& socket)
{
const auto host = ((LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination()) ? "wss://" : "ws://")
+ (LOOLWSD::ServerName.empty() ? request.getHost() : LOOLWSD::ServerName);
@@ -828,27 +828,7 @@ void FileServerRequestHandler::preprocessFile(const HTTPRequest& request, Poco::
oss << "\r\n"
<< preprocess;
- if (endPoint == "clipboard.html")
- {
- // Handle the clipboard request.
- //FIXME: the request should contain the key to the document.
- //FIXME: get the formats and list the links in the result.
- // for (each format)
- std::ostringstream ossClipboard;
- ossClipboard <<
- "<tr>"
- " <td id=\"clipboard-formats-row\">"
- " <a href=\"downloadhtml\">Copy as HTML</a>"
- " </td>"
- "</tr>";
-
- preprocess = oss.str();
- Poco::replaceInPlace(preprocess, std::string("%CLIPBOARD_LINKS%"), ossClipboard.str());
- oss.str(preprocess);
- }
-
- preprocess = oss.str();
- socket->send(preprocess);
+ socket->send(oss.str());
LOG_DBG("Sent file: " << relPath << ": " << preprocess);
}
diff --git a/wsd/FileServer.hpp b/wsd/FileServer.hpp
index f71207243..097208e21 100644
--- a/wsd/FileServer.hpp
+++ b/wsd/FileServer.hpp
@@ -21,7 +21,7 @@ class FileServerRequestHandler
static std::string getRequestPathname(const Poco::Net::HTTPRequest& request);
static void preprocessFile(const Poco::Net::HTTPRequest& request, Poco::MemoryInputStream& message,
- const std::shared_ptr<StreamSocket>& socket, const std::string& endPoint);
+ const std::shared_ptr<StreamSocket>& socket);
static void preprocessAdminFile(const Poco::Net::HTTPRequest& request, const std::shared_ptr<StreamSocket>& socket);
public:
/// Evaluate if the cookie exists, and if not, ask for the credentials.
More information about the Libreoffice-commits
mailing list