diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-04 10:36:23 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-04 12:19:10 +0000 |
commit | ac9373e65ed7908a19edc6f5c758af9b8232820b (patch) | |
tree | e1a0c8c6752b328b484e9a6a6e9c77213682b6cd /sd/source/ui/func/fuoltext.cxx | |
parent | 8a04fac29da8ae902bd5f0aac559129013274304 (diff) |
merge sd::FuOutline with sd::FuOutlineText
Change-Id: Ie8191ac91175ba51f89809aaa53bc1ffacf42df0
Reviewed-on: https://gerrit.libreoffice.org/29520
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/func/fuoltext.cxx')
-rw-r--r-- | sd/source/ui/func/fuoltext.cxx | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 9ae6b610861c..88507becb2a8 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -84,10 +84,32 @@ static sal_uInt16 SidArray[] = { FuOutlineText::FuOutlineText(ViewShell* pViewShell, ::sd::Window* pWindow, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) - : FuOutline(pViewShell, pWindow, pView, pDoc, rReq) + : FuPoor(pViewShell, pWindow, pView, pDoc, rReq), + pOutlineViewShell (static_cast<OutlineViewShell*>(pViewShell)), + pOutlineView (static_cast<OutlineView*>(pView)) { } +/** + * forward to OutlinerView + */ +bool FuOutlineText::Command(const CommandEvent& rCEvt) +{ + bool bResult = false; + + OutlinerView* pOlView = + static_cast<OutlineView*>(mpView)->GetViewByWindow(mpWindow); + DBG_ASSERT (pOlView, "no OutlineView found"); + + if (pOlView) + { + pOlView->Command(rCEvt); // unfortunately, we do not get a return value + bResult = true; + } + return bResult; +} + + rtl::Reference<FuPoor> FuOutlineText::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) { rtl::Reference<FuPoor> xFunc( new FuOutlineText( pViewSh, pWin, pView, pDoc, rReq ) ); @@ -108,7 +130,7 @@ bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) } else { - bReturn = FuOutline::MouseButtonDown(rMEvt); + bReturn = FuPoor::MouseButtonDown(rMEvt); } return bReturn; @@ -120,7 +142,7 @@ bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) if (!bReturn) { - bReturn = FuOutline::MouseMove(rMEvt); + bReturn = FuPoor::MouseMove(rMEvt); } return bReturn; @@ -171,7 +193,7 @@ bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) } if( !bReturn ) - bReturn = FuOutline::MouseButtonUp(rMEvt); + bReturn = FuPoor::MouseButtonUp(rMEvt); return bReturn; } @@ -201,7 +223,7 @@ bool FuOutlineText::KeyInput(const KeyEvent& rKEvt) } else { - bReturn = FuOutline::KeyInput(rKEvt); + bReturn = FuPoor::KeyInput(rKEvt); } } @@ -238,16 +260,6 @@ void FuOutlineText::UpdateForKeyPress (const KeyEvent& rEvent) pOutlineViewShell->UpdatePreview (pOutlineViewShell->GetActualPage()); } -void FuOutlineText::Activate() -{ - FuOutline::Activate(); -} - -void FuOutlineText::Deactivate() -{ - FuOutline::Deactivate(); -} - /** * Cut object to clipboard */ |