From ce8f0a7e7205e70e7ec5f1be0024e52903fdec7a Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 16 Nov 2011 23:26:51 +0100 Subject: Removing the last remnants of layout - sorry to see it go :-( --- offapi/UnoApi_offapi.mk | 5 -- offapi/com/sun/star/awt/XLayoutContainer.idl | 77 ------------------------ offapi/com/sun/star/awt/XLayoutFlow.idl | 32 ---------- offapi/com/sun/star/awt/XLayoutFlowContainer.idl | 27 --------- offapi/com/sun/star/awt/XLayoutRoot.idl | 27 --------- offapi/com/sun/star/awt/XLayoutUnit.idl | 29 --------- 6 files changed, 197 deletions(-) delete mode 100644 offapi/com/sun/star/awt/XLayoutContainer.idl delete mode 100644 offapi/com/sun/star/awt/XLayoutFlow.idl delete mode 100644 offapi/com/sun/star/awt/XLayoutFlowContainer.idl delete mode 100644 offapi/com/sun/star/awt/XLayoutRoot.idl delete mode 100644 offapi/com/sun/star/awt/XLayoutUnit.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index c56b83bff6c5..8cd2ecfa59ed 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -356,7 +356,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/a UnoControlThrobberModel \ UnoControlTimeField \ UnoControlTimeFieldModel \ - XLayoutFlowContainer \ )) $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\ UnoControlGrid \ @@ -1706,10 +1705,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\ XKeyHandler \ XKeyListener \ XLayoutConstrains \ - XLayoutContainer \ - XLayoutFlow \ - XLayoutRoot \ - XLayoutUnit \ XListBox \ XMenu \ XMenuBar \ diff --git a/offapi/com/sun/star/awt/XLayoutContainer.idl b/offapi/com/sun/star/awt/XLayoutContainer.idl deleted file mode 100644 index 76d16055d721..000000000000 --- a/offapi/com/sun/star/awt/XLayoutContainer.idl +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef __com_sun_star_awt_XLayoutContainer_idl__ -#define __com_sun_star_awt_XLayoutContainer_idl__ - -#include -#include -#include -#include -#include -#include - -//============================================================================= - -module com { module sun { module star { module awt { - -//============================================================================= - -interface XLayoutUnit; - -/** specifies the layout constraints for a surrounding container. - - @since OOo 3.0 - */ -interface XLayoutContainer: com::sun::star::container::XChild -{ - /** Adds a child. Some containers provide an interface for - adding children which you should use. */ - void addChild( [in] com::sun::star::awt::XLayoutConstrains Child ) - raises( com::sun::star::awt::MaxChildrenException ); - - /** Remove a child. Some containers provide an interface for - adding children which you should use. - */ - void removeChild( [in] com::sun::star::awt::XLayoutConstrains Child ); - - /** Returns a sequence of the children of this container. */ - sequence< com::sun::star::awt::XLayoutConstrains > getChildren(); - - /** Read/modify some child layout properties. XPropertySet provides a - rich API that allows, e.g., for introspection. - Should rarely be a need to use; containers shall provide an interface - for setting properties more comfortably. */ - com::sun::star::beans::XPropertySet getChildProperties( - [in] com::sun::star::awt::XLayoutConstrains Child ); - - /** Set at initialization, this object should be notified when a containers state - changes, that may affect its size, to queue a layout re-calculation. */ - void setLayoutUnit( [in] com::sun::star::awt::XLayoutUnit Unit ); - - // TEMP: no need for this... - com::sun::star::awt::XLayoutUnit getLayoutUnit(); - - /** To be used by the parent for the purpose of layout management. - For widgets, use XWindow::setPosSize() */ - void allocateArea( [in] com::sun::star::awt::Rectangle NewArea ); - - /** Used by the layouting unit to evaluate size damage, and force a - re-allocation. */ - com::sun::star::awt::Size getRequestedSize(); - - /** Used by the layouting unit to evaluate size damage, and force a - re-allocation. */ - com::sun::star::awt::Rectangle getAllocatedArea(); - - /** For flow layouting (e.g. wrap-able labels). TODO: We might want to - re-design this approach -- check XLayoutConstrains::calcAdjustedSize(). */ - long getHeightForWidth( [in] long Width ); - - /** For flow layouting (e.g. wrap-able labels). TODO: We might want to - re-design this approach -- check XLayoutConstrains::calcAdjustedSize(). */ - boolean hasHeightForWidth(); -}; - -//============================================================================= - -}; }; }; }; - -#endif diff --git a/offapi/com/sun/star/awt/XLayoutFlow.idl b/offapi/com/sun/star/awt/XLayoutFlow.idl deleted file mode 100644 index fa67142524f8..000000000000 --- a/offapi/com/sun/star/awt/XLayoutFlow.idl +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __com_sun_star_awt_XLayoutFlow_idl__ -#define __com_sun_star_awt_XLayoutFlow_idl__ - -//============================================================================= - -#include - -module com { module sun { module star { module awt { - -//============================================================================= - -/** Enables height-for-width layout negotiations, which allows for label wrapping - and flow containers. Can be implemented by either a container or an ordinary widget; - whether its parent will honor it is another story, so keep implementing - getMinimumSize(). - - @since OOo 3.0 - */ -interface XLayoutFlow -{ - /** returns the preferred height this layout element would need for the given width. */ - long getHeightForWidth( [in] long Width ); - - /** Allow the container/widget to toggle the functionality. */ - boolean hasHeightForWidth(); -}; - -//============================================================================= - -}; }; }; }; - -#endif diff --git a/offapi/com/sun/star/awt/XLayoutFlowContainer.idl b/offapi/com/sun/star/awt/XLayoutFlowContainer.idl deleted file mode 100644 index 45685964d488..000000000000 --- a/offapi/com/sun/star/awt/XLayoutFlowContainer.idl +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __com_sun_star_awt_XLayoutUnit_idl__ -#define __com_sun_star_awt_XLayoutUnit_idl__ - -#include - -//============================================================================= - -module com { module sun { module star { module awt { - -//============================================================================= - -/** Responsible to evaluate size damages and force a re-calculation. Containers - should let it know of state changes that may affects their size. - All children of a top-level window should share the same object. - - @since OOo 3.0 - */ -interface XLayoutContainer -{ - void queueResize( [in] com::sun::star::awt::XLayoutContainer Container ); -}; - -//============================================================================= - -}; }; }; }; - -#endif diff --git a/offapi/com/sun/star/awt/XLayoutRoot.idl b/offapi/com/sun/star/awt/XLayoutRoot.idl deleted file mode 100644 index 064a2b41218c..000000000000 --- a/offapi/com/sun/star/awt/XLayoutRoot.idl +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __com_sun_star_awt_XLayoutRoot_idl__ -#define __com_sun_star_awt_XLayoutRoot_idl__ - -#include -#include -#include - -//============================================================================= - -module com { module sun { module star { module awt { - -//============================================================================= - -/** specifies an interface for a top-level layoutable widget - - @since OOo 3.0 -*/ -interface XLayoutRoot: com::sun::star::container::XNameAccess -{ - com::sun::star::awt::XLayoutContainer getLayoutContainer(); -}; - -//============================================================================= - -}; }; }; }; - -#endif diff --git a/offapi/com/sun/star/awt/XLayoutUnit.idl b/offapi/com/sun/star/awt/XLayoutUnit.idl deleted file mode 100644 index a3bcd8ea4261..000000000000 --- a/offapi/com/sun/star/awt/XLayoutUnit.idl +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __com_sun_star_awt_XLayoutUnit_idl__ -#define __com_sun_star_awt_XLayoutUnit_idl__ - -#include - -//============================================================================= - -module com { module sun { module star { module awt { - -//============================================================================= - -interface XLayoutContainer; - -/** Responsible to evaluate size damages and force a re-calculation. Containers - should let it know of state changes that may affects their size. - All children of a top-level window should share the same object. - - @since OOo 3.0 - */ -interface XLayoutUnit -{ - void queueResize( [in] com::sun::star::awt::XLayoutContainer Container ); -}; - -//============================================================================= - -}; }; }; }; - -#endif -- cgit