diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-18 22:44:39 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-19 01:39:21 +0200 |
commit | 8cd6dd0a35b1c531ddb5010a3dea84f91f2ffb40 (patch) | |
tree | 3fa8a51d0d6e390c7847fecc19ab655839d3c164 /include | |
parent | ac00b3c256933e667f022a49854a05e40e3d0630 (diff) |
Kill .src based Writer context menus
Change-Id: I854e2dd48b2f59b561c0d0cd3e52297046d25b96
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/sfxcommands.h | 3 | ||||
-rw-r--r-- | include/svx/SmartTagCtl.hxx | 79 | ||||
-rw-r--r-- | include/svx/svxcommands.h | 2 |
3 files changed, 0 insertions, 84 deletions
diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h index 3769ea9853e8..bcfa15d42c22 100644 --- a/include/sfx2/sfxcommands.h +++ b/include/sfx2/sfxcommands.h @@ -36,9 +36,6 @@ #define CMD_SID_OPENDOC ".uno:Open" #define CMD_SID_GALLERY_BG_BRUSH ".uno:BackgroundImage" #define CMD_SID_PASTE ".uno:Paste" -#define CMD_SID_PASTE_SPECIAL ".uno:PasteSpecial" -#define CMD_SID_PASTE_UNFORMATTED ".uno:PasteUnformatted" -#define CMD_SID_PRINTPREVIEW ".uno:PrintPreview" #define CMD_SID_RELOAD ".uno:Reload" #define CMD_SID_BASICIDE_RENAMECURRENT ".uno:RenameCurrent" #define CMD_SID_UNICODE_NOTATION_TOGGLE ".uno:UnicodeNotationToggle" diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx deleted file mode 100644 index 458966d54f7b..000000000000 --- a/include/svx/SmartTagCtl.hxx +++ /dev/null @@ -1,79 +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_SVX_SMARTTAGCTL_HXX -#define INCLUDED_SVX_SMARTTAGCTL_HXX - -#include <tools/link.hxx> -#include <sfx2/mnuitem.hxx> -#include <svx/svxdllapi.h> -#include <com/sun/star/uno/Reference.hxx> - -#include <memory> -#include <vector> - -class SfxBindings; -class SvxSmartTagItem; -class PopupMenu; - -namespace com { namespace sun { namespace star { namespace smarttags { - class XSmartTagAction; -} } } } - -namespace com { namespace sun { namespace star { namespace container { - class XStringKeyMap; -} } } } - -// class SvxFontMenuControl ---------------------------------------------- - -class SVX_DLLPUBLIC SvxSmartTagsControl : public SfxMenuControl -{ -private: - std::unique_ptr< PopupMenu > mpMenu; - std::vector< std::unique_ptr< PopupMenu > > maSubMenus; - Menu& mrParent; - std::unique_ptr< const SvxSmartTagItem > mpSmartTagItem; - - struct InvokeAction - { - css::uno::Reference< css::smarttags::XSmartTagAction > mxAction; - css::uno::Reference< css::container::XStringKeyMap > mxSmartTagProperties; - sal_uInt32 mnActionID; - InvokeAction( css::uno::Reference< css::smarttags::XSmartTagAction > xAction, - css::uno::Reference< css::container::XStringKeyMap > xSmartTagProperties, - sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {} - }; - - std::vector< InvokeAction > maInvokeActions; - - void FillMenu(); - DECL_LINK_TYPED( MenuSelect, Menu *, bool); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ) override; - -public: - SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& ); - virtual ~SvxSmartTagsControl(); - - SFX_DECL_MENU_CONTROL(); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h index d5d6eaeaa9bf..1149e3df10d3 100644 --- a/include/svx/svxcommands.h +++ b/include/svx/svxcommands.h @@ -43,7 +43,6 @@ #define CMD_SID_ATTR_CHAR_FONT ".uno:CharFontName" #define CMD_SID_FM_CHECKBOX ".uno:CheckBox" #define CMD_SID_FM_COMBOBOX ".uno:ComboBox" -#define CMD_SID_CONTOUR_DLG ".uno:ContourDialog" #define CMD_SID_FM_CONVERTTO_BUTTON ".uno:ConvertToButton" #define CMD_SID_FM_CONVERTTO_CHECKBOX ".uno:ConvertToCheckBox" #define CMD_SID_FM_CONVERTTO_COMBOBOX ".uno:ConvertToCombo" @@ -131,7 +130,6 @@ #define CMD_SID_TABLE_SELECT_COL ".uno:EntireColumn" #define CMD_SID_TABLE_SELECT_ROW ".uno:EntireRow" #define CMD_SID_FORMAT_TABLE_DLG ".uno:TableDialog" -#define CMD_SID_OPEN_SMARTTAGMENU ".uno:OpenSmartTagMenuOnCursor" #define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog" #define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog" |