diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-05-20 17:09:47 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-21 16:29:33 +0100 |
commit | e9679a4a769e1edcc9c41c96de5739286323be79 (patch) | |
tree | 8b8b41711c9cf079ab5f75857086b63d2b0aab64 | |
parent | 7131fe8dd10a5b3b4e501e3379a95320313382db (diff) |
Revert "fdo#46808, Create new-style frame::ToolBarControllerFactory service"
This reverts commit ecae523d9603eaf7ff0acc98682576813e50c94a.
Conflicts:
framework/source/uielement/toolbarmanager.cxx
offapi/UnoApi_offapi.mk
Change-Id: I9f5fe49ffdf3176f0d742d28277c4ec2afbc1ed4
-rw-r--r-- | framework/inc/services.h | 1 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 1 | ||||
-rw-r--r-- | framework/source/uifactory/toolbarcontrollerfactory.cxx | 2 | ||||
-rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/frame/ToolBarControllerFactory.idl | 41 |
5 files changed, 2 insertions, 44 deletions
diff --git a/framework/inc/services.h b/framework/inc/services.h index cd3eb2b6ca22..a4bd093c6ee5 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -45,6 +45,7 @@ namespace framework{ #define SERVICENAME_MODULEACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.ModuleAcceleratorConfiguration") #define SERVICENAME_DOCUMENTACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.DocumentAcceleratorConfiguration") #define SERVICENAME_TOOLBARFACTORY DECLARE_ASCII("com.sun.star.ui.ToolBarFactory" ) +#define SERVICENAME_TOOLBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.ToolBarControllerFactory" ) #define SERVICENAME_LICENSE SERVICENAME_JOB #define SERVICENAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.ui.StatusBarFactory" ) #define SERVICENAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.StatusbarControllerFactory" ) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index b8ca9bdf206a..ca4e2cfc3a99 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/UICommandDescription.hpp> -#include <com/sun/star/frame/ToolBarControllerFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx index 76c23060f3cd..592b89c1f07e 100644 --- a/framework/source/uifactory/toolbarcontrollerfactory.cxx +++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx @@ -53,7 +53,7 @@ namespace framework //***************************************************************************************************************** DEFINE_XSERVICEINFO_ONEINSTANCESERVICE ( ToolbarControllerFactory , ::cppu::OWeakObject , - DECLARE_ASCII("com.sun.star.frame.ToolBarControllerFactory"), + SERVICENAME_TOOLBARCONTROLLERFACTORY , IMPLEMENTATIONNAME_TOOLBARCONTROLLERFACTORY ) diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index ac61fc68f639..91c31c42d9ca 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -201,7 +201,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ PopupMenuControllerFactory \ SessionListener \ StartModule \ - ToolBarControllerFactory \ TaskCreator \ UICommandDescription \ )) diff --git a/offapi/com/sun/star/frame/ToolBarControllerFactory.idl b/offapi/com/sun/star/frame/ToolBarControllerFactory.idl deleted file mode 100644 index 8b62631253b5..000000000000 --- a/offapi/com/sun/star/frame/ToolBarControllerFactory.idl +++ /dev/null @@ -1,41 +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_ToolBarControllerFactory_idl__ -#define __com_sun_star_frame_ToolBarControllerFactory_idl__ - -#include <com/sun/star/frame/XUIControllerRegistration.idl> - - -module com { module sun { module star { module frame { - - -/** - This interface could be incomplete since I derived it from it's sole place of use. - - @since LibreOffice 4.1 - */ -service ToolBarControllerFactory : XUIControllerRegistration; - -}; }; }; }; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |