diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:22:42 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:22:42 +0200 |
commit | 75d3980ac489b418781e532374775ae3257ee0c3 (patch) | |
tree | 6cce6167bbc283132f3bcee6ede84a3215b211f1 /offapi/com/sun/star/linguistic2/XConversionDictionary.idl | |
parent | 4d771c9583d9db425f3c5c23cb18409dd815d639 (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 0fdd83bb80750974f216358fcb3fecaa0fa370d3 (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:46 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit a7dce734c49ae5b48837f4db047594959505f5de
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:30 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit a5d54a8a2d254b49c5fffaa6b3d0c094b756e691
Author: Caolán McNamara <caolanm@redhat.com>
Date: Thu Jan 27 20:26:07 2011 +0000
move cxxabi.h after stl headers to workaround gcc 4.6.0 and damn stlport
Signed-off-by: David Tardon <dtardon@redhat.com>
bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit f06193d3a0c3c5f827df091f0253928adfbf43d9
Author: Tor Lillqvist <tlillqvist@novell.com>
Date: Tue Jan 25 16:24:07 2011 +0200
Manipulate also the C runtime's environment
Fixes fdo#33355.
Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
sal/osl/w32/process.cxx | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
commit f352463d20ea162b67a22b3a66e9ab712af6bfe2
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:58 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 71c1bae118e03b0b46c2ee7f7881427f8c5bc6bb
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:09 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: ure_libreoffice-3.3.1.1
split repo tag: ure_libreoffice-3.3.1.2
Diffstat (limited to 'offapi/com/sun/star/linguistic2/XConversionDictionary.idl')
-rw-r--r-- | offapi/com/sun/star/linguistic2/XConversionDictionary.idl | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl b/offapi/com/sun/star/linguistic2/XConversionDictionary.idl index ddcf471bcd39..0cf28878dd14 100644 --- a/offapi/com/sun/star/linguistic2/XConversionDictionary.idl +++ b/offapi/com/sun/star/linguistic2/XConversionDictionary.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 @@ -101,7 +101,7 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface /** @returns the conversion type supported by the dictionary. - + @see com::sun::star::linguistic2::ConversionDictionaryType */ short getConversionType(); @@ -131,11 +131,11 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface /** searches for entries or conversions that match the given text. <p>The exact string to be looked for is the substring from the - aText parameter that starts at position nStartPos and has the + aText parameter that starts at position nStartPos and has the length nLength.</p> @returns - the list of conversions found for the supplied text. + the list of conversions found for the supplied text. If no nothing was found, it is empty. @param aText @@ -151,22 +151,22 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface specifies the direction of the conversion to look for. It is one of <type scope="com::sun::star::linguistic2">ConversionDirection</type>. - + @param nTextConversionOptions - Combination of <type scope="com::sun::star::i18n">TextConversionOption</type> + Combination of <type scope="com::sun::star::i18n">TextConversionOption</type> values. - @throws com::sun::star::lang::IllegalArgumentException - if the locale is not supported by the dictionary or if + @throws com::sun::star::lang::IllegalArgumentException + if the locale is not supported by the dictionary or if nTextConversionOptions is invalid for the given locale. */ - sequence< string > getConversions( + sequence< string > getConversions( [in] string aText, [in] long nStartPos, [in] long nLength, [in] com::sun::star::linguistic2::ConversionDirection eDirection, [in] long nTextConversionOptions ) - raises( com::sun::star::lang::IllegalArgumentException ); + raises( com::sun::star::lang::IllegalArgumentException ); //------------------------------------------------------------------------- /** is used to add a conversion pair to the dictionary. @@ -177,19 +177,19 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface @param aRightText the right text of the pair to be added. - @throws com::sun::star::lang::IllegalArgumentException + @throws com::sun::star::lang::IllegalArgumentException if the arguments are invalid. For example if the specifications defined by the service implementing this object are not met. - @throws com::sun::star::container::ElementExistException + @throws com::sun::star::container::ElementExistException if such an entry already exists. */ void addEntry( [in] string aLeftText, [in] string aRightText ) - raises( com::sun::star::lang::IllegalArgumentException, - com::sun::star::container::ElementExistException); + raises( com::sun::star::lang::IllegalArgumentException, + com::sun::star::container::ElementExistException); //------------------------------------------------------------------------- /** removes a conversion pair from the dictionary. @@ -200,16 +200,16 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface @param aRightText the right text of the pair to be removed. - @throws com::sun::star::container::NoSuchElementException + @throws com::sun::star::container::NoSuchElementException if there is no such entry. */ void removeEntry( [in] string aLeftText, [in] string aRightText ) - raises( com::sun::star::container::NoSuchElementException ); + raises( com::sun::star::container::NoSuchElementException ); //------------------------------------------------------------------------- - /** returns the maximum number of characters used as left or right text + /** returns the maximum number of characters used as left or right text in entries. @param eDirection @@ -222,15 +222,15 @@ published interface XConversionDictionary : com::sun::star::uno::XInterface [in] com::sun::star::linguistic2::ConversionDirection eDirection ); //------------------------------------------------------------------------- - /** - @returns - a list of all left or right parts of the dictionaries entries. + /** + @returns + a list of all left or right parts of the dictionaries entries. @param eDirection - specifies if all left or all right parts of the entries + specifies if all left or all right parts of the entries should be returned. */ - sequence< string > getConversionEntries( + sequence< string > getConversionEntries( [in] com::sun::star::linguistic2::ConversionDirection eDirection ); }; |