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

1 files changed, 6 insertions, 6 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
index 1a8b4b2cced8..ae4773fe66bc 100644
--- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
@@ -95,7 +95,7 @@ published service UnoControlButtonModel
         If set to <FALSE/>, the focus is preserved when the user operates the button control with
         the mouse.</p>
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] boolean FocusOnClick;
 
@@ -183,7 +183,7 @@ published service UnoControlButtonModel
 
     /** specifies that the text may be displayed on more than one line.
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] boolean MultiLine;
 
@@ -208,7 +208,7 @@ published service UnoControlButtonModel
         set to <TRUE/>, the button is repeatedly pressed while you hold
         down the mouse button.</p>
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] boolean Repeat;
 
@@ -222,7 +222,7 @@ published service UnoControlButtonModel
         mouse button and to press it again. The delay between two such triggers
         is specified with this property.</p>
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] long RepeatDelay;
 
@@ -261,7 +261,7 @@ published service UnoControlButtonModel
         <p>The default for this property is <FALSE/>, which means the button behaves like a usual
         push button.</p>
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] boolean Toggle;
 
@@ -269,7 +269,7 @@ published service UnoControlButtonModel
 
     /** specifies the vertical alignment of the text in the control.
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;