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

8 files changed, 8 insertions, 8 deletions

diff --git a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
index af7116b085ea..e3fbf81c7223 100644
--- a/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
+++ b/offapi/com/sun/star/document/CorruptedFilterConfigurationException.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module document {
 /** This exception is thrown in case the global filter configuration
     does not exists or contains corrupted data.
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 published exception CorruptedFilterConfigurationException : ::com::sun::star::uno::RuntimeException
 {
diff --git a/offapi/com/sun/star/document/DocumentEvent.idl b/offapi/com/sun/star/document/DocumentEvent.idl
index 1ec7f599ad6a..caa717a8217a 100644
--- a/offapi/com/sun/star/document/DocumentEvent.idl
+++ b/offapi/com/sun/star/document/DocumentEvent.idl
@@ -49,7 +49,7 @@ module com { module sun { module star { module document {
     anymore.</p>
 
     @see XDocumentEventBroadcaster
-    @since OpenOffice.org 3.1
+    @since OOo 3.1
  */
 struct DocumentEvent : ::com::sun::star::lang::EventObject
 {
diff --git a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
index 61f4e49b886b..7885f9cde7da 100644
--- a/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XDocumentEventBroadcaster.idl
@@ -58,7 +58,7 @@ interface XDocumentEventListener;
     anymore.</p>
 
     @see DocumentEvent
-    @since OpenOffice.org 3.1
+    @since OOo 3.1
 */
 interface XDocumentEventBroadcaster
 {
diff --git a/offapi/com/sun/star/document/XDocumentEventListener.idl b/offapi/com/sun/star/document/XDocumentEventListener.idl
index 4d151b844659..bcaa6ecd8321 100644
--- a/offapi/com/sun/star/document/XDocumentEventListener.idl
+++ b/offapi/com/sun/star/document/XDocumentEventListener.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module document {
     anymore.</p>
 
     @see XDocumentEventBroadcaster
-    @since OpenOffice.org 3.1
+    @since OOo 3.1
  */
 interface XDocumentEventListener : ::com::sun::star::lang::XEventListener
 {
diff --git a/offapi/com/sun/star/document/XMLBasicExporter.idl b/offapi/com/sun/star/document/XMLBasicExporter.idl
index 4e11911e3181..7766282276dd 100644
--- a/offapi/com/sun/star/document/XMLBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicExporter.idl
@@ -53,7 +53,7 @@ module com { module sun { module star { module document {
     from which the data should be exported. After that, the export is started
     by calling the <method>XFilter::filter</method> method.</p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 published service XMLBasicExporter
 {
diff --git a/offapi/com/sun/star/document/XMLBasicImporter.idl b/offapi/com/sun/star/document/XMLBasicImporter.idl
index 38f3bf3ff086..74b789c954ed 100644
--- a/offapi/com/sun/star/document/XMLBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLBasicImporter.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module document {
     The <type scope="com::sun::star::xml::sax">XDocumentHandler</type>
     interface is used to stream the XML data into the filter.</p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 published service XMLBasicImporter
 {
diff --git a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
index 8c59e34f4301..b5817e99e8ee 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicExporter.idl
@@ -53,7 +53,7 @@ module com { module sun { module star { module document {
     from which the data should be exported. After that, the export is started
     by calling the <method>XFilter::filter</method> method.</p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 published service XMLOasisBasicExporter
 {
diff --git a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
index c0aadd8c4941..c77c6395a9be 100644
--- a/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
+++ b/offapi/com/sun/star/document/XMLOasisBasicImporter.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module document {
     The <type scope="com::sun::star::xml::sax">XDocumentHandler</type>
     interface is used to stream the XML data into the filter.</p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
  */
 published service XMLOasisBasicImporter
 {