diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-04-08 17:22:31 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-09 09:56:20 +0200 |
commit | 2d02930452be2252afb39f4706e818273cf019a0 (patch) | |
tree | d83f38ec59b61e2954122b8a96052d0ea68aecf0 /sc/source/ui/Accessibility | |
parent | 27af142c0d96d70a7ed7beb9d91c95c2fc3c34bb (diff) |
can use OutputDevice baseclass
Change-Id: I6c1af0332d9c34dbe22d6ee1325513824f95fb05
Reviewed-on: https://gerrit.libreoffice.org/70427
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/Accessibility')
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleText.cxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 11b6beed58cf..0e6d2dfb8320 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -105,11 +105,11 @@ void ScViewForwarder::SetInvalid() class ScEditObjectViewForwarder : public SvxViewForwarder { - VclPtr<vcl::Window> mpWindow; + VclPtr<OutputDevice> mpWindow; // #i49561# EditView needed for access to its visible area. const EditView* mpEditView; public: - ScEditObjectViewForwarder( vcl::Window* pWindow, + ScEditObjectViewForwarder( OutputDevice* pWindow, const EditView* _pEditView); virtual bool IsValid() const override; @@ -119,11 +119,10 @@ public: void SetInvalid(); }; -ScEditObjectViewForwarder::ScEditObjectViewForwarder( vcl::Window* pWindow, +ScEditObjectViewForwarder::ScEditObjectViewForwarder( OutputDevice* pWindow, const EditView* _pEditView ) - : - mpWindow(pWindow), - mpEditView( _pEditView ) + : mpWindow(pWindow) + , mpEditView( _pEditView ) { } @@ -301,9 +300,9 @@ ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShel class ScEditViewForwarder : public SvxEditViewForwarder { EditView* mpEditView; - VclPtr<vcl::Window> mpWindow; + VclPtr<OutputDevice> mpWindow; public: - ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin); + ScEditViewForwarder(EditView* pEditView, OutputDevice* pWin); virtual bool IsValid() const override; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; @@ -317,9 +316,9 @@ public: void SetInvalid(); }; -ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin) - : mpEditView(pEditView), - mpWindow(pWin) +ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, OutputDevice* pWin) + : mpEditView(pEditView) + , mpWindow(pWin) { } @@ -640,7 +639,7 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell) return pDocSh; } -ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone) +ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, OutputDevice* pWin, bool isClone) : mpEditView(pEditView), mpEditEngine(pEditView ? pEditView->GetEditEngine() : nullptr), @@ -731,7 +730,7 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify&, rNotify, void) GetBroadcaster().Broadcast(*aHint); } -ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin) +ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, OutputDevice* pWin) : ScAccessibleEditObjectTextData(pEditView, pWin), mbEditEngineCreated(false) |