[ooo-build-commit] .: 29 commits - offapi/com sal/textenc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 8 08:38:10 PDT 2010
offapi/com/sun/star/awt/UnoControlComboBoxModel.idl | 6 +++++
offapi/com/sun/star/awt/UnoControlListBoxModel.idl | 11 ++++++++++
offapi/com/sun/star/configuration/XUpdate.idl | 6 +++++
offapi/com/sun/star/deployment/ExtensionRemovedException.idl | 5 ----
offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl | 5 ----
offapi/com/sun/star/deployment/Prerequisites.idl | 5 ----
offapi/com/sun/star/script/XLibraryContainer3.idl | 5 ----
sal/textenc/convertadobe.tab | 2 +
8 files changed, 29 insertions(+), 16 deletions(-)
New commits:
commit 76399b1c8c7c62d8b2c3593dfae020bbc970a03c
Merge: f9ef138... b549687...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Sep 8 11:34:19 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit f9ef138393f1ee4c24b0d8fe41e1a56fa9673465
Merge: 90e8b7d... 165163b...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Sep 7 09:33:09 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit b5496876a7f4e9b271adf2630e7adfb00562f796
Merge: dfe63d4... 28afbb9...
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit dfe63d4f1b365aba9c7552161ab8dfa6deb840c1
Merge: 165163b... b445aad...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Aug 31 15:26:29 2010 +0200
CWS-TOOLING: integrate CWS sb130
commit 28afbb92e9861b5414baa0d14611b62c48949279
Merge: ff47f09... 5ccdcb4...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Aug 25 16:07:39 2010 +0200
fs33a: merge after pulling OOO330.m5's changes
commit 165163b89a47786e0bdf88e4186f502ccce1dffd
Merge: 5ccdcb4... 50cb935...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Aug 25 14:29:06 2010 +0200
CWS-TOOLING: integrate CWS ooo33gsl06
commit b445aadbdca8a67b322828c33ad98dfd0cf9e5f2
Merge: 2190f32... 5ccdcb4...
Author: sb <sb at openoffice.org>
Date: Wed Aug 25 14:21:49 2010 +0200
sb130: merged in OOO330_m5
commit 50cb935be4339482f4916cc838065e73f9c843a0
Author: Herbert Duerr [hdu] <duerr at sun.com>
Date: Thu Aug 19 14:04:41 2010 +0200
#i1138511# allow symbol-aliasing in adobe single-byte encodings
diff --git a/sal/textenc/convertadobe.tab b/sal/textenc/convertadobe.tab
index f43a9a2..f676f7c 100644
--- a/sal/textenc/convertadobe.tab
+++ b/sal/textenc/convertadobe.tab
@@ -185,6 +185,7 @@ rtl::textenc::BmpUnicodeToSingleByteRange const unicodeToAdobeSymbolEncoding[]
{ 0x23D0, 0x23D0 - 0x23D0, 0xBE }, { 0x25CA, 0x25CA - 0x25CA, 0xE0 },
{ 0x2660, 0x2660 - 0x2660, 0xAA }, { 0x2663, 0x2663 - 0x2663, 0xA7 },
{ 0x2665, 0x2665 - 0x2665, 0xA9 }, { 0x2666, 0x2666 - 0x2666, 0xA8 },
+ { 0xF000, 0xF0FF - 0xF000, 0x00 }, // symbol aliasing U+F0XX->S+00XX
{ 0xF6D9, 0xF6D9 - 0xF6D9, 0xD3 }, { 0xF6DA, 0xF6DA - 0xF6DA, 0xD2 },
{ 0xF6DB, 0xF6DB - 0xF6DB, 0xD4 }, { 0xF8E5, 0xF8E5 - 0xF8E5, 0x60 },
{ 0xF8E8, 0xF8EA - 0xF8E8, 0xE2 } };
@@ -251,6 +252,7 @@ rtl::textenc::BmpUnicodeToSingleByteRange const unicodeToAdobeDingbatsEncoding[]
{ 0x2756, 0x2756 - 0x2756, 0x76 }, { 0x2758, 0x275E - 0x2758, 0x78 },
{ 0x2761, 0x2767 - 0x2761, 0xA1 }, { 0x2776, 0x2794 - 0x2776, 0xB6 },
{ 0x2798, 0x27AF - 0x2798, 0xD8 }, { 0x27B1, 0x27BE - 0x27B1, 0xF1 },
+ { 0xF000, 0xF0FF - 0xF000, 0x00 }, // symbol aliasing U+F0XX->S+00XX
{ 0xF8D7, 0xF8E4 - 0xF8D7, 0x80 }};
rtl::textenc::BmpUnicodeToSingleByteConverterData const
commit 5ccdcb471976d739a43597b47660d5254a137f6f
Merge: 8050668... 18221f7...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 18 12:00:05 2010 +0200
CWS-TOOLING: integrate CWS jl154
commit 18221f76d06cf85da6d42e38a2fed759aef679da
Merge: e72339c... bb67de3...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 07:28:35 2010 +0200
jl154: Local merge
commit 2190f32ab0bfa95d8c268ca6a162d2f375b959e2
Author: sb <sb at openoffice.org>
Date: Thu Aug 12 10:22:02 2010 +0200
sb130: #i113096# introduced com.sun.star.configuration.XUpdate.removeExtensionXcuFile
diff --git a/offapi/com/sun/star/configuration/XUpdate.idl b/offapi/com/sun/star/configuration/XUpdate.idl
index 7514cbc..c3316ea 100644
--- a/offapi/com/sun/star/configuration/XUpdate.idl
+++ b/offapi/com/sun/star/configuration/XUpdate.idl
@@ -40,7 +40,13 @@ module com { module sun { module star { module configuration {
*/
interface XUpdate {
void insertExtensionXcsFile([in] boolean shared, [in] string fileUri);
+
void insertExtensionXcuFile([in] boolean shared, [in] string fileUri);
+
+ void removeExtensionXcuFile([in] string fileUri);
+ // fileUri must exactly match corresponding insertExtensionXcuFile
+ // argument
+
void insertModificationXcuFile(
[in] string fileUri, [in] sequence< string > includedPaths,
[in] sequence< string > excludedPaths);
commit bb67de3dc5a2f859180606505cbf9b1ac6b56603
Merge: 8050668... e72339c...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Aug 11 08:57:13 2010 +0200
jl154: Local merge
commit ff47f09f9e28c9a653f3fbebd25fbda4c79d19bc
Merge: 736f56f... 8050668...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
diff --cc offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
index 0000000,abd3b08..abd3b08
mode 000000,100755..100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest2.idl
diff --cc offapi/com/sun/star/task/DocumentPasswordRequest2.idl
index 0000000,a950013..a950013
mode 000000,100755..100644
--- a/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest2.idl
diff --cc offapi/com/sun/star/task/makefile.mk
index 3b622b4,16b0be5..16b0be5
mode 100644,100755..100644
--- a/offapi/com/sun/star/task/makefile.mk
+++ b/offapi/com/sun/star/task/makefile.mk
commit 736f56fc89292923ddc6844fe10fa85e8f5f1f1c
Merge: 68fe561... 0cd895e...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Aug 10 14:21:53 2010 +0200
merging in latest changes from CWS unoawt2
commit e72339c37a724f4bdaba87c6f944ebd58415ea2a
Merge: 1588f8b... 69df64a...
Author: Joachim Lingner <jl at openoffice.org>
Date: Mon Aug 2 15:39:29 2010 +0200
jl154 merging with OOO330m2
commit 1588f8b510855be60cb6d62867446967faddeca5
Merge: 52782ca... e96a6bc...
Author: Joachim Lingner <jl at openoffice.org>
Date: Fri Jul 16 15:45:18 2010 +0200
jl154 merging with OOO300_m1
commit 68fe561b0096bd6a292daf4a04cb7f0bda2f0622
Merge: 9b1e23f... 93e1dd3...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Tue Jul 6 15:24:32 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 52782ca48f788bbe817ea12e35cc099687aca60e
Author: Joachim Lingner <jl at openoffice.org>
Date: Mon Jul 5 15:46:50 2010 +0200
jl154 #i112934# replace old license headers introduced by CWS jl152
diff --git a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
index 78233bf..a33a681 100644
--- a/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
+++ b/offapi/com/sun/star/deployment/ExtensionRemovedException.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VersionException.idl,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
index d431ab2..1d047e9 100644
--- a/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
+++ b/offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: VersionException.idl,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/deployment/Prerequisites.idl b/offapi/com/sun/star/deployment/Prerequisites.idl
index 21e8ab1..aa9199b 100644
--- a/offapi/com/sun/star/deployment/Prerequisites.idl
+++ b/offapi/com/sun/star/deployment/Prerequisites.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: KeyUsage.idl,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/offapi/com/sun/star/script/XLibraryContainer3.idl b/offapi/com/sun/star/script/XLibraryContainer3.idl
index f9ece55..167e578 100644
--- a/offapi/com/sun/star/script/XLibraryContainer3.idl
+++ b/offapi/com/sun/star/script/XLibraryContainer3.idl
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: XLibraryContainer2.idl,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
commit 0cd895e70c17a03a6c70eb46d2766ea7987cd741
Author: Ocke Janssen [oj] <Ocke.Janssen at sun.com>
Date: Thu Jul 1 11:52:27 2010 +0200
unoawt2: add XItemList same as for listbox model
diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 76a4b01..2f766c3 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -39,6 +39,7 @@
#include <com/sun/star/util/Color.idl>
#endif
+#include <com/sun/star/awt/XItemList.idl>
//=============================================================================
@@ -225,6 +226,11 @@ published service UnoControlComboBoxModel
this is possible.</p>
*/
[optional, property] short MouseWheelBehavior;
+
+ /** allows mmanipulating the list of items in the combo box more fine-grained than the
+ <member>StringItemList</member> property.
+ */
+ [optional] interface XItemList;
};
//=============================================================================
commit 216eb3aa22f9c950981d11545caa8f2d7b5172f4
Merge: 6aa8dd9... 2902d48...
Author: Joachim Lingner <jl at openoffice.org>
Date: Wed Jun 30 17:12:59 2010 +0200
jl154 merge with DEV300_m84
commit 93e1dd367a4f317914d6006ab376c7e6b8942fa3
Merge: 67fd04b... 3d0fa53...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Sun Jun 20 00:48:29 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 3d0fa53f98bc015eaf13bdd18e78130945e9806e
Merge: 3173637... 67fd04b...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Jun 17 23:37:32 2010 +0200
fs33a: merged CWS unoawt2, implicit rebase to m83
commit 31736374e2f401d10b48a05b32761be0aeb4ad40
Merge: 732952c... fcc2791...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Jun 17 11:47:25 2010 +0200
fs33a: merge after pulling latest changes from DEV300 (m81)
commit 732952c50a76812f04c1f058c9fb6ff8916349ef
Merge: 27f1f79... 46020e7...
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Wed Jun 16 15:55:22 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/fs33a
commit 46020e7ef2fceba95ccd1783db3876f790312f51
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Wed Jun 16 14:29:22 2010 +0200
fs33a: oops, forgot this addition to the documentation of the UnoControlListBoxModel in CWS unoawt
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index d875315..4352ca0 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -213,8 +213,19 @@ published service UnoControlListBoxModel
/** allows mmanipulating the list of items in the list box more fine-grained than the
<member>StringItemList</member> property.
+
+ @since OOo 3.3
*/
[optional] interface XItemList;
+
+ /** specifies where an item separator - a horizontal line - is drawn.
+
+ <p>If this is not <NULL/>, then a horizontal line will be drawn between the item at the given position,
+ and the following item.</p>
+
+ @since OOo 3.3
+ */
+ [optional, property, maybevoid] short ItemSeparatorPos;
};
//=============================================================================
commit 27f1f791481d5948af79bbc0fad5a4e93e07c5df
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Apr 29 15:29:46 2010 +0200
fs33a: #i111238# [s|g]etUserData -> [s|g]etItemData
diff --git a/offapi/com/sun/star/awt/XItemList.idl b/offapi/com/sun/star/awt/XItemList.idl
index 3d618d7..6419ea9 100644
--- a/offapi/com/sun/star/awt/XItemList.idl
+++ b/offapi/com/sun/star/awt/XItemList.idl
@@ -189,14 +189,17 @@ interface XItemList
the position of the item whose data value should be set. Must be greater or equal to 0, and
lesser than <member>ItemCount</member>.
+ @param ItemData
+ the data to associate with the list item
+
@throws ::com::sun::star::lang::IndexOutOfBoundsException
if <code>Position</code> is invalid.
- @see getUserData
+ @see getItemData
*/
- void setUserData(
+ void setItemData(
[in] long Position,
- [in] any DataValue
+ [in] any ItemData
)
raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
@@ -244,7 +247,7 @@ interface XItemList
raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
/** retrieves the implementation dependend value associated with the given list item.
- @see setUserData
+ @see setItemData
@param Position
the position of the item whose data value should be retrieved. Must be greater or equal to 0, and
@@ -253,9 +256,9 @@ interface XItemList
@throws ::com::sun::star::lang::IndexOutOfBoundsException
if <code>Position</code> is invalid.
- @see getUserData
+ @see setItemData
*/
- any getUserData(
+ any getItemData(
[in] long Position
)
raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
commit d3021fad695af7e3186246cbfdef404db72cf56c
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Apr 29 14:10:03 2010 +0200
fs33a: #i111238# now with UserData support
diff --git a/offapi/com/sun/star/awt/XItemList.idl b/offapi/com/sun/star/awt/XItemList.idl
index 55721bf..3d618d7 100644
--- a/offapi/com/sun/star/awt/XItemList.idl
+++ b/offapi/com/sun/star/awt/XItemList.idl
@@ -180,6 +180,26 @@ interface XItemList
)
raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+ /** associates an implementation dependend value with the given list item.
+
+ <p>You can use this to store data for an item which does not interfere with the displayed
+ text and image, but can be used by the client of the list box for an arbitrary purpose.</p>
+
+ @param Position
+ the position of the item whose data value should be set. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+
+ @see getUserData
+ */
+ void setUserData(
+ [in] long Position,
+ [in] any DataValue
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
/** retrieves the text of an existing item
@param Position
@@ -223,6 +243,23 @@ interface XItemList
)
raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+ /** retrieves the implementation dependend value associated with the given list item.
+ @see setUserData
+
+ @param Position
+ the position of the item whose data value should be retrieved. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+
+ @see getUserData
+ */
+ any getUserData(
+ [in] long Position
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
/** retrieves the texts and images of all items in the list
*/
sequence< ::com::sun::star::beans::Pair< string, string > >
commit a7bb53b95ae34bc93a81977939f660bba15ed869
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Apr 29 10:15:25 2010 +0200
fs33a: #i111238# add (optional, since the thing is published) support for XItemList
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 8d94cda..d875315 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -38,6 +38,8 @@
#ifndef __com_sun_star_util_Color_idl__
#include <com/sun/star/util/Color.idl>
#endif
+
+#include <com/sun/star/awt/XItemList.idl>
//=============================================================================
@@ -208,6 +210,11 @@ published service UnoControlListBoxModel
this is possible.</p>
*/
[optional, property] short MouseWheelBehavior;
+
+ /** allows mmanipulating the list of items in the list box more fine-grained than the
+ <member>StringItemList</member> property.
+ */
+ [optional] interface XItemList;
};
//=============================================================================
commit 92d9db82ceab3dfdeabb7de9228ecd05d1b27392
Author: Frank Schoenheit [fs] <frank.schoenheit at sun.com>
Date: Thu Apr 29 10:05:04 2010 +0200
fs33a: #i111238# add support for images to AWT's ListBoxControl/Model
diff --git a/offapi/com/sun/star/awt/ItemListEvent.idl b/offapi/com/sun/star/awt/ItemListEvent.idl
new file mode 100644
index 0000000..f9d2658
--- /dev/null
+++ b/offapi/com/sun/star/awt/ItemListEvent.idl
@@ -0,0 +1,76 @@
+/*************************************************************************
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __offapi_com_sun_star_awt_ListItemEvent_idl__
+#define __offapi_com_sun_star_awt_ListItemEvent_idl__
+
+#include <com/sun/star/lang/EventObject.idl>
+#include <com/sun/star/beans/Optional.idl>
+
+//==================================================================================================================
+
+module com { module sun { module star { module awt {
+
+//==================================================================================================================
+
+/** is the event broadcasted by a <type>XListItems</type> implementation for changes
+ in its item list.
+ */
+struct ItemListEvent : ::com::sun::star::lang::EventObject
+{
+ /** specifies the position of the item which is affected by the event
+
+ <p>In case the event is not related to a single item, but to the complete list, the value of this
+ member is undefined.</p>
+ */
+ long ItemPosition;
+
+ /** the text of the item.
+
+ <p>If the event being notified did not touch the text of an item, this member is empty. For instance, upon
+ invocation of <member>XItemList::setItemImage</member>, only <code>ItemImageURL</code> will be set, and
+ <code>ItemText</code> will be empty.</p>
+ */
+ ::com::sun::star::beans::Optional< string >
+ ItemText;
+
+ /** the URL of the image of the item
+
+ <p>If the event being notified did not touch the image of an item, this member is empty. For instance, upon
+ invocation of <member>XItemList::setItemText</member>, only <code>ItemText</code> will be set, and
+ <code>ItemImageURL</code> will be empty.</p>
+ */
+ ::com::sun::star::beans::Optional< string >
+ ItemImageURL;
+};
+
+//==================================================================================================================
+
+}; }; }; };
+
+//==================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/XItemList.idl b/offapi/com/sun/star/awt/XItemList.idl
new file mode 100644
index 0000000..55721bf
--- /dev/null
+++ b/offapi/com/sun/star/awt/XItemList.idl
@@ -0,0 +1,246 @@
+/*************************************************************************
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __offapi_com_sun_star_awt_XItemList_idl__
+#define __offapi_com_sun_star_awt_XItemList_idl__
+
+#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
+#include <com/sun/star/beans/Pair.idl>
+
+//==================================================================================================================
+
+module com { module sun { module star { module awt {
+
+interface XItemListListener;
+
+//==================================================================================================================
+
+/** provides convenient access to the list of items in a list box
+ */
+interface XItemList
+{
+ /** is the number of items in the list
+ */
+ [attribute, readonly] long ItemCount;
+
+ /** inserts a new item into the list
+
+ @param Position
+ the position at which the item should be inserted. Must be greater or equal to 0, and
+ lesser than or equal to <member>ItemCount</member>.
+
+ @param ItemText
+ the text of the item to be inserted.
+
+ @param ItemImageURL
+ the URL of the image to display for the item
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ void insertItem(
+ [in] long Position,
+ [in] string ItemText,
+ [in] string ItemImageURL
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** inserts an item which has only a text, but no image
+
+ @param Position
+ the position at which the item should be inserted. Must be greater or equal to 0, and
+ lesser than or equal to <member>ItemCount</member>.
+
+ @param ItemText
+ the text of the item to be inserted.
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ void insertItemText(
+ [in] long Position,
+ [in] string ItemText
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** inserts an item which has only an image, but no text
+
+ @param Position
+ the position at which the item should be inserted. Must be greater or equal to 0, and
+ lesser than or equal to <member>ItemCount</member>.
+
+ @param ItemImageURL
+ the URL of the image to display for the item
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ void insertItemImage(
+ [in] long Position,
+ [in] string ItemImageURL
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** removes an item from the list
+
+ @param Position
+ the position of the item which should be removed. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ void removeItem(
+ [in] long Position
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** removes all items from the list
+ */
+ void removeAllItems();
+
+ /** sets a new text for an existing item
+
+ @param Position
+ the position of the item whose text is to be changed. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @param ItemText
+ the new text of the item
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ void setItemText(
+ [in] long Position,
+ [in] string ItemText
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** sets a new image for an existing item
+
+ @param Position
+ the position of the item whose image is to be changed. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @param ItemImageURL
+ the new URL of the image to display for the item
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ void setItemImage(
+ [in] long Position,
+ [in] string ItemImageURL
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** sets both a new position and text for an existing item
+
+ @param Position
+ the position of the item whose text and image is to be changed. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @param ItemText
+ the new text of the item
+
+ @param ItemImageURL
+ the new URL of the image to display for the item
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ void setItemTextAndImage(
+ [in] long Position,
+ [in] string ItemText,
+ [in] string ItemImageURL
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** retrieves the text of an existing item
+
+ @param Position
+ the position of the item whose text should be retrieved. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ string getItemText(
+ [in] long Position
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** retrieves the URL of the image of an existing item
+
+ @param Position
+ the position of the item whose image should be retrieved. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ string getItemImage(
+ [in] long Position
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** retrieves both the text and the image URL of an existing item
+
+ @param Position
+ the position of the item whose text and image should be retrieved. Must be greater or equal to 0, and
+ lesser than <member>ItemCount</member>.
+
+ @throws ::com::sun::star::lang::IndexOutOfBoundsException
+ if <code>Position</code> is invalid.
+ */
+ ::com::sun::star::beans::Pair< string, string >
+ getItemTextAndImage(
+ [in] long Position
+ )
+ raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+ /** retrieves the texts and images of all items in the list
+ */
+ sequence< ::com::sun::star::beans::Pair< string, string > >
+ getAllItems();
+
+ /** registers a listener which is notified about changes in the item list.
+ */
+ void addItemListListener( [in] XItemListListener Listener );
+
+ /** revokes a listener which is notified about changes in the item list.
+ */
+ void removeItemListListener( [in] XItemListListener Listener );
+};
+
+//==================================================================================================================
+
+}; }; }; };
+
+//==================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/XItemListListener.idl b/offapi/com/sun/star/awt/XItemListListener.idl
new file mode 100644
index 0000000..d41d8b1
--- /dev/null
+++ b/offapi/com/sun/star/awt/XItemListListener.idl
@@ -0,0 +1,85 @@
+/*************************************************************************
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __offapi_com_sun_star_awt_XItemListListener_idl__
+#define __offapi_com_sun_star_awt_XItemListListener_idl__
+
+#include <com/sun/star/lang/XEventListener.idl>
+#include <com/sun/star/awt/ItemListEvent.idl>
+
+//==================================================================================================================
+
+module com { module sun { module star { module awt {
+
+//==================================================================================================================
+
+/** describes a listener for changes in a item list
+ @see XListItems
+ */
+interface XItemListListener : ::com::sun::star::lang::XEventListener
+{
+ /** is called when an item is inserted into the list
+ */
+ void listItemInserted(
+ [in] ItemListEvent Event
+ );
+
+ /** is called when an item is removed from the list
+ */
+ void listItemRemoved(
+ [in] ItemListEvent Event
+ );
+
+ /** is called when an item in the list is modified, i.e. its text or image changed
+ */
+ void listItemModified(
+ [in] ItemListEvent Event
+ );
+ /** is called when the list has been completely cleared, i.e. after an invocation of
+ <member>XItemList::removeAllItems</member>
+ */
+ void allItemsRemoved(
+ [in] ::com::sun::star::lang::EventObject Event
+ );
+
+ /** is called when the changes to the item list which occured are too complex to be notified
+ in single events.
+
+ <p>Consumers of this event should discard their cached information about the current item list,
+ and completely refresh it from the <type>XItemList</type>'s current state.</p>
+ */
+ void itemListChanged(
+ [in] ::com::sun::star::lang::EventObject Event
+ );
+};
+
+//==================================================================================================================
+
+}; }; }; };
+
+//==================================================================================================================
+
+#endif
diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk
index 1e2350a..55734fd 100644
--- a/offapi/com/sun/star/awt/makefile.mk
+++ b/offapi/com/sun/star/awt/makefile.mk
@@ -328,7 +328,10 @@ IDLFILES=\
MenuLogo.idl \
XMenuExtended2.idl \
XMenuBarExtended.idl \
- XPopupMenuExtended.idl
+ XPopupMenuExtended.idl \
+ XItemList.idl \
+ XItemListListener.idl \
+ ItemListEvent.idl
# ------------------------------------------------------------------
More information about the ooo-build-commit
mailing list