Merge commit 'ooo/DEV300_m103'

Conflicts:
codemaker/source/bonobowrappermaker/corbaoptions.cxx
codemaker/source/cppumaker/cppuoptions.cxx
codemaker/source/cunomaker/cunooptions.cxx
codemaker/source/idlmaker/idloptions.cxx
codemaker/source/javamaker/javaoptions.cxx
cppu/source/typelib/typelib.cxx
idlc/source/options.cxx
offapi/com/sun/star/util/PathSubstitution.idl
offapi/drafts/com/sun/star/form/ListEntryEvent.idl
offapi/drafts/com/sun/star/form/XBindableValue.idl
offapi/drafts/com/sun/star/form/XListEntryListener.idl
offapi/drafts/com/sun/star/form/XListEntrySink.idl
offapi/drafts/com/sun/star/form/XListEntrySource.idl
offapi/drafts/com/sun/star/form/XValueBinding.idl
registry/tools/checksingleton.cxx
registry/tools/options.hxx
registry/tools/regcompare.cxx
registry/tools/regmerge.cxx
sal/cppunittester/cppunittester.cxx
sal/osl/unx/socket.c
sal/osl/w32/diagnose.c
sal/prj/d.lst
sal/rtl/source/alloc_fini.cxx
sal/rtl/source/alloc_global.c
sal/rtl/source/makefile.mk

15 files changed, 16 insertions, 16 deletions

diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl
index 3c07d803a48a..fd40cf0e8aec 100644
--- a/offapi/com/sun/star/deployment/DeploymentException.idl
+++ b/offapi/com/sun/star/deployment/DeploymentException.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module deployment {
 
 /** A DeploymentException reflects a deployment error.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 exception DeploymentException : com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/deployment/ExtensionManager.idl b/offapi/com/sun/star/deployment/ExtensionManager.idl
index 1911ce04dd81..4494da1a9d0f 100644
--- a/offapi/com/sun/star/deployment/ExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/ExtensionManager.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module deployment {
     /singletons/com.sun.star.deployment.ExtensionManager
     </code>.
 
-    @since OOo 3.3.0
+    @since OOo 3.3
 */
 singleton ExtensionManager : XExtensionManager;
 
diff --git a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
index 1cd400e248d6..0d0e06c96977 100644
--- a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
+++ b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
@@ -39,7 +39,7 @@ interface XPackage;
    because the extension was removed. <member>XPackage::isRemoved</member> will
    return true on that object.
 
-   @since OOo 3.3.0
+   @since OOo 3.3
 */
 exception ExtensionRemovedException: com::sun::star::uno::Exception {
 
diff --git a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
index 461005c20b5f..a67ab9b66190 100644
--- a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
+++ b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
@@ -39,7 +39,7 @@ interface XPackage;
    called with a different value for the <code>removed</code> parameter and that
    the <type>XPackage</type> object created by that call still exist.
 
-   @since OOo 3.3.0
+   @since OOo 3.3
 */
 exception InvalidRemovedParameterException: com::sun::star::uno::Exception {
     /** the value of the <code>removed</code> parameter which was used in
diff --git a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
index 0ac85465284b..ee76030eb54b 100644
--- a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
+++ b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module deployment {
     are related to a <type>XPackageManager</type> instance.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 service PackageRegistryBackend : XPackageRegistry
 {
diff --git a/offapi/com/sun/star/deployment/PlatformException.idl b/offapi/com/sun/star/deployment/PlatformException.idl
index fca14c2f2c6a..c67b204a59fb 100644
--- a/offapi/com/sun/star/deployment/PlatformException.idl
+++ b/offapi/com/sun/star/deployment/PlatformException.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module deployment {
 /** A DeploymentException indicates that the current platform
     is not supported.
 
-    @since OOo 3.0.0
+    @since OOo 3.0
  */
 exception PlatformException : com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
index 991e4b476db7..333fb1a06b49 100644
--- a/offapi/com/sun/star/deployment/XExtensionManager.idl
+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module deployment {
     in the user, shared and bundled repository.
 
     @see ExtensionManager
-    @since OOo 3.3.0
+    @since OOo 3.3
 */
 interface XExtensionManager
 {
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index a87708596943..d1f2b6b72d31 100755
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module deployment {
 /** Objects of this interface reflect a bound package and are issued by a
     <type>PackageRegistryBackend</type>.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 interface XPackage
 {
@@ -100,7 +100,7 @@ interface XPackage
         After updating the OpenOffice.org, some dependencies for packages might
         no longer be satisfied.
 
-        @since OOo 3.2.0
+        @since OOo 3.2
 
         @param xCmdEnv
                command environment for error handling and other interaction.
diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index 463c09efe4a7..06a643c54800 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -67,7 +67,7 @@ module com { module sun { module star { module deployment {
     </p>
 
     @see thePackageManagerFactory
-    @since OOo 2.0.0
+    @since OOo 2.0
     @deprecated
          Use <type>XExtensionManager</type>.
 */
diff --git a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
index 4b5b7183ba47..f7e67543f4cd 100644
--- a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl
@@ -44,7 +44,7 @@ module com { module sun { module star { module deployment {
     exclusively.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
     @deprecated
     Use <type>XExtensionManager</type>.
 */
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index 98501de6c6fa..0c380a96924c 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module deployment {
 
 /** Interface to bind an UNO package.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 interface XPackageRegistry
 {
diff --git a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
index 7252f73d200b..9ba54160ade9 100644
--- a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
+++ b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl
@@ -35,7 +35,7 @@ module com { module sun { module star { module deployment {
 
 /** Objects of this interface provide information about a package's type.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 interface XPackageTypeInfo
 {
diff --git a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
index 85e95acea598..a0fbd4a35b7a 100644
--- a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
+++ b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl
@@ -42,7 +42,7 @@ module com { module sun { module star { module deployment {
     </code>.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
     @deprecated
         Use <type>XExtensionManager</type>.
 */
diff --git a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
index 8c9b6374e581..19b3075509ac 100644
--- a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module deployment { module ui {
     packages of the user and shared installation as well as currently open
     documents.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 service PackageManagerDialog : com::sun::star::ui::dialogs::XAsynchronousExecutableDialog
 {
diff --git a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
index 35b314b74f92..6e475539bab9 100644
--- a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
+++ b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module deployment { module ui {
 
 /** The <type>UpdateRequiredDialog</type> is used to show a list of extensions not compatible with this office version.
 
-    @since OOo 3.2.0
+    @since OOo 3.2
 */
 service UpdateRequiredDialog : com::sun::star::ui::dialogs::XExecutableDialog
 {