summaryrefslogtreecommitdiff
path: root/include/vcl/menu.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-18 17:13:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-04-19 13:42:07 +0200
commit2b83e73fd7b059c4ad224e3163f9d57c6cc6e1c7 (patch)
treeeb160ecdcaf9ba8c114eeef82261d9ad199d5b40 /include/vcl/menu.hxx
parent31aac86f14d088628979c7809588f14bef643feb (diff)
remove freshly unused menu support from src files
Change-Id: I038711a0c4d440d452d5b2ae1bfcba5c9305815b Reviewed-on: https://gerrit.libreoffice.org/36646 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl/menu.hxx')
-rw-r--r--include/vcl/menu.hxx9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 28e982990ab1..f5da72b5c109 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -22,8 +22,6 @@
#include <rsc/rsc-vcl-shared-types.hxx>
#include <tools/color.hxx>
-#include <tools/rc.hxx>
-#include <tools/resid.hxx>
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/bitmapex.hxx>
@@ -122,7 +120,7 @@ struct MenuLogo
typedef void (*MenuUserDataReleaseFunction)(sal_uLong);
-class VCL_DLLPUBLIC Menu : public Resource, public VclReferenceBase
+class VCL_DLLPUBLIC Menu : public VclReferenceBase
{
friend class MenuBar;
friend class MenuBarWindow;
@@ -248,7 +246,6 @@ public:
MenuItemBits nItemBits = MenuItemBits::NONE,
const OString &rIdent = OString(),
sal_uInt16 nPos = MENU_APPEND);
- void InsertItem(const ResId& rResId);
void InsertItem(const OUString& rCommand,
const css::uno::Reference<css::frame::XFrame>& rFrame);
void InsertSeparator(const OString &rIdent = OString(), sal_uInt16 nPos = MENU_APPEND);
@@ -491,8 +488,6 @@ class VCL_DLLPUBLIC PopupMenu : public Menu
friend struct MenuItemData;
private:
- VclPtr<Menu>* pRefAutoSubMenu; // keeps track if a pointer to this Menu is stored in the MenuItemData
-
SAL_DLLPRIVATE MenuFloatingWindow * ImplGetFloatingWindow() const;
protected:
@@ -504,9 +499,7 @@ protected:
public:
PopupMenu();
PopupMenu( const PopupMenu& rMenu );
- explicit PopupMenu( const ResId& );
virtual ~PopupMenu() override;
- virtual void dispose() override;
virtual bool IsMenuBar() const override { return false; }