diff options
-rw-r--r-- | include/framework/eventsconfiguration.hxx | 42 | ||||
-rw-r--r-- | include/framework/menuconfiguration.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/config/evntconf.cxx | 1 |
3 files changed, 0 insertions, 46 deletions
diff --git a/include/framework/eventsconfiguration.hxx b/include/framework/eventsconfiguration.hxx deleted file mode 100644 index 1d807f405819..000000000000 --- a/include/framework/eventsconfiguration.hxx +++ /dev/null @@ -1,42 +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_EVENTSCONFIGURATION_HXX -#define INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX - -#include <framework/fwedllapi.h> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -namespace framework -{ - -struct FWE_DLLPUBLIC EventsConfig -{ - css::uno::Sequence< OUString > aEventNames; - css::uno::Sequence< css::uno::Any > aEventsProperties; -}; - -} // namespace framework - -#endif // INCLUDED_FRAMEWORK_EVENTSCONFIGURATION_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index 2a0ec2d53bd6..2d00c075f998 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -65,14 +65,12 @@ private: : refCount(0) , aTargetFrame(rFrame) , aImageId(rImageIdStr) - , nStyle(0) { } MenuAttributes(const css::uno::WeakReference<css::frame::XDispatchProvider>& rDispatchProvider) : refCount(0) , xDispatchProvider(rDispatchProvider) - , nStyle(0) { } @@ -82,7 +80,6 @@ public: OUString aTargetFrame; OUString aImageId; css::uno::WeakReference<css::frame::XDispatchProvider> xDispatchProvider; - sal_Int16 nStyle; static sal_uIntPtr CreateAttribute(const OUString& rFrame, const OUString& rImageIdStr); static sal_uIntPtr CreateAttribute(const css::uno::WeakReference<css::frame::XDispatchProvider>& rDispatchProvider); diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 19b3829b98e2..7613a9ab41cb 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -30,7 +30,6 @@ #include <rtl/ustring.h> #include <com/sun/star/uno/Any.hxx> -#include <framework/eventsconfiguration.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/evntconf.hxx> |