Revert "offapi: remove obsolete XInplaceLayout"

This reverts commit 5ca858c0.

This change implicates some more changes in layoutmanager.hxx
see ::cppu::WeakImplHelper8. So keep it...

framework/inc/services/layoutmanager.hxx

@@ -160,6 +160,12 @@ namespace framework
             virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (::com::sun::star::uno::RuntimeException);
             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
             //---------------------------------------------------------------------------------------------------------

framework/source/layoutmanager/layoutmanager.cxx

@@ -26,12 +26,14 @@
  *
  ************************************************************************/
 
+
 //      my own includes
 #include <services/layoutmanager.hxx>
 #include <helpers.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <services.h>
 
+#include <framework/sfxhelperfunctions.hxx>
 #include <framework/sfxhelperfunctions.hxx>
 #include <uielement/menubarwrapper.hxx>
 #include <framework/addonsoptions.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
 //---------------------------------------------------------------------------------------------------------

offapi/UnoApi_offapi.mk

@@ -2516,6 +2516,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\
 	XFrameSetModel \
 	XFrames \
 	XFramesSupplier \
+	XInplaceLayout \
 	XInterceptorInfo \
 	XLayoutManager \
 	XLayoutManagerEventBroadcaster \

offapi/com/sun/star/frame/LayoutManager.idl

@@ -32,6 +32,7 @@
 #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>
@@ -99,6 +100,12 @@ 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;
 };
 
 }; }; }; };

offapi/com/sun/star/frame/XInplaceLayout.idl

+/* -*- 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: */

qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv

 "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()"

qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java

+/*************************************************************************
+ *
+ * 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);
+    }
+}