jsc340: i115337: correct since tags

3 files changed, 3 insertions, 7 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl b/offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl
index a91065f72d66..e153c8c47370 100644
--- a/offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module awt {
 
 /** specifies a service to load a dialog model and allows to access the control models inside
 
-    @since OOo 3.3.0
+    @since OOo 3.3
  */
 service UnoControlDialogModelProvider : com::sun::star::container::XNameContainer
 {
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
index a25c602a9d38..c802db2f870e 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
@@ -37,17 +37,13 @@
 
 /** If you do not want to implement the <type>XGridDataModel</type> yourself, use this service.
 
-<<<<<<< local
-    @since OOo 3.3
-=======
     <p>The <code>DefaultGridDataModel</code> implementation is a dumb container of tabular data. You can add
     and remove rows, modify cell values, and the like.</p>
 
     <p>The implementation will implicitly increase its column count if you add a row which has more values than
     the current column count.</p>
 
-    @since OOo 3.3.0
->>>>>>> other
+    @since OOo 3.3
  */
 service DefaultGridDataModel : ::com::sun::star::awt::grid::XMutableGridDataModel;
 
diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
index 3ac05f0ec1ae..7430f3d97e66 100644
--- a/offapi/com/sun/star/awt/grid/GridDataEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
@@ -43,7 +43,7 @@ module com {  module sun {  module star {  module awt {  module grid {
     @see XMutableGridDataModel
     @see XGridDataListener
 
-    @since OOo 3.3.0
+    @since OOo 3.3
  */
 struct GridDataEvent: com::sun::star::lang::EventObject
 {