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

9 files changed, 10 insertions, 10 deletions

diff --git a/offapi/com/sun/star/configuration/DefaultProvider.idl b/offapi/com/sun/star/configuration/DefaultProvider.idl
index b41bdeec33a5..0fc09a078acc 100644
--- a/offapi/com/sun/star/configuration/DefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/DefaultProvider.idl
@@ -78,14 +78,14 @@ published service DefaultProvider
 
     /** Enable setting/getting locale for Provider
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
 
     [optional] interface com::sun::star::lang::XLocalizable;
 
     /** Property to enable/disable asynchronous write-back from in-memory cache to backend(s)
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
 
     [optional,property] boolean EnableAsync;
diff --git a/offapi/com/sun/star/configuration/Update.idl b/offapi/com/sun/star/configuration/Update.idl
index 790a4bb40235..8cd52a1c1a77 100644
--- a/offapi/com/sun/star/configuration/Update.idl
+++ b/offapi/com/sun/star/configuration/Update.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module configuration {
 
    <p>This singleton is unpublished and unstable.</p>
 
-   @since OOo 3.3.0
+   @since OOo 3.3
 */
 singleton Update: XUpdate;
 
diff --git a/offapi/com/sun/star/configuration/XUpdate.idl b/offapi/com/sun/star/configuration/XUpdate.idl
index c3316ea5dc45..16455528fc48 100644
--- a/offapi/com/sun/star/configuration/XUpdate.idl
+++ b/offapi/com/sun/star/configuration/XUpdate.idl
@@ -36,7 +36,7 @@ module com { module sun { module star { module configuration {
 
    <p>This interface is unpublished and unstable.</p>
 
-   @since OOo 3.3.0
+   @since OOo 3.3
 */
 interface XUpdate {
     void insertExtensionXcsFile([in] boolean shared, [in] string fileUri);
diff --git a/offapi/com/sun/star/configuration/backend/InteractionHandler.idl b/offapi/com/sun/star/configuration/backend/InteractionHandler.idl
index 82a3595a6b08..108a3e0484c3 100644
--- a/offapi/com/sun/star/configuration/backend/InteractionHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/InteractionHandler.idl
@@ -67,7 +67,7 @@ module com { module sun { module star { module configuration { module backend {
         <LI>Approve, Disapprove, Abort</LI>
     </UL></P>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 
     @see com::sun::star::task::InteractionHandler
  */
diff --git a/offapi/com/sun/star/configuration/backend/Layer.idl b/offapi/com/sun/star/configuration/backend/Layer.idl
index 8b9429810b15..545bddad641e 100644
--- a/offapi/com/sun/star/configuration/backend/Layer.idl
+++ b/offapi/com/sun/star/configuration/backend/Layer.idl
@@ -102,7 +102,7 @@ published service Layer
     /**
       The URL of the layer data.
 
-      @since OOo 2.0.0
+      @since OOo 2.0
       */
     [property,optional,readonly] string URL ;
 
diff --git a/offapi/com/sun/star/configuration/backend/LayerFilter.idl b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
index ec5a209aa8ac..357b5ba6b2e7 100644
--- a/offapi/com/sun/star/configuration/backend/LayerFilter.idl
+++ b/offapi/com/sun/star/configuration/backend/LayerFilter.idl
@@ -54,7 +54,7 @@ module com { module sun { module star { module configuration { module backend {
   @see com::sun::star::configuration::backend::DataImporter
         Service that supports applying a <type>LayerFilter</type> to imported data.
 
-  @since OOo 2.0.0
+  @since OOo 2.0
   */
 published service LayerFilter
 {
diff --git a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
index 34b1c0ccfb56..d5decc5d0907 100644
--- a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module configuration { module backend {
 /** is passed to an <type>InteractionHandler<type> when merging fails due to
     invalid layer data or access problems.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 exception MergeRecoveryRequest: ::com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/configuration/backend/Schema.idl b/offapi/com/sun/star/configuration/backend/Schema.idl
index 75d0237780fd..e5d8c55a6d15 100644
--- a/offapi/com/sun/star/configuration/backend/Schema.idl
+++ b/offapi/com/sun/star/configuration/backend/Schema.idl
@@ -72,7 +72,7 @@ published service Schema
     /**
       The URL of the layer data.
 
-      @since OOo 2.0.0
+      @since OOo 2.0
       */
     [property,optional,readonly] string URL ;
 
diff --git a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
index f425118de937..825c81a254ef 100644
--- a/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
+++ b/offapi/com/sun/star/configuration/backend/StratumCreationException.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module configuration { module backend {
 
 /** is passed to an <type>InteractionHandler<type> when creating a stratum backend fails.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 exception StratumCreationException : BackendSetupException
 {