diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-03 16:43:28 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-03 19:08:17 +0200 |
commit | 96300e3292217a7c1f3ab2a302be7c7ace445e81 (patch) | |
tree | 71a013f0a7c53d13d7900617b2b7beae72f95805 /framework | |
parent | eb77037ea1aa8a388be6d14ed744f46638db0202 (diff) |
Remove leftover framework/inc/uielement/notebookbarmenucontroller.hxx
...after 5c573a2f7473bae7bb965ca36557cd1b0bf7b9c9 "tdf#115131 made a common
submenu for toolbars and notebookbars"
Change-Id: Ic1713fa1173a8dbb1bcc971c30d0df4549c825a9
Reviewed-on: https://gerrit.libreoffice.org/52331
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/uielement/notebookbarmenucontroller.hxx | 87 | ||||
-rw-r--r-- | framework/source/register/registertemp.cxx | 1 |
2 files changed, 0 insertions, 88 deletions
diff --git a/framework/inc/uielement/notebookbarmenucontroller.hxx b/framework/inc/uielement/notebookbarmenucontroller.hxx deleted file mode 100644 index d06b84f766b8..000000000000 --- a/framework/inc/uielement/notebookbarmenucontroller.hxx +++ /dev/null @@ -1,87 +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 INCLUDED_FRAMEWORK_INC_UIELEMENT_NOTEBOOKBARMENUCONTROLLER_HXX -#define INCLUDED_FRAMEWORK_INC_UIELEMENT_NOTEBOOKBARMENUCONTROLLER_HXX - -#include <macros/xserviceinfo.hxx> -#include <stdtypes.h> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XDispatch.hpp> - -#include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> -#include <rtl/ustring.hxx> - -#include <vector> - -namespace framework -{ - class NotebookbarMenuController : public svt::PopupMenuControllerBase - { - using svt::PopupMenuControllerBase::disposing; - - public: - NotebookbarMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~NotebookbarMenuController() override; - - // XServiceInfo - DECLARE_XSERVICEINFO_NOFACTORY - /* Helper for registry */ - /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); - static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); - - // XPopupMenuController - virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) override; - - // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; - - // XMenuListener - virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override; - virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) override; - - // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; - - struct ExecuteInfo - { - css::uno::Reference< css::frame::XDispatch > xDispatch; - css::util::URL aTargetURL; - css::uno::Sequence< css::beans::PropertyValue > aArgs; - }; - - DECL_STATIC_LINK( NotebookbarMenuController, ExecuteHdl_Impl, void*, void ); - - private: - void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu ); - - css::uno::Reference< css::uno::XComponentContext > m_xContext; - }; -} - -#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_NOTEBOOKBARMENUCONTROLLER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index c7a6000acbbc..35add0a5ef31 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -51,7 +51,6 @@ #include <uielement/newmenucontroller.hxx> #include <uielement/toolbarmodemenucontroller.hxx> #include <uielement/toolbarsmenucontroller.hxx> -#include <uielement/notebookbarmenucontroller.hxx> COMPONENTGETFACTORY ( fwl, IFFACTORY( ::framework::MediaTypeDetectionHelper ) |