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

13 files changed, 13 insertions, 14 deletions

diff --git a/offapi/com/sun/star/form/FormComponent.idl b/offapi/com/sun/star/form/FormComponent.idl
index 1b817310d702..bb48e67df44d 100644
--- a/offapi/com/sun/star/form/FormComponent.idl
+++ b/offapi/com/sun/star/form/FormComponent.idl
@@ -104,7 +104,7 @@ published service FormComponent
         will always be set, even if you do not specify it in the
         <member scope="com::sun::star::beans">XPropertyContainer::addProperty</member> call.</p>
 
-        @since OpenOffice.org 2.3.0
+        @since OOo 2.3
     */
     [optional] service com::sun::star::beans::PropertyBag;
 
diff --git a/offapi/com/sun/star/form/XErrorListener.idl b/offapi/com/sun/star/form/XErrorListener.idl
index 3e71453a8dda..6deca2e9ba7c 100644
--- a/offapi/com/sun/star/form/XErrorListener.idl
+++ b/offapi/com/sun/star/form/XErrorListener.idl
@@ -51,7 +51,6 @@
     <p>Please do <em><b>not</b></em> use anymore, this interface is superseded
     by <type scope="com::sun::star::sdb">XSQLErrorListener</type>.</p>
 
-@since foo
     @deprecated
  */
 published interface XErrorListener: com::sun::star::lang::XEventListener
diff --git a/offapi/com/sun/star/form/component/GridControl.idl b/offapi/com/sun/star/form/component/GridControl.idl
index a5db6e556f5b..d5e61c377b69 100644
--- a/offapi/com/sun/star/form/component/GridControl.idl
+++ b/offapi/com/sun/star/form/component/GridControl.idl
@@ -162,7 +162,7 @@ published service GridControl
         <p>Not every border style (see <member>Border</member>) may support coloring.
         For instance, usually a border with 3D effect will ignore the BorderColor setting.</p>
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] long BorderColor;
 
diff --git a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
index b743fe4be85b..11140ee20476 100644
--- a/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
+++ b/offapi/com/sun/star/form/inspection/DefaultFormComponentInspectorModel.idl
@@ -62,7 +62,7 @@ service DefaultFormComponentInspectorModel : com::sun::star::inspection::XObject
     /** creates a default DefaultFormComponentInspectorModel, providing factories for all
         handlers listed above.
 
-        @since OOo 2.2.0
+        @since OOo 2.2
     */
     createDefault();
 
@@ -85,7 +85,7 @@ service DefaultFormComponentInspectorModel : com::sun::star::inspection::XObject
         @see XObjectInspectorModel::MinHelpTextLines
         @see XObjectInspectorModel::MaxHelpTextLines
 
