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

10 files changed, 10 insertions, 10 deletions

diff --git a/offapi/com/sun/star/sdb/DatabaseContext.idl b/offapi/com/sun/star/sdb/DatabaseContext.idl
index d2e660058e70..ac990e02c709 100644
--- a/offapi/com/sun/star/sdb/DatabaseContext.idl
+++ b/offapi/com/sun/star/sdb/DatabaseContext.idl
@@ -96,7 +96,7 @@ published service DatabaseContext
         are maintained, so if possible at all, you should use this interface, instead of modifying or
         querying the configuration data directly.</p>
 
-        @since OpenOffice.org 3.3
+        @since OOo 3.3
     */
     [optional] interface XDatabaseRegistrations;
 };
diff --git a/offapi/com/sun/star/sdb/DatabaseDocument.idl b/offapi/com/sun/star/sdb/DatabaseDocument.idl
index b7a626579ec5..6690c2929de4 100644
--- a/offapi/com/sun/star/sdb/DatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/DatabaseDocument.idl
@@ -43,7 +43,7 @@
  module com {  module sun {  module star {  module sdb {
 
 /** specifies a link to a document associated with a database document
-    @since OOo 2.0.0
+    @since OOo 2.0
     @deprecated
  */
 published service DatabaseDocument
diff --git a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
index f3a90b4f467f..a2a579fc47ac 100644
--- a/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
+++ b/offapi/com/sun/star/sdb/DocumentSaveRequest.idl
@@ -44,7 +44,7 @@
     <p>
     Usually thrown if someone tries to save a document which hasn't a name yet.
     </p>
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 exception DocumentSaveRequest: com::sun::star::task::ClassifiedInteractionRequest
 {
diff --git a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
index f619222be8a1..b01809802b2c 100644
--- a/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
+++ b/offapi/com/sun/star/sdb/OfficeDatabaseDocument.idl
@@ -63,7 +63,7 @@ module com {  module sun {  module star {  module sdb {
 
     @see com::sun::star::sdb::XOfficeDatabaseDocument
     @see com::sun::star::document::OfficeDocument
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 service OfficeDatabaseDocument
 {
diff --git a/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl b/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
index 81f878d2441d..8151e7e22de9 100644
--- a/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseRegistrations.idl
@@ -47,7 +47,7 @@ interface XDatabaseRegistrationsListener;
     if possible at all, use this interface, instead of modifying or querying the configuration
     data directly.</p>
 
-    @since OpenOffice.org 3.3
+    @since OOo 3.3
  */
 interface XDatabaseRegistrations
 {
diff --git a/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl b/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
index 57135f8de012..9ba6c6e6df9a 100644
--- a/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
+++ b/offapi/com/sun/star/sdb/XDatabaseRegistrationsListener.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module sdb {
 
     @see XDatabaseRegistrations
 
-    @since OpenOffice.org 3.3
+    @since OOo 3.3
  */
 interface XDatabaseRegistrationsListener : ::com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
index e4de2af39d98..4d89d66a6ca4 100644
--- a/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
+++ b/offapi/com/sun/star/sdb/XInteractionDocumentSave.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module sdb {
     This continuation is typically used in conjunction with a
     <type scope="com::sun::star::sdb">DocumentSaveRequest</type>.
     </p>
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 interface XInteractionDocumentSave: com::sun::star::task::XInteractionContinuation
 {
diff --git a/offapi/com/sun/star/sdb/application/DatabaseObject.idl b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
index 3239d69a58f4..46f9f95a7500 100644
--- a/offapi/com/sun/star/sdb/application/DatabaseObject.idl
+++ b/offapi/com/sun/star/sdb/application/DatabaseObject.idl
@@ -40,7 +40,7 @@ module com { module sun { module star { module sdb { module application {
 
 /** denotes different objects within a database document
 
-    @since OOo 2.2.0
+    @since OOo 2.2
 
     @see DatabaseObjectContainer
  */
diff --git a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
index c0ad40f97db9..aef6d49dff40 100644
--- a/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
+++ b/offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
@@ -52,7 +52,7 @@ module com { module sun { module star { module sdb { module application {
     @see com::sun::star::frame::Controller
     @see com::sun::star::sdb::DatabaseDocument
 
-    @since OOo 2.2.0
+    @since OOo 2.2
  */
 interface XDatabaseDocumentUI
 {
diff --git a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
index e93df6429684..9c0c7bca28f4 100644
--- a/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
+++ b/offapi/com/sun/star/sdb/application/XTableUIProvider.idl
@@ -45,7 +45,7 @@ interface XDatabaseDocumentUI;
 
     @see com::sun::star::sdb::Connection
 
-    @since OOo 2.2.0
+    @since OOo 2.2
  */
 interface XTableUIProvider
 {