From f4bccae9eb48d36de9edd1fa5551e5e8de85b17e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 20 May 2013 17:18:56 +0100 Subject: Revert "fdo#46808, Adapt frame::PopupMenuControllerFactory UNO service" This reverts commit e93a0018871ebea4da1959c72c06f3c7f4dc7b27. Conflicts: desktop/source/app/app.cxx framework/source/uielement/menubarmanager.cxx framework/source/uielement/popupmenucontroller.cxx offapi/UnoApi_offapi.mk Change-Id: I3d4d49f98603e75357fb315a603a10851b3a7090 --- offapi/UnoApi_offapi.mk | 3 +- .../sun/star/frame/PopupMenuControllerFactory.idl | 28 +++++++++- .../sun/star/frame/XToolbarControllerFactory.idl | 65 ---------------------- 3 files changed, 27 insertions(+), 69 deletions(-) delete mode 100644 offapi/com/sun/star/frame/XToolbarControllerFactory.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 91c31c42d9ca..395d5412073a 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -198,7 +198,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ GlobalEventBroadcaster \ MediaTypeDetectionHelper \ ModuleManager \ - PopupMenuControllerFactory \ SessionListener \ StartModule \ TaskCreator \ @@ -942,6 +941,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ FramesContainer \ LayoutManager \ PopupMenuController \ + PopupMenuControllerFactory \ ProtocolHandler \ SessionManager \ Settings \ @@ -2630,7 +2630,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XTitleChangeBroadcaster \ XTitleChangeListener \ XToolbarController \ - XToolbarControllerFactory \ XToolbarControllerListener \ XTransientDocumentsDocumentContentFactory \ XUIControllerRegistration \ diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl index 674112b66cc7..03e0fd8098a6 100644 --- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl +++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl @@ -20,7 +20,8 @@ #ifndef __com_sun_star_frame_PopupMenuControllerFactory_idl__ #define __com_sun_star_frame_PopupMenuControllerFactory_idl__ -#include +#include +#include module com { module sun { module star { module frame { @@ -37,7 +38,30 @@ module com { module sun { module star { module frame { @since OOo 2.0 */ -service PopupMenuControllerFactory : XToolbarControllerFactory; +service PopupMenuControllerFactory +{ + /** this interface provides functions to create new instances of a registered pop-up menu controller. + +

+ Use XMultiComponentFactory::createInstanceWithArguments() to create + a new pop-up menu controller instance. Use the CommandURL as the service specifier. + + This call supports the following arguments provided as PropertyValue: +

    +
  • Frame
    specifies the XFrame + instance to which the pop-up menu controller belongs to. This property must be provided to + the pop-up menu controller, otherwise it cannot dispatch its internal commands.
    • +
  • ModuleIdentifier
    optional string that specifies in which module context the pop-up menu + controller should be created.
    • +
+

+ */ + interface com::sun::star::lang::XMultiComponentFactory; + + /** provides functions to query for, register and deregister a pop-up menu controller. + */ + interface com::sun::star::frame::XUIControllerRegistration; +}; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XToolbarControllerFactory.idl b/offapi/com/sun/star/frame/XToolbarControllerFactory.idl deleted file mode 100644 index 8f3ac8ce0d4d..000000000000 --- a/offapi/com/sun/star/frame/XToolbarControllerFactory.idl +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef __com_sun_star_frame_XToolbarControllerFactory_idl__ -#define __com_sun_star_frame_XToolbarControllerFactory_idl__ - -#include -#include - - -module com { module sun { module star { module frame { - - -/** Provides a unified interface for the new-style PopupMenuControllerFactory service to implement. - - @since LibreOffice 4.1 -*/ - -interface XToolbarControllerFactory -{ - /** this interface provides functions to create new instances of a registered pop-up menu controller. - -

- Use XMultiComponentFactory::createInstanceWithArguments() to create - a new pop-up menu controller instance. Use the CommandURL as the service specifier. - - This call supports the following arguments provided as PropertyValue: -

    -
  • Frame
    specifies the XFrame - instance to which the pop-up menu controller belongs to. This property must be provided to - the pop-up menu controller, otherwise it cannot dispatch its internal commands.
    • -
  • ModuleIdentifier
    optional string that specifies in which module context the pop-up menu - controller should be created.
    • -
-

- */ - interface com::sun::star::lang::XMultiComponentFactory; - - /** provides functions to query for, register and deregister a pop-up menu controller. - */ - interface com::sun::star::frame::XUIControllerRegistration; -}; - -}; }; }; }; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3