commit aafc733e8d8447f1ba878faa6e7ed3804ed44007
author Jim Raykowski <raykowj@gmail.com> Tue Apr 23 19:00:09 2019 +0200
committer Jim Raykowski <raykowj@gmail.com> Tue Apr 23 19:57:16 2019 +0200
tree 82ee9894e1e21fb5496982a6e241e76dba7ceb34
parent 1e3d0a57689006cd7244481958025177c01e4d09

Revert "tdf#122280: Hide Block selection mode from Calc"

This reverts commit 220ce1a5b1db6e456afe04b7e9002c524dcf1044.

Including a header file of another module and even a module that is above is a no-go.

Change-Id: I3c8107d8c667c34259bdfee9d83afb2651f5e11c
Reviewed-on: https://gerrit.libreoffice.org/71142
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

svx/source/stbctrls/selctrl.cxx

diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index d9af2ef..1e97e16 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -29,7 +29,6 @@

#include "stbctrls.h"
#include <bitmaps.hlst>
#include <../sc/inc/sc.hrc>

#include <com/sun/star/beans/PropertyValue.hpp>

@@ -47,7 +46,6 @@ public:
    OUString GetItemTextForState(sal_uInt16 nState) { return m_xMenu->GetItemText(state_to_id(nState)); }
    sal_uInt16 GetState() const { return id_to_state(m_xMenu->GetCurItemIdent()); }
    sal_uInt16 Execute(vcl::Window* pWindow, const Point& rPopupPos) { return m_xMenu->Execute(pWindow, rPopupPos); }
    void HideSelectionType(const OString& rIdent) { m_xMenu->HideItem(m_xMenu->GetItemId(rIdent)); }
};

sal_uInt16 SelectionTypePopup::id_to_state(const OString& rIdent)
@@ -110,12 +108,6 @@ bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
    SelectionTypePopup aPop(mnState);
    StatusBar& rStatusbar = GetStatusBar();

    // Check if Calc is opened and hide block selection state if true tdf#122280
    if ( GetSlotId() == SID_STATUS_SELMODE )
    {
        aPop.HideSelectionType("block");
    }

    if (rEvt.IsMiddle() && aPop.Execute(&rStatusbar, rEvt.GetPosPixel()))
    {
        sal_uInt16 nNewState = aPop.GetState();