diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-23 08:48:06 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-27 11:48:46 +0200 |
commit | 1534025a0386584a7b8f3f929b10ce5eb33257cf (patch) | |
tree | 7f12dd6763148089cd4fb5495c8fffe84f415e12 /sw/source/uibase | |
parent | 0f2e01677cd0e8857faec99c61d71e88eee78b27 (diff) |
loplugin:methodcycles more graph theory for the win
implemeent a reduction approach, which is good at finding virtual
methods that only themselves or their virtual partners.
The accessibility GetVisArea stuff is dead since
commit 891e41fac81fbd8d5cdb277b26639abfd25a7143
Date: Wed Apr 4 11:23:22 2018 +0200
dead code in AccessibleTextHelper_Impl::UpdateVisibleChildren
Change-Id: I78d9d8bca585ecec8394f2c3fe2baa93db0e58f5
Reviewed-on: https://gerrit.libreoffice.org/60912
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/app/docsh.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/drawbase.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/dselect.hxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/drawbase.cxx | 85 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/dselect.cxx | 29 |
5 files changed, 0 insertions, 122 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 97ada4680c47..86d72ac8fb88 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1187,10 +1187,6 @@ void SwDocShell::SetView(SwView* pVw) m_pWrtShell = nullptr; } -void SwDocShell::PrepareReload() -{ -} - // #i59688# // linked graphics are now loaded on demand. // Thus, loading of linked graphics no longer needed and necessary for diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx index b369700115ec..a59a8ea13d40 100644 --- a/sw/source/uibase/inc/drawbase.hxx +++ b/sw/source/uibase/inc/drawbase.hxx @@ -50,7 +50,6 @@ public: bool IsCreateObj() const { return m_bCreateObj; } // mouse- & key events; return value=true: event was edited - virtual bool KeyInput(const KeyEvent& rKEvt); virtual bool MouseMove(const MouseEvent& rMEvt); virtual bool MouseButtonUp(const MouseEvent& rMEvt); virtual bool MouseButtonDown(const MouseEvent& rMEvt); diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx index c3996640bc41..cac7e5ce4396 100644 --- a/sw/source/uibase/inc/dselect.hxx +++ b/sw/source/uibase/inc/dselect.hxx @@ -27,9 +27,6 @@ class DrawSelection : public SwDrawBase public: DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); - // mouse- & key events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual void Activate(const sal_uInt16 nSlotId) override; // activate function }; diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index bb5fd3b9a5e9..fdd09bab6dc9 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -460,91 +460,6 @@ void SwDrawBase::Deactivate() // If a KeyEvent is processed then the return value is true, otherwise // false. -bool SwDrawBase::KeyInput(const KeyEvent& rKEvt) -{ - bool bReturn = false; - sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); - - switch (nCode) - { - case KEY_ESCAPE: - { - if (m_pWin->IsDrawAction()) - { - BreakCreate(); - m_pView->LeaveDrawCreate(); - } - - bReturn = true; - } - break; - - case KEY_DELETE: - { - m_pSh->DelSelectedObj(); - bReturn = true; - } - break; - - case KEY_UP: - case KEY_DOWN: - case KEY_LEFT: - case KEY_RIGHT: - { - SdrView *pSdrView = m_pSh->GetDrawView(); - - if (!pSdrView->IsTextEdit()) - { - long nX = 0; - long nY = 0; - - if (nCode == KEY_UP) - { - // Scroll to top - nX = 0; - nY =-1; - } - else if (nCode == KEY_DOWN) - { - // Scroll down - nX = 0; - nY = 1; - } - else if (nCode == KEY_LEFT) - { - // Scroll left - nX =-1; - nY = 0; - } - else if (nCode == KEY_RIGHT) - { - // Scroll right - nX = 1; - nY = 0; - } - - if (pSdrView->AreObjectsMarked() && rKEvt.GetKeyCode().IsMod2()) - { - // Move objects - nX *= 100; - nY *= 100; - pSdrView->MoveAllMarked(Size(nX, nY)); - } - - bReturn = true; - } - } - break; - } - - return bReturn; -} - -// Process keyboard events - -// If a KeyEvent is processed then the return value is true, otherwise -// false. - void SwDrawBase::BreakCreate() { m_pSh->BreakCreate(); diff --git a/sw/source/uibase/ribbar/dselect.cxx b/sw/source/uibase/ribbar/dselect.cxx index 9dd3b1a0c2bc..c0403c05889d 100644 --- a/sw/source/uibase/ribbar/dselect.cxx +++ b/sw/source/uibase/ribbar/dselect.cxx @@ -31,35 +31,6 @@ DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* m_bCreateObj = false; } -// Process keyboard events - -// If a KeyEvent is processed then the return value is true, otherwise -// false. - -bool DrawSelection::KeyInput(const KeyEvent& rKEvt) -{ - bool bReturn = false; - - switch (rKEvt.GetKeyCode().GetCode()) - { - case KEY_ESCAPE: - { - if (m_pWin->IsDrawAction()) - { - m_pSh->BreakMark(); - m_pWin->ReleaseMouse(); - } - bReturn = true; - } - break; - } - - if (!bReturn) - bReturn = SwDrawBase::KeyInput(rKEvt); - - return bReturn; -} - void DrawSelection::Activate(const sal_uInt16 nSlotId) { m_pWin->SetSdrDrawMode(OBJ_NONE); |