diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-18 21:29:58 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-18 21:33:05 +0100 |
commit | 5ca858c01cb2e2aa93c8aca65fd271a900785e3f (patch) | |
tree | e2ae751a97ed72921d66510d84f64b49436497f4 | |
parent | a8e35884d26c31cd449a9c615e612360b6c9ec50 (diff) |
offapi: remove obsolete XInplaceLayout
-rw-r--r-- | framework/inc/services/layoutmanager.hxx | 6 | ||||
-rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 14 | ||||
-rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/frame/LayoutManager.idl | 7 | ||||
-rw-r--r-- | offapi/com/sun/star/frame/XInplaceLayout.idl | 68 | ||||
-rwxr-xr-x | qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv | 2 | ||||
-rw-r--r-- | qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java | 48 |
7 files changed, 0 insertions, 146 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 84931a3ed952..9c9d5455381b 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -161,12 +161,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 ) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 0020a2eaf4b6..63a1569b859c 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - // my own includes #include <services/layoutmanager.hxx> #include <helpers.hxx> @@ -34,7 +33,6 @@ #include <services.h> #include <framework/sfxhelperfunctions.hxx> -#include <framework/sfxhelperfunctions.hxx> #include <uielement/menubarwrapper.hxx> #include <framework/addonsoptions.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> @@ -1244,18 +1242,6 @@ 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 //--------------------------------------------------------------------------------------------------------- diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1220adc1734a..b5a696a69d69 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2516,7 +2516,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XFrameSetModel \ XFrames \ XFramesSupplier \ - XInplaceLayout \ XInterceptorInfo \ XLayoutManager \ XLayoutManagerEventBroadcaster \ diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl index aee70e7c7dbd..9e30376ad717 100644 --- a/offapi/com/sun/star/frame/LayoutManager.idl +++ b/offapi/com/sun/star/frame/LayoutManager.idl @@ -32,7 +32,6 @@ #include <com/sun/star/frame/XLayoutManager.idl> #include <com/sun/star/frame/XFrameActionListener.idl> #include <com/sun/star/ui/XUIConfigurationListener.idl> -#include <com/sun/star/frame/XInplaceLayout.idl> #include <com/sun/star/beans/XPropertySet.idl> #include <com/sun/star/frame/XMenuBarMergingAcceptor.idl> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.idl> @@ -100,12 +99,6 @@ service LayoutManager */ [optional] interface ::com::sun::star::frame::XLayoutManagerEventBroadcaster; - /** interface to support settings a menu bar for inplace editing of - components inside OpenOffice.org. - - @deprecated - */ - [optional] interface ::com::sun::star::frame::XInplaceLayout; }; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl deleted file mode 100644 index aeeeadda8e08..000000000000 --- a/offapi/com/sun/star/frame/XInplaceLayout.idl +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __com_sun_star_frame_XInplaceLayout_idl__ -#define __com_sun_star_frame_XInplaceLayout_idl__ - -#include <com/sun/star/uno/XInterface.idl> - -//============================================================================= - -module com { module sun { module star { module frame { - -//============================================================================= - -/** special interface to support inplace editing of components inside - OpenOffice.org. - - @deprecated - - @since OOo 2.0 -*/ - -interface XInplaceLayout : com::sun::star::uno::XInterface -{ - /** sets an inplace menu to the container window of the attached frame. - - @param InplaceMenuBarPointer - must be a VCL menu bar pointer which is accessible within the - layout manager process. - */ - void setInplaceMenuBar( [in] hyper InplaceMenuBarPointer ); - - /** removes an inplace menu and sets back a previously created menu bar if one - has been set before. - */ - void resetInplaceMenuBar(); -}; - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv b/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv index af47fcb9f0dd..f45c6bcc32d6 100755 --- a/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv +++ b/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv @@ -1,6 +1,4 @@ "LayoutManager";"com::sun::star::lang::XEventListener";"disposing()" -"LayoutManager";"com::sun::star::frame::XInplaceLayout#optional";"setInplaceMenuBar()" -"LayoutManager";"com::sun::star::frame::XInplaceLayout#optional";"resetInplaceMenuBar()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"attachFrame()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"reset()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"getCurrentDockingArea()" diff --git a/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java b/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java deleted file mode 100644 index 2d644d2b2391..000000000000 --- a/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package ifc.frame; - -import com.sun.star.frame.XInplaceLayout; -import lib.MultiMethodTest; - -public class _XInplaceLayout extends MultiMethodTest { - public XInplaceLayout oObj = null; - - public void _setInplaceMenuBar() { - log.print("This method exists for inplace editing with own modules. "); - log.println("It makes no sense to call it from Java."); -// oObj.setInplaceMenuBar(l); - tRes.tested("setInplaceMenuBar()", true); - } - - public void _resetInplaceMenuBar() { - requiredMethod("setInplaceMenuBar()"); - oObj.resetInplaceMenuBar(); - tRes.tested("resetInplaceMenuBar()", true); - } -} |