offapi: remove obsolete XInplaceLayout (2nd try)

This is related to 10e580c57b907420e8c6d816325445a40a720e4a

8 files changed, 2 insertions, 151 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 )
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 7d5e6a580cdc..082d2422693a 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>
@@ -1248,18 +1246,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 d533eb3cddf4..3edb190500cc 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2519,7 +2519,6 @@ $(eval $(call gb_UnoApi_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/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 0a964a00350f..9ef3da9638fa 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -558,7 +558,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/frame/_XFrameActionListener \
     qadevOOo/tests/java/ifc/frame/_XFrameLoader \
     qadevOOo/tests/java/ifc/frame/_XFramesSupplier \
-    qadevOOo/tests/java/ifc/frame/_XInplaceLayout \
     qadevOOo/tests/java/ifc/frame/_XLayoutManager \
     qadevOOo/tests/java/ifc/frame/_XModel \
     qadevOOo/tests/java/ifc/frame/_XModuleManager \
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 100644
--- 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);
-    }
-}