summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cli_ure/version/version.txt24
-rw-r--r--offapi/com/sun/star/deployment/LicenseException.idl8
-rw-r--r--offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl7
-rw-r--r--unoil/climaker/version.txt6
4 files changed, 30 insertions, 15 deletions
diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index 4676c40d4..ce7e67042 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -29,23 +29,23 @@
#
#*************************************************************************
-CLI_URETYPES_NEW_VERSION=1.0.4.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.3.0
-CLI_URETYPES_POLICY_VERSION=4.0.0.0
+CLI_URETYPES_NEW_VERSION=1.0.6.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.5.0
+CLI_URETYPES_POLICY_VERSION=6.0.0.0
CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
-CLI_BASETYPES_NEW_VERSION=1.0.15.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.14.0
-CLI_BASETYPES_POLICY_VERSION=15.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.17.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.16.0
+CLI_BASETYPES_POLICY_VERSION=17.0.0.0
CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
-CLI_URE_NEW_VERSION=1.0.18.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.17.0
-CLI_URE_POLICY_VERSION=18.0.0.0
+CLI_URE_NEW_VERSION=1.0.20.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.19.0
+CLI_URE_POLICY_VERSION=20.0.0.0
CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
-CLI_CPPUHELPER_NEW_VERSION=1.0.18.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.17.0
-CLI_CPPUHELPER_POLICY_VERSION=18.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.20.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.19.0
+CLI_CPPUHELPER_POLICY_VERSION=20.0.0.0
CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
diff --git a/offapi/com/sun/star/deployment/LicenseException.idl b/offapi/com/sun/star/deployment/LicenseException.idl
index 4ab9bfae0..aa681e64e 100644
--- a/offapi/com/sun/star/deployment/LicenseException.idl
+++ b/offapi/com/sun/star/deployment/LicenseException.idl
@@ -50,6 +50,14 @@ exception LicenseException : com::sun::star::uno::Exception
/** contains the text of the license.
*/
string Text;
+
+ /** indicates if the user can prevent to show the license
+
+ Represents the attribute value
+ /description/registration/simple-license/@suppress-if-required
+ from the description.xml
+ */
+ boolean SuppressIfRequired;
};
}; }; }; };
diff --git a/offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl b/offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl
index 5052a1aac..2d00dfb6a 100644
--- a/offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl
+++ b/offapi/com/sun/star/deployment/LicenseIndividualAgreementException.idl
@@ -48,6 +48,13 @@ exception LicenseIndividualAgreementException : com::sun::star::uno::Exception
Contains the file name only.
*/
string ExtensionName;
+ /** indicates if the user can prevent to show the license
+
+ Represents the attribute value
+ /description/registration/simple-license/@suppress-if-required
+ from the description.xml
+ */
+ boolean SuppressIfRequired;
};
}; }; }; };
diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt
index 4824a36ed..275e3776f 100644
--- a/unoil/climaker/version.txt
+++ b/unoil/climaker/version.txt
@@ -29,8 +29,8 @@
#
#*************************************************************************
-CLI_OOOTYPES_NEW_VERSION=1.0.4.0
-CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.3.0
-CLI_OOOTYPES_POLICY_VERSION=4.0.0.0
+CLI_OOOTYPES_NEW_VERSION=1.0.6.0
+CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.5.0
+CLI_OOOTYPES_POLICY_VERSION=6.0.0.0
CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes