diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-18 17:13:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-19 13:42:07 +0200 |
| commit | 2b83e73fd7b059c4ad224e3163f9d57c6cc6e1c7 (patch) | |
| tree | eb160ecdcaf9ba8c114eeef82261d9ad199d5b40 /include/vcl | |
| parent | 31aac86f14d088628979c7809588f14bef643feb (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')
| -rw-r--r-- | include/vcl/dibtools.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/menu.hxx | 9 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index 765cdc9e2dec..6f6752efc08b 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -21,7 +21,6 @@ #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> -#include <tools/rc.hxx> #include <vcl/region.hxx> #include <vcl/alpha.hxx> 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; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 2c8017c97b54..d0586a7a7868 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -22,7 +22,6 @@ #include <tools/gen.hxx> #include <tools/solar.h> -#include <tools/rc.hxx> #include <tools/color.hxx> #include <tools/poly.hxx> #include <o3tl/typed_flags_set.hxx> |