[Libreoffice-commits] core.git: include/svx svx/source

[Caolán McNamara]

 include/svx/fmgridcl.hxx       |   11 ++---------
 svx/source/fmcomp/fmgridcl.cxx |    2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 4bc2e84c8bf9ff685ecb00b1bf782eae9ee93e8d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 19 16:36:07 2016 +0000

    no need for two triggerColumnContextMenu
    
    Change-Id: I7c16f510fa998b63c9e845414cb01e3acdd8a3bb
    Reviewed-on: https://gerrit.libreoffice.org/22509
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index a654599..c2b1173 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 ddd6a70..75ffd75 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;