-        @since OOo 2.2.0
+        @since OOo 2.2
     */
     createWithHelpSection(
         [in] long minHelpTextLines,
diff --git a/offapi/com/sun/star/form/runtime/FeatureState.idl b/offapi/com/sun/star/form/runtime/FeatureState.idl
index 996aff1e8076..f50c8d36ce05 100644
--- a/offapi/com/sun/star/form/runtime/FeatureState.idl
+++ b/offapi/com/sun/star/form/runtime/FeatureState.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module form { module runtime {
 
     @see XFormOperations
 
-    @since OpenOffice.org 2.2.0
+    @since OOo 2.2
  */
 struct FeatureState
 {
diff --git a/offapi/com/sun/star/form/runtime/FilterEvent.idl b/offapi/com/sun/star/form/runtime/FilterEvent.idl
index b7cc035113cb..f58b9e101e6f 100644
--- a/offapi/com/sun/star/form/runtime/FilterEvent.idl
+++ b/offapi/com/sun/star/form/runtime/FilterEvent.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module form { module runtime {
 
     @see XFilterController
 
-    @since OpenOffice.org 3.3
+    @since OOo 3.3
  */
 struct FilterEvent : ::com::sun::star::lang::EventObject
 {
diff --git a/offapi/com/sun/star/form/runtime/FormFeature.idl b/offapi/com/sun/star/form/runtime/FormFeature.idl
index 8a49e98bb900..4c7cbc0905be 100644
--- a/offapi/com/sun/star/form/runtime/FormFeature.idl
+++ b/offapi/com/sun/star/form/runtime/FormFeature.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module form { module runtime {
 /** specifies the operations on a user interface form, as supported by the
     <type>XFormOperations</type> interface.
 
-    @since OpenOffice.org 2.2.0
+    @since OOo 2.2
 */
 constants FormFeature
 {
diff --git a/offapi/com/sun/star/form/runtime/FormOperations.idl b/offapi/com/sun/star/form/runtime/FormOperations.idl
index aa4b7e825c8c..c96844ded821 100644
--- a/offapi/com/sun/star/form/runtime/FormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/FormOperations.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module form { module runtime {
 /** encapsulates operations on a database form which has a UI representation,
     and is interacting with the user.
 
-    @since OpenOffice.org 2.2.0
+    @since OOo 2.2
  */
 service FormOperations : XFormOperations
 {
diff --git a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
index b435e64a6d81..0f1ca0df7578 100644
--- a/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
+++ b/offapi/com/sun/star/form/runtime/XFeatureInvalidation.idl
@@ -43,7 +43,7 @@ module com { module sun { module star { module form { module runtime {
 
     @see XFormOperations
 
-    @since OpenOffice.org 2.2.0
+    @since OOo 2.2
 */
 interface XFeatureInvalidation
 {
diff --git a/offapi/com/sun/star/form/runtime/XFilterController.idl b/offapi/com/sun/star/form/runtime/XFilterController.idl
index cbaa3cca042a..d1c3471148f5 100644
--- a/offapi/com/sun/star/form/runtime/XFilterController.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterController.idl
@@ -73,7 +73,7 @@ interface XFilterControllerListener;
     @see com::sun::star::sdb::XSingleSelectQueryAnalyzer::getStructuredFilter
     @see com::sun::star::sdb::SQLFilterOperator
 
-    @since OpenOffice.org 3.3
+    @since OOo 3.3
  */
 interface XFilterController
 {
diff --git a/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl b/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
index c737f9b24c70..86068c745640 100644
--- a/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
+++ b/offapi/com/sun/star/form/runtime/XFilterControllerListener.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module form { module runtime {
 
 /** is implemented by components listening for events fired by an <type>XFilterController</type>.
 
-    @since OpenOffice.org 3.3
+    @since OOo 3.3
 */
 interface XFilterControllerListener : ::com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/form/runtime/XFormController.idl b/offapi/com/sun/star/form/runtime/XFormController.idl
index 01e199ba0d72..629f2ebc4945 100644
--- a/offapi/com/sun/star/form/runtime/XFormController.idl
+++ b/offapi/com/sun/star/form/runtime/XFormController.idl
@@ -248,7 +248,7 @@ interface XFormControllerContext;
     @see ::com::sun::star::form::binding::BindableControlModel
     @see ::com::sun::star::sdb::DataSource::Settings
 
-    @since OpenOffice.org 3.3
+    @since OOo 3.3
  */
 interface XFormController
 {
diff --git a/offapi/com/sun/star/form/runtime/XFormOperations.idl b/offapi/com/sun/star/form/runtime/XFormOperations.idl
index 9098b7cad790..c41c081d58e6 100644
--- a/offapi/com/sun/star/form/runtime/XFormOperations.idl
+++ b/offapi/com/sun/star/form/runtime/XFormOperations.idl
@@ -93,7 +93,7 @@ interface XFeatureInvalidation;
 
     @see FormFeature
 
-    @since OpenOffice.org 2.2.0
+    @since OOo 2.2
  */
 interface XFormOperations : ::com::sun::star::lang::XComponent
 {