fwk156: Merge changes

3 files changed, 23 insertions, 0 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 83057417edbf..eedd7b78c346 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;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 1cd36de93231..1ecf338bf095 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;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/configuration/XUpdate.idl b/offapi/com/sun/star/configuration/XUpdate.idl
index 7514cbcb1b7f..c3316ea5dc45 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);