summaryrefslogtreecommitdiff
path: root/sd/res/webview/show.asp
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-11-27 16:10:40 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-11-28 12:48:36 +0000
commit837e2808f7ed0ef7e40f2596a7a1781b52b606a2 (patch)
tree87706132ea2c25c4cd185fb7d83485cca5775ebb /sd/res/webview/show.asp
parent6d2fa52272e3418d1c6baa64e75ee45ad1ff6172 (diff)
re-base on ALv2 code. Includes:
Patches contributed by Armin Le-Grand #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles... http://svn.apache.org/viewvc?view=revision&revision=1293316 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 Patches contributed by Andre Fischer http://svn.apache.org/viewvc?view=revision&revision=1172128 http://svn.apache.org/viewvc?view=revision&revision=1172133 Patch contributed by Ariel Constenla-Haile i#118505# - Remove MN_OLE_OBJECT menu item from Draw/Impress contextmenu - CWS contextmenu1 http://svn.apache.org/viewvc?view=revision&revision=1182915 Patch contributed by Zhang Jian Fang #118876#, Add check if the OutlinerParaObject is created successfully http://svn.apache.org/viewvc?view=revision&revision=1243381 restore a re-based rdbedit.
Diffstat (limited to 'sd/res/webview/show.asp')
-rw-r--r--sd/res/webview/show.asp17
1 files changed, 17 insertions, 0 deletions
diff --git a/sd/res/webview/show.asp b/sd/res/webview/show.asp
index b66103cc6edf..c595167064d8 100644
--- a/sd/res/webview/show.asp
+++ b/sd/res/webview/show.asp
@@ -2,6 +2,23 @@
Option Explicit
Response.Expires = 0
%>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
<!-- #include file = "common.inc" -->