slidecopy: moved Frame/ResourceURL/Type from css.ui.UIElement to css.ui.XUIElement

2 files changed, 26 insertions, 31 deletions

diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index ce903f21ec72..610964c7e49e 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -31,10 +31,6 @@
 #ifndef __com_sun_star_ui_UIElement_idl__
 #define __com_sun_star_ui_UIElement_idl__
 
-#ifndef __com_sun_star_frame_XFrame_idl__
-#include <com/sun/star/frame/XFrame.idl>
-#endif
-
 #ifndef __com_sun_star_ui_XUIElement_idl__
 #include <com/sun/star/ui/XUIElement.idl>
 #endif
@@ -43,10 +39,6 @@
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
-#ifndef __com_sun_star_ui_UIElementType_idl__
-#include <com/sun/star/ui/UIElementType.idl>
-#endif
-
 #ifndef __com_sun_star_lang_XInitialization_idl__
 #include <com/sun/star/lang/XInitialization.idl>
 #endif
@@ -100,7 +92,7 @@ service UIElement
         @see com::sun::star::ui::UIElementFactoryManager;
         @see com::sun::star::ui::UIElementFactory
     */
-    interface ::com::sun::star::lang::XInitialization;
+    [optional] interface ::com::sun::star::lang::XInitialization;
 
     /** used to notify an implementation that it needs to update its visual representation.
 
@@ -109,31 +101,11 @@ service UIElement
         representation. It is up to the implementation if it ignores notifications.
         </p>
     */
-    interface com::sun::star::util::XUpdatable;
+    [optional] interface com::sun::star::util::XUpdatable;
 
     /** controls the life-time of the object.
     */
     interface ::com::sun::star::lang::XComponent;
-
-    /** determines the frame to which this element is bound to.
-
-        <p>
-        The life time of a user interface element does not explicitly depend on the
-        frame itself but on the visible component attached to the frame. It is possible
-        to exchange the visible component of a frame and that will lead to the end of
-        life of all user interface elements.
-    */
-    [readonly, property] com::sun::star::frame::XFrame Frame;
-
-    /** a resource URL which is a unique identifier of a user interface element.
-    */
-    [readonly, property] string ResourceURL;
-
-    /** determines the real type of the user interface element.
-
-        @see UIElementType
-    */
-    [readonly, property] short  Type;
 };
 
 }; }; }; };
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index 1f68a959dce7..a170835ef820 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -39,6 +39,10 @@
 #include <com/sun/star/beans/XPropertySet.idl>
 #endif
 
+#ifndef __com_sun_star_frame_XFrame_idl__
+#include <com/sun/star/frame/XFrame.idl>
+#endif
+
 //=============================================================================
 
 module com { module sun { module star { module ui {
@@ -67,7 +71,26 @@ interface XUIElement : com::sun::star::uno::XInterface
             a special purpose interface which depends on the type of the user
             interface element.
     */
-    com::sun::star::uno::XInterface getRealInterface();
+    ::com::sun::star::uno::XInterface getRealInterface();
+
+    /** determines the document frame to which this element is bound to.
+
+        <p>The life time of a user interface element does not explicitly depend on the
+        frame itself but on the visible component attached to the frame. It is possible
+        to exchange the visible component of a frame and that will lead to the end of
+        life of all user interface elements.</p>
+    */
+    [readonly, attribute] ::com::sun::star::frame::XFrame Frame;
+
+    /** a resource URL which is a unique identifier of a user interface element.
+    */
+    [readonly, attribute] string ResourceURL;
+
+    /** determines the type of the user interface element.
+
+        @see UIElementType
+    */
+    [readonly, attribute] short  Type;
 };
 
 }; }; }; };