summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Schmidt <jsc@openoffice.org>2011-02-24 14:57:20 +0100
committerJuergen Schmidt <jsc@openoffice.org>2011-02-24 14:57:20 +0100
commit3e38a544ec65dd533b9282afd4fbd23affb994b3 (patch)
treefb02e74295a896835f9dfe614e40e8119c8df210
parentb21af421849da049000f6c655282f2bf2c01a623 (diff)
jsc340: i115337: correct since tags
-rw-r--r--offapi/com/sun/star/awt/UnoControlDialogModelProvider.idl2
-rw-r--r--offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl6
-rw-r--r--offapi/com/sun/star/awt/grid/GridDataEvent.idl2
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 6e4f5b9e9..c1f91eb63 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 7bcaa7d50..58a1129e5 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 3ac05f0ec..7430f3d97 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
{