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, 7 insertions, 7 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlEditModel.idl b/offapi/com/sun/star/awt/UnoControlEditModel.idl
index 5ac71c442f3b..094ef6e58f92 100644
--- a/offapi/com/sun/star/awt/UnoControlEditModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlEditModel.idl
@@ -72,7 +72,7 @@ published service UnoControlEditModel
     /** If set to true an horizontal scrollbar will be added automatically
         when needed.
 
-        @since OOo 2.3.0
+        @since OOo 2.3
      */
     [optional, property] boolean AutoHScroll;
 
@@ -81,7 +81,7 @@ published service UnoControlEditModel
     /** If set to true an vertical scrollbar will be added automatically
         when needed.
 
-        @since OOo 2.3.0
+        @since OOo 2.3
      */
     [optional, property] boolean AutoVScroll;
 
@@ -110,7 +110,7 @@ published service UnoControlEditModel
         <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;
 
@@ -170,7 +170,7 @@ published service UnoControlEditModel
     /** specifies whether the selection in the control should be hidden when
         the control is not active (focused).
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] boolean HideInactiveSelection;
 
@@ -196,7 +196,7 @@ published service UnoControlEditModel
         No matter which line end format is used in this new text then, usual control implementations
         should recognize all line end formats and display them properly.</p>
 
-        @since OOo 2.0.0
+        @since OOo 2.0
      */
     [optional, property] short LineEndFormat;
 
@@ -218,7 +218,7 @@ published service UnoControlEditModel
 
     /** specifies whether the control paints it background or not.
 
-        @since OOo 2.3.0
+        @since OOo 2.3
      */
     [optional, property] boolean PaintTransparent;
 
@@ -279,7 +279,7 @@ published service UnoControlEditModel
 
     /** specifies the vertical alignment of the text in the control.
 
-        @since OpenOffice.org 3.3
+        @since OOo 3.3
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
 };