diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-07 15:48:46 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-08 07:41:31 +0100 |
commit | 0d43023ed4bc14207b9ba15367b123f2af739d1b (patch) | |
tree | 8f0e98a84a90557bd19b3fa9feef531192daa62d /include | |
parent | c16969b9bc73fdd77e763299d6aea7b614e203e2 (diff) |
move some headers inside framework
Change-Id: Ia005938c6a3a954eba910981dde5010a1f977fca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88201
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/framework/addonmenu.hxx | 86 | ||||
-rw-r--r-- | include/framework/menuconfiguration.hxx | 110 | ||||
-rw-r--r-- | include/framework/statusbarconfiguration.hxx | 52 | ||||
-rw-r--r-- | include/framework/toolboxconfiguration.hxx | 52 |
4 files changed, 0 insertions, 300 deletions
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx deleted file mode 100644 index 4e8c1f24f9d8..000000000000 --- a/include/framework/addonmenu.hxx +++ /dev/null @@ -1,86 +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_ADDONMENU_HXX -#define INCLUDED_FRAMEWORK_ADDONMENU_HXX - -#include <rtl/ustring.hxx> -#include <vcl/vclptr.hxx> - -#include <framework/fwedllapi.h> - -namespace com::sun::star::beans { struct PropertyValue; } -namespace com::sun::star::frame { class XFrame; } -namespace com::sun::star::uno { template <class E> class Sequence; } -namespace com::sun::star::uno { template <typename > class Reference; } - -class MenuBar; -class PopupMenu; - -#define ADDONMENU_ITEMID_START 2000 -#define ADDONMENU_ITEMID_END 3000 - -namespace framework -{ - -class FWE_DLLPUBLIC AddonMenuManager -{ - public: - static bool HasAddonMenuElements(); - - // Check if the context string matches the provided xModel context - static bool IsCorrectContext(const OUString& rModuleIdentifier, const OUString& rContext); - - // Create the Add-Ons menu - static VclPtr<PopupMenu> CreateAddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame ); - - // Merge the Add-Ons help menu items into the given menu bar at a defined pos - static void MergeAddonHelpMenu( const css::uno::Reference< css::frame::XFrame >& rFrame, - MenuBar const * pMergeMenuBar ); - - // Merge the addon popup menus into the given menu bar at the provided pos. - static void MergeAddonPopupMenus( const css::uno::Reference< css::frame::XFrame >& rFrame, - sal_uInt16 nMergeAtPos, - MenuBar* pMergeMenuBar ); - - // Returns the next position to insert a menu item/sub menu - static sal_uInt16 GetNextPos( sal_uInt16 nPos ); - - // Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType. - static void BuildMenu( PopupMenu* pCurrentMenu, - sal_uInt16 nInsPos, - sal_uInt16& nUniqueMenuId, - const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& aAddonMenuDefinition, - const css::uno::Reference< css::frame::XFrame >& rFrame, - const OUString& rModuleIdentifier ); - - // Retrieve the menu entry property values from a sequence - static void GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry, - OUString& rTitle, - OUString& rURL, - OUString& rTarget, - OUString& rImageId, - OUString& rContext, - css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rAddonSubMenu ); -}; - -} // namespace framework - -#endif // INCLUDED_FRAMEWORK_ADDONMENU_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx deleted file mode 100644 index b1a49249061b..000000000000 --- a/include/framework/menuconfiguration.hxx +++ /dev/null @@ -1,110 +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_MENUCONFIGURATION_HXX -#define INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX - -#include <framework/fwedllapi.h> - -#include <cppuhelper/weakref.hxx> - -namespace com::sun::star::container { class XIndexAccess; } -namespace com::sun::star::frame { class XDispatchProvider; } -namespace com::sun::star::io { class XInputStream; } -namespace com::sun::star::io { class XOutputStream; } -namespace com::sun::star::uno { class XComponentContext; } - -const sal_uInt16 START_ITEMID_WINDOWLIST = 4600; -const sal_uInt16 END_ITEMID_WINDOWLIST = 4699; -const sal_uInt16 ITEMID_ADDONLIST = 6678; // used to be a SID in sfx2, now just a unique id... - -namespace framework -{ - -struct FWE_DLLPUBLIC MenuAttributes -{ -private: - oslInterlockedCount refCount; - - MenuAttributes(const OUString& rFrame, const OUString& rImageIdStr) - : refCount(0) - , aTargetFrame(rFrame) - , aImageId(rImageIdStr) - { - } - - MenuAttributes(const css::uno::WeakReference<css::frame::XDispatchProvider>& rDispatchProvider) - : refCount(0) - , xDispatchProvider(rDispatchProvider) - { - } - - MenuAttributes(const MenuAttributes&) = delete; - -public: - OUString aTargetFrame; - OUString aImageId; - css::uno::WeakReference<css::frame::XDispatchProvider> xDispatchProvider; - - static void* CreateAttribute(const OUString& rFrame, const OUString& rImageIdStr); - static void* CreateAttribute(const css::uno::WeakReference<css::frame::XDispatchProvider>& rDispatchProvider); - static void ReleaseAttribute(void* nAttributePtr); - - void acquire() - { - osl_atomic_increment(&refCount); - } - - void release() - { - if (!osl_atomic_decrement(&refCount)) - delete this; - } -}; - -class FWE_DLLPUBLIC MenuConfiguration final -{ -public: - MenuConfiguration( - // use const when giving a UNO reference by reference - const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - - ~MenuConfiguration(); - - /// @throws css::lang::WrappedTargetException - /// @throws css::uno::RuntimeException - css::uno::Reference< css::container::XIndexAccess > CreateMenuBarConfigurationFromXML( - css::uno::Reference< css::io::XInputStream > const & rInputStream ); - - /// @throws css::lang::WrappedTargetException - /// @throws css::uno::RuntimeException - void StoreMenuBarConfigurationToXML( - css::uno::Reference< css::container::XIndexAccess > const & rMenuBarConfiguration, - css::uno::Reference< css::io::XOutputStream > const & rOutputStream, - bool bIsMenuBar ); - -private: - css::uno::Reference< css::uno::XComponentContext> m_xContext; -}; - -} - -#endif // INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx deleted file mode 100644 index ff201cfee448..000000000000 --- a/include/framework/statusbarconfiguration.hxx +++ /dev/null @@ -1,52 +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_STATUSBARCONFIGURATION_HXX -#define INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX - -#include <framework/fwedllapi.h> - -namespace com::sun::star::container { class XIndexAccess; } -namespace com::sun::star::container { class XIndexContainer; } -namespace com::sun::star::io { class XInputStream; } -namespace com::sun::star::io { class XOutputStream; } -namespace com::sun::star::uno { class XComponentContext; } -namespace com::sun::star::uno { template <typename > class Reference; } - -namespace framework -{ - -class FWE_DLLPUBLIC StatusBarConfiguration -{ - public: - static bool LoadStatusBar( - const css::uno::Reference< css::uno::XComponentContext >& xContext, - const css::uno::Reference< css::io::XInputStream >& xInputStream, - const css::uno::Reference< css::container::XIndexContainer >& rStatusbarConfiguration ); - - static bool StoreStatusBar( - const css::uno::Reference< css::uno::XComponentContext >& xContext, - const css::uno::Reference< css::io::XOutputStream >& xOutputStream, - const css::uno::Reference< css::container::XIndexAccess >& rStatusbarConfiguration ); -}; - -} // namespace framework - -#endif // INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx deleted file mode 100644 index 2362bcc60aba..000000000000 --- a/include/framework/toolboxconfiguration.hxx +++ /dev/null @@ -1,52 +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_TOOLBOXCONFIGURATION_HXX -#define INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX - -#include <framework/fwedllapi.h> - -namespace com::sun::star::container { class XIndexAccess; } -namespace com::sun::star::container { class XIndexContainer; } -namespace com::sun::star::io { class XInputStream; } -namespace com::sun::star::io { class XOutputStream; } -namespace com::sun::star::uno { class XComponentContext; } -namespace com::sun::star::uno { template <typename > class Reference; } - -namespace framework -{ - -class FWE_DLLPUBLIC ToolBoxConfiguration -{ - public: - static bool LoadToolBox( - const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::io::XInputStream >& rInputStream, - const css::uno::Reference< css::container::XIndexContainer >& rToolbarConfiguration ); - - static bool StoreToolBox( - const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const css::uno::Reference< css::io::XOutputStream >& rOutputStream, - const css::uno::Reference< css::container::XIndexAccess >& rToolbarConfiguration ); -}; - -} // namespace framework - -#endif // INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |