diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 16:36:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 20:15:18 +0000 |
| commit | 4bc2e84c8bf9ff685ecb00b1bf782eae9ee93e8d (patch) | |
| tree | ac33cae8a70032194077ba5dc6459e2dd5ff3f00 | |
| parent | fabc45a6a902c8988eff087831f8b2f84ea8ae6c (diff) | |
no need for two triggerColumnContextMenu
Change-Id: I7c16f510fa998b63c9e845414cb01e3acdd8a3bb
Reviewed-on: https://gerrit.libreoffice.org/22509
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | include/svx/fmgridcl.hxx | 11 | ||||
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index a654599f1a29..c2b117360141 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -37,21 +37,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridHeader protected: FmGridHeaderData* m_pImpl; - // trigger context menu execution - void triggerColumnContextMenu( const ::Point& _rPreferredPos ); - public: FmGridHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG ); virtual ~FmGridHeader(); virtual void dispose() override; public: - struct AccessControl { friend class FmGridControl; private: AccessControl() { } }; - - inline void triggerColumnContextMenu( const ::Point& _rPreferredPos, const AccessControl& ) - { - triggerColumnContextMenu( _rPreferredPos ); - } + // trigger context menu execution + void triggerColumnContextMenu( const ::Point& _rPreferredPos ); protected: virtual void Command( const CommandEvent& rCEvt ) override; diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index ddd6a7046b62..75ffd75145a7 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1030,7 +1030,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt) ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) ); Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) ); - pMyHeader->triggerColumnContextMenu( aRelativePos, FmGridHeader::AccessControl() ); + pMyHeader->triggerColumnContextMenu(aRelativePos); // handled return; |