diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-27 16:10:40 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-28 12:48:36 +0000 |
| commit | 837e2808f7ed0ef7e40f2596a7a1781b52b606a2 (patch) | |
| tree | 87706132ea2c25c4cd185fb7d83485cca5775ebb /sd/res | |
| parent | 6d2fa52272e3418d1c6baa64e75ee45ad1ff6172 (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')
| -rw-r--r-- | sd/res/webview/edit.asp | 17 | ||||
| -rw-r--r-- | sd/res/webview/edit.pl | 2 | ||||
| -rw-r--r-- | sd/res/webview/editpic.asp | 17 | ||||
| -rw-r--r-- | sd/res/webview/index.pl | 2 | ||||
| -rw-r--r-- | sd/res/webview/poll.asp | 17 | ||||
| -rw-r--r-- | sd/res/webview/savepic.asp | 17 | ||||
| -rw-r--r-- | sd/res/webview/show.asp | 17 | ||||
| -rw-r--r-- | sd/res/webview/webview.asp | 17 |
8 files changed, 104 insertions, 2 deletions
diff --git a/sd/res/webview/edit.asp b/sd/res/webview/edit.asp index 654a441fe357..6d5f7291adbc 100644 --- a/sd/res/webview/edit.asp +++ b/sd/res/webview/edit.asp @@ -1,4 +1,21 @@ <HTML> +<!-- + * 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 . +--> <HEAD> <TITLE>$$1</TITLE> </HEAD> diff --git a/sd/res/webview/edit.pl b/sd/res/webview/edit.pl index e1888f7fef3e..bdde80c2c98f 100644 --- a/sd/res/webview/edit.pl +++ b/sd/res/webview/edit.pl @@ -15,4 +15,4 @@ <BODY BGCOLOR="white"> <META HTTP-EQUIV="-REFRESH" CONTENT="1;URL=$$3show.pl"> </BODY> -</HTML>
\ No newline at end of file +</HTML> diff --git a/sd/res/webview/editpic.asp b/sd/res/webview/editpic.asp index 34a4a51e4473..78599e0fd00f 100644 --- a/sd/res/webview/editpic.asp +++ b/sd/res/webview/editpic.asp @@ -3,6 +3,23 @@ Response.Expires = 0 Response.Buffer = True %> +<!-- + * 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" --> diff --git a/sd/res/webview/index.pl b/sd/res/webview/index.pl index 1fb265f54092..e0198e6d3a97 100644 --- a/sd/res/webview/index.pl +++ b/sd/res/webview/index.pl @@ -14,4 +14,4 @@ <META HTTP-EQUIV="-REFRESH" CONTENT="1;URL=$$3webcast.pl"> </BODY>; -</HTML>
\ No newline at end of file +</HTML> diff --git a/sd/res/webview/poll.asp b/sd/res/webview/poll.asp index dd1a9bfe0022..0bbce4338ec4 100644 --- a/sd/res/webview/poll.asp +++ b/sd/res/webview/poll.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" --> diff --git a/sd/res/webview/savepic.asp b/sd/res/webview/savepic.asp index 71adefc4f391..9a9f32cd158c 100644 --- a/sd/res/webview/savepic.asp +++ b/sd/res/webview/savepic.asp @@ -3,6 +3,23 @@ Response.Expires = 0 Response.Buffer = True %> +<!-- + * 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" --> 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" --> diff --git a/sd/res/webview/webview.asp b/sd/res/webview/webview.asp index f3c3af760eda..f084fc2dfc33 100644 --- a/sd/res/webview/webview.asp +++ b/sd/res/webview/webview.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" --> |