diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-04-12 11:03:22 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-04-12 11:39:13 +0200 |
| commit | 3030a3a52f9bd89a055f65a2c5033be028da3cc2 (patch) | |
| tree | f4ef46cd78b07501aa9a0e05465253df3d2f294e /framework/inc/services | |
| parent | 5bce9624d10e9b22a0764884c88c5951aa6a26fe (diff) | |
offapi: remove obsolete XInplaceLayout (2nd try)
This is related to 10e580c57b907420e8c6d816325445a40a720e4a
Diffstat (limited to 'framework/inc/services')
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index e9eea8d85455..09be6017aa2b 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -67,7 +67,6 @@ #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> -#include <com/sun/star/frame/XInplaceLayout.hpp> #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/awt/XTopWindow2.hpp> #include <com/sun/star/awt/XDockableWindow.hpp> @@ -79,7 +78,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/implbase8.hxx> +#include <cppuhelper/implbase7.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/propertycontainer.hxx> #include <tools/wintypes.hxx> @@ -96,12 +95,11 @@ namespace framework { class InfoHelperBuilder; } - typedef ::cppu::WeakImplHelper8 < ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakImplHelper7 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::frame::XLayoutManager , ::com::sun::star::awt::XWindowListener , ::com::sun::star::frame::XFrameActionListener , ::com::sun::star::ui::XUIConfigurationListener - , ::com::sun::star::frame::XInplaceLayout , ::com::sun::star::frame::XMenuBarMergingAcceptor , ::com::sun::star::frame::XLayoutManagerEventBroadcaster > LayoutManager_Base; @@ -161,12 +159,6 @@ namespace framework virtual sal_Bool SAL_CALL isVisible() throw (::com::sun::star::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // XInplaceLayout - //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL setInplaceMenuBar( sal_Int64 pInplaceMenuBarPointer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL resetInplaceMenuBar( ) throw (::com::sun::star::uno::RuntimeException); - - //--------------------------------------------------------------------------------------------------------- // XMenuBarMergingAcceptor //--------------------------------------------------------------------------------------------------------- virtual sal_Bool SAL_CALL setMergedMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar ) |