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

29 files changed, 29 insertions, 29 deletions

diff --git a/offapi/com/sun/star/frame/CommandGroup.idl b/offapi/com/sun/star/frame/CommandGroup.idl
index 21b47df9a522..bb2d30d502b2 100644
--- a/offapi/com/sun/star/frame/CommandGroup.idl
+++ b/offapi/com/sun/star/frame/CommandGroup.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module frame {
     @see XDispatchInformationProvider
     @see Controller
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 published constants CommandGroup
 {
diff --git a/offapi/com/sun/star/frame/DispatchInformation.idl b/offapi/com/sun/star/frame/DispatchInformation.idl
index 49789f003b8a..861699f018e7 100644
--- a/offapi/com/sun/star/frame/DispatchInformation.idl
+++ b/offapi/com/sun/star/frame/DispatchInformation.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module frame {
     @see XDispatchInformationProvider
     @see Controller
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 published struct DispatchInformation
 {
diff --git a/offapi/com/sun/star/frame/Frame.idl b/offapi/com/sun/star/frame/Frame.idl
index c9b9041230bd..8c7a480e71d0 100644
--- a/offapi/com/sun/star/frame/Frame.idl
+++ b/offapi/com/sun/star/frame/Frame.idl
@@ -127,7 +127,7 @@ published service Frame
     //-------------------------------------------------------------------------
     /** provides information about supported commands
 
-        @since OOo 2.0.0
+        @since OOo 2.0
     */
     [optional] interface XDispatchInformationProvider;
 
diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl
index 7a2f25f39d20..e54df74e59d3 100644
--- a/offapi/com/sun/star/frame/LayoutManager.idl
+++ b/offapi/com/sun/star/frame/LayoutManager.idl
@@ -72,7 +72,7 @@
     the size and position of those user interface elements.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 
 service LayoutManager
diff --git a/offapi/com/sun/star/frame/LayoutManagerEvents.idl b/offapi/com/sun/star/frame/LayoutManagerEvents.idl
index 8a7bafcf9880..3a41716d9b61 100644
--- a/offapi/com/sun/star/frame/LayoutManagerEvents.idl
+++ b/offapi/com/sun/star/frame/LayoutManagerEvents.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module frame {
     @see com::sun::star::frame::LayoutManager
     @see com::sun::star::frame::XLayoutManagerEventBroadcaster
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 constants LayoutManagerEvents
 {
diff --git a/offapi/com/sun/star/frame/ModuleManager.idl b/offapi/com/sun/star/frame/ModuleManager.idl
index fd687688074e..ab8bff22d72e 100644
--- a/offapi/com/sun/star/frame/ModuleManager.idl
+++ b/offapi/com/sun/star/frame/ModuleManager.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module frame {
     of office modules.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 
 service ModuleManager
diff --git a/offapi/com/sun/star/frame/PopupMenuController.idl b/offapi/com/sun/star/frame/PopupMenuController.idl
index 04ba675f1974..1c2cf9381b38 100644
--- a/offapi/com/sun/star/frame/PopupMenuController.idl
+++ b/offapi/com/sun/star/frame/PopupMenuController.idl
@@ -65,7 +65,7 @@ module com { module sun { module star { module frame {
     worked on. This list gets changes consistently during a work session.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 
 service PopupMenuController
diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index 5212d3b587c6..3c8d2babc495 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module frame {
     it contains a registered command URL.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 
 service PopupMenuControllerFactory
diff --git a/offapi/com/sun/star/frame/StatusbarController.idl b/offapi/com/sun/star/frame/StatusbarController.idl
index 39c1921235dd..4903f3b10d63 100644
--- a/offapi/com/sun/star/frame/StatusbarController.idl
+++ b/offapi/com/sun/star/frame/StatusbarController.idl
@@ -64,7 +64,7 @@
     @see com::sun::star::frame::XDispatchProvider
     @see com::sun::star::frame::XStatusbarController
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 
 service StatusbarController
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index 01d26117f1c1..dd2b756c319a 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -51,7 +51,7 @@ module com { module sun { module star { module frame {
     if it contains a registered command URL.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 
 service StatusbarControllerFactory
diff --git a/offapi/com/sun/star/frame/ToolbarController.idl b/offapi/com/sun/star/frame/ToolbarController.idl
index a230abe4552d..4e2753125767 100644
--- a/offapi/com/sun/star/frame/ToolbarController.idl
+++ b/offapi/com/sun/star/frame/ToolbarController.idl
@@ -67,7 +67,7 @@
 
     @see com::sun::star::frame::XDispatchProvider
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 
 service ToolbarController
diff --git a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
index 326981516522..0f982fa0f4cb 100644
--- a/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/TransientDocumentsDocumentContentFactory.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module frame {
 /** specifies a factory for
     <type scope="com::sun::star::ucb">TransientDocumentsDocumentContent</type>s.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 service TransientDocumentsDocumentContentFactory
 {
diff --git a/offapi/com/sun/star/frame/UnknownModuleException.idl b/offapi/com/sun/star/frame/UnknownModuleException.idl
index c1c9aad21d8a..9b3169c1dcbe 100644
--- a/offapi/com/sun/star/frame/UnknownModuleException.idl
+++ b/offapi/com/sun/star/frame/UnknownModuleException.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module frame {
  *  module could not be classified or does not have
  *  a valid configuration.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 exception UnknownModuleException : ::com::sun::star::uno::Exception
 {
diff --git a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
index 3bf6886ba17b..a7f50d78c79c 100644
--- a/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
+++ b/offapi/com/sun/star/frame/XDispatchInformationProvider.idl
@@ -56,7 +56,7 @@ module com {  module sun {  module star {  module frame {
 
     @see Frame
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 published interface XDispatchInformationProvider: com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl
index 71344418bda3..fa2d8944f878 100644
--- a/offapi/com/sun/star/frame/XInplaceLayout.idl
+++ b/offapi/com/sun/star/frame/XInplaceLayout.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module frame {
 
     @deprecated
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 
 interface XInplaceLayout : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XLayoutManager.idl b/offapi/com/sun/star/frame/XLayoutManager.idl
index feacef7a8ffc..b0902aa4c0e9 100644
--- a/offapi/com/sun/star/frame/XLayoutManager.idl
+++ b/offapi/com/sun/star/frame/XLayoutManager.idl
@@ -95,7 +95,7 @@ module com { module sun { module star { module frame {
     @see com::sun::star::frame::XFrame
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 
 interface XLayoutManager : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
index b79827dd4b3e..fc7636e21e56 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerEventBroadcaster.idl
@@ -40,7 +40,7 @@
 
     @see ::com::sun::star::frame::LayoutManager
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 
 interface XLayoutManagerEventBroadcaster : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
index ab2500cf6094..12b9af7ffb9f 100644
--- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl
+++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module frame {
     @see ::com::sun::star::frame::LayoutManager
     @see ::com::sun::star::frame::LayoutManagerEvents
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 interface XLayoutManagerListener : com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
index 7eec81bb5308..a5c2f54676d8 100644
--- a/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarAcceptor.idl
@@ -46,7 +46,7 @@ module com { module sun { module star { module frame {
 
     @deprecated
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 
 interface XMenuBarAcceptor : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
index b7c6a1b13c19..500c069006ee 100644
--- a/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
+++ b/offapi/com/sun/star/frame/XMenuBarMergingAcceptor.idl
@@ -45,7 +45,7 @@ module com { module sun { module star { module frame {
 /** provides functions to set and remove a merged menu bar for inplace
     editing.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 
 interface XMenuBarMergingAcceptor : com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XModule.idl b/offapi/com/sun/star/frame/XModule.idl
index e58999a0dc8f..ed591fb7316a 100644
--- a/offapi/com/sun/star/frame/XModule.idl
+++ b/offapi/com/sun/star/frame/XModule.idl
@@ -58,7 +58,7 @@ module com { module sun { module star { module frame {
 
     @see XModuleManager
 
-    @since OOo 2.3.0
+    @since OOo 2.3
  */
 interface XModule : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XModuleManager.idl b/offapi/com/sun/star/frame/XModuleManager.idl
index fd9d2168852e..cdc9bba41b6e 100644
--- a/offapi/com/sun/star/frame/XModuleManager.idl
+++ b/offapi/com/sun/star/frame/XModuleManager.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module frame {
 //===============================================
 /** can be used to identify office modules.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 interface XModuleManager : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XPopupMenuController.idl b/offapi/com/sun/star/frame/XPopupMenuController.idl
index 0dcf688d1615..fd9e3b4c2f2e 100644
--- a/offapi/com/sun/star/frame/XPopupMenuController.idl
+++ b/offapi/com/sun/star/frame/XPopupMenuController.idl
@@ -48,7 +48,7 @@ module com { module sun { module star { module frame {
     briefs the controller whenever the pop-up menu gets activated by a user.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 interface XPopupMenuController : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XStatusbarController.idl b/offapi/com/sun/star/frame/XStatusbarController.idl
index 6c72d82d013b..d524cb75acc6 100644
--- a/offapi/com/sun/star/frame/XStatusbarController.idl
+++ b/offapi/com/sun/star/frame/XStatusbarController.idl
@@ -62,7 +62,7 @@ module com {  module sun {  module star {  module frame {
 
     @see com::sun::star::frame::XDispatchProvider
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 interface XStatusbarController : ::com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XSubToolbarController.idl b/offapi/com/sun/star/frame/XSubToolbarController.idl
index e0de8b9b8e2f..a9614e5ba04a 100644
--- a/offapi/com/sun/star/frame/XSubToolbarController.idl
+++ b/offapi/com/sun/star/frame/XSubToolbarController.idl
@@ -47,7 +47,7 @@
 
     @see com::sun::star::frame::ToolbarController
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 interface XSubToolbarController : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XSynchronousDispatch.idl b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
index 71efb91b6f5a..daa86152ac11 100644
--- a/offapi/com/sun/star/frame/XSynchronousDispatch.idl
+++ b/offapi/com/sun/star/frame/XSynchronousDispatch.idl
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module frame {
 
 //=============================================================================
 /** additional interfaces for dispatch objects: allow to execute with return value
-    @since OOo 2.0.0
+    @since OOo 2.0
     @see XDispatch
  */
 published interface XSynchronousDispatch: com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/frame/XToolbarController.idl b/offapi/com/sun/star/frame/XToolbarController.idl
index eb8b9c0b0757..834cb5d8c84a 100644
--- a/offapi/com/sun/star/frame/XToolbarController.idl
+++ b/offapi/com/sun/star/frame/XToolbarController.idl
@@ -53,7 +53,7 @@
 
     @see com::sun::star::frame::XDispatchProvider
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 interface XToolbarController : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XToolbarControllerListener.idl b/offapi/com/sun/star/frame/XToolbarControllerListener.idl
index 6450d8ef910e..63b7b6ae4cca 100644
--- a/offapi/com/sun/star/frame/XToolbarControllerListener.idl
+++ b/offapi/com/sun/star/frame/XToolbarControllerListener.idl
@@ -36,7 +36,7 @@
 
     @see com::sun::star::frame::ToolbarController
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 interface XToolbarControllerListener : com::sun::star::uno::XInterface
 {
diff --git a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
index ec3259b4ad06..9fc7172fd203 100644
--- a/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
+++ b/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentFactory.idl
@@ -56,7 +56,7 @@ module com { module sun { module star { module frame {
      @see      com::sun::star::document::OfficeDocument
      @see      com::sun::star::ucb::TransientDocumentsDocumentContent
 
-     @since OOo 2.0.0
+     @since OOo 2.0
 */
 interface XTransientDocumentsDocumentContentFactory : com::sun::star::uno::XInterface
 {