diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-18 22:16:30 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-18 22:16:30 +0100 |
| commit | 10e580c57b907420e8c6d816325445a40a720e4a (patch) | |
| tree | 1037bbab931cd2164cbc6d1d8f594f85b7a872de /framework | |
| parent | f081f1be7ead2beff742eccf9955ebd9437203f8 (diff) | |
Revert "offapi: remove obsolete XInplaceLayout"
This reverts commit 5ca858c01cb2e2aa93c8aca65fd271a900785e3f.
This change implicates some more changes in layoutmanager.hxx
see ::cppu::WeakImplHelper8. So keep it...
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 6 | ||||
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 9c9d5455381b..84931a3ed952 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -161,6 +161,12 @@ 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 ) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 63a1569b859c..0020a2eaf4b6 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ + // my own includes #include <services/layoutmanager.hxx> #include <helpers.hxx> @@ -33,6 +34,7 @@ #include <services.h> #include <framework/sfxhelperfunctions.hxx> +#include <framework/sfxhelperfunctions.hxx> #include <uielement/menubarwrapper.hxx> #include <framework/addonsoptions.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> @@ -1242,6 +1244,18 @@ throw (RuntimeException) implts_reset( sal_True ); } +void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 ) +throw (uno::RuntimeException) +{ + OSL_FAIL( "This method is obsolete and should not be used!\n" ); +} + +void SAL_CALL LayoutManager::resetInplaceMenuBar() +throw (uno::RuntimeException) +{ + OSL_FAIL( "This method is obsolete and should not be used!\n" ); +} + //--------------------------------------------------------------------------------------------------------- // XMenuBarMergingAcceptor //--------------------------------------------------------------------------------------------------------- |