diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:23:21 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:23:21 +0200 |
commit | 5847d2ab92aa35223e03e1adab486d7c73e2349c (patch) | |
tree | 66781e290f2adf8d25ca68681b1e95b93435ac81 /offapi/com/sun/star/table/XMergeableCellRange.idl | |
parent | b8867927e2fee37ed60b1b8773bcc0dc7e2b91cd (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit dc53bbdbf2e1d0cbb53bb4619188955698f8a5c2 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:09 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit e4601251b90e2555b032eadbdaa56dcfb91b5aae
Author: Noel Power <noel.power@novell.com>
Date: Wed Apr 13 18:52:58 2011 +0100
fix for fdo#35108 allow dot net clients to bootstrap libreoffice
Signed-off-by: Petr Mladek <pmladek@suse.cz>
cli_ure/source/native/native_bootstrap.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 1818bf1dbc330974c749ca17b4d7b79796587fae
Author: Jani Monoses <jani.monoses@canonical.com>
Date: Mon Mar 14 19:10:04 2011 +0100
prefer gcc __sync functions over pthread
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
sal/osl/unx/interlck.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
Notes
split repo tag: ure_libreoffice-3.3.3.1
split repo tag: ure_libreoffice-3.3.4.1
Diffstat (limited to 'offapi/com/sun/star/table/XMergeableCellRange.idl')
-rw-r--r-- | offapi/com/sun/star/table/XMergeableCellRange.idl | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/offapi/com/sun/star/table/XMergeableCellRange.idl b/offapi/com/sun/star/table/XMergeableCellRange.idl index 51bf1cbc1a74..d4dd93dcc7b8 100644 --- a/offapi/com/sun/star/table/XMergeableCellRange.idl +++ b/offapi/com/sun/star/table/XMergeableCellRange.idl @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,31 +24,31 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef __com_sun_star_table_XMergeableCellRange_idl__ -#define __com_sun_star_table_XMergeableCellRange_idl__ - -#ifndef __com_sun_star_uno_XInterface_idl__ -#include <com/sun/star/uno/XInterface.idl> -#endif +#ifndef __com_sun_star_table_XMergeableCellRange_idl__ +#define __com_sun_star_table_XMergeableCellRange_idl__ + +#ifndef __com_sun_star_uno_XInterface_idl__ +#include <com/sun/star/uno/XInterface.idl> +#endif -#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ -#include <com/sun/star/lang/IllegalArgumentException.idl> -#endif +#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ +#include <com/sun/star/lang/IllegalArgumentException.idl> +#endif #ifndef __com_sun_star_lang_NoSupportException_idl__ #include <com/sun/star/lang/NoSupportException.idl> #endif - -//============================================================================= - -module com { module sun { module star { module table { - -//============================================================================= - + +//============================================================================= + +module com { module sun { module star { module table { + +//============================================================================= + /** represents a range of cells that can possibly be merged or unmerged. */ interface XMergeableCellRange : com::sun::star::uno::XInterface -{ +{ /** merges the area specified by this range. @throws <type scope="com::sun::star::lang">NoSupportException</type> @@ -57,7 +57,7 @@ interface XMergeableCellRange : com::sun::star::uno::XInterface */ void merge() raises( ::com::sun::star::lang::NoSupportException ); - //------------------------------------------------------------------------- + //------------------------------------------------------------------------- /** splits the cells in this range. This will be done by inserting rows and columns if needed or unmerging @@ -78,20 +78,20 @@ interface XMergeableCellRange : com::sun::star::uno::XInterface if a split is not possible for this range. */ void split( [in] long Columns, [in] long Rows ) - raises( ::com::sun::star::lang::NoSupportException, + raises( ::com::sun::star::lang::NoSupportException, ::com::sun::star::lang::IllegalArgumentException ); - //------------------------------------------------------------------------- + //------------------------------------------------------------------------- /** @returns <TRUE/> if all cells from this range can be merged to one or <FALSE/> otherwise. */ - boolean isMergeable(); -}; - -//============================================================================= - -}; }; }; }; - -#endif + boolean isMergeable(); +}; + +//============================================================================= + +}; }; }; }; + +#endif |