diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 19:49:09 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-13 21:38:47 +0100 |
commit | 2c47c9989e308ddef22066607795eb3feef9f76b (patch) | |
tree | 35a3526c8133d25a502e5cbd01effe180e6b6339 /jvmfwk/source/javasettings.xsd | |
parent | 424d0fedd55699910830a5a342d54b8516b7b5c7 (diff) |
re-base on ALv2 code. Includes:
cws mba34issues01: #i117709#: make sure that parent of error message box is visible
Patch contributed by Mathias Bauer
http://svn.apache.org/viewvc?view=revision&revision=1172346
i#119036 - improve user experience of certification dialog - only shown once
Patch contributed by Oliver-Rainer Wittmann
http://svn.apache.org/viewvc?view=revision&revision=1299727
Diffstat (limited to 'jvmfwk/source/javasettings.xsd')
-rw-r--r-- | jvmfwk/source/javasettings.xsd | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/jvmfwk/source/javasettings.xsd b/jvmfwk/source/javasettings.xsd index 3b3b28f2192e..e0ccbd47e35c 100644 --- a/jvmfwk/source/javasettings.xsd +++ b/jvmfwk/source/javasettings.xsd @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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 . +--> <!-- Document : javasettings.xsd @@ -14,7 +31,7 @@ elementFormDefault="qualified"> <element name="java"> - <complexType> + <complexType> <sequence> <element name="enabled" nillable="true" default="true" type="boolean"/> <element name="userClassPath" nillable="true" type="string"/> @@ -24,7 +41,7 @@ </sequence> </complexType> -</element> +</element> <complexType name="javaInfoType"> <sequence> @@ -36,8 +53,7 @@ <element name="vendorData" type="base64Binary"/> </sequence> <attribute name="vendorUpdate" type="date"/> -</complexType> - +</complexType> <complexType name="vmParametersType"> <sequence> |