Kaydet (Commit) 2d029304 authored tarafından Caolán McNamara's avatar Caolán McNamara

can use OutputDevice baseclass

Change-Id: I6c1af0332d9c34dbe22d6ee1325513824f95fb05
Reviewed-on: https://gerrit.libreoffice.org/70427
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 27af142c
...@@ -105,11 +105,11 @@ void ScViewForwarder::SetInvalid() ...@@ -105,11 +105,11 @@ void ScViewForwarder::SetInvalid()
class ScEditObjectViewForwarder : public SvxViewForwarder class ScEditObjectViewForwarder : public SvxViewForwarder
{ {
VclPtr<vcl::Window> mpWindow; VclPtr<OutputDevice> mpWindow;
// #i49561# EditView needed for access to its visible area. // #i49561# EditView needed for access to its visible area.
const EditView* mpEditView; const EditView* mpEditView;
public: public:
ScEditObjectViewForwarder( vcl::Window* pWindow, ScEditObjectViewForwarder( OutputDevice* pWindow,
const EditView* _pEditView); const EditView* _pEditView);
virtual bool IsValid() const override; virtual bool IsValid() const override;
...@@ -119,11 +119,10 @@ public: ...@@ -119,11 +119,10 @@ public:
void SetInvalid(); void SetInvalid();
}; };
ScEditObjectViewForwarder::ScEditObjectViewForwarder( vcl::Window* pWindow, ScEditObjectViewForwarder::ScEditObjectViewForwarder( OutputDevice* pWindow,
const EditView* _pEditView ) const EditView* _pEditView )
: : mpWindow(pWindow)
mpWindow(pWindow), , mpEditView( _pEditView )
mpEditView( _pEditView )
{ {
} }
...@@ -301,9 +300,9 @@ ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShel ...@@ -301,9 +300,9 @@ ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShel
class ScEditViewForwarder : public SvxEditViewForwarder class ScEditViewForwarder : public SvxEditViewForwarder
{ {
EditView* mpEditView; EditView* mpEditView;
VclPtr<vcl::Window> mpWindow; VclPtr<OutputDevice> mpWindow;
public: public:
ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin); ScEditViewForwarder(EditView* pEditView, OutputDevice* pWin);
virtual bool IsValid() const override; virtual bool IsValid() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
...@@ -317,9 +316,9 @@ public: ...@@ -317,9 +316,9 @@ public:
void SetInvalid(); void SetInvalid();
}; };
ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin) ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, OutputDevice* pWin)
: mpEditView(pEditView), : mpEditView(pEditView)
mpWindow(pWin) , mpWindow(pWin)
{ {
} }
...@@ -640,7 +639,7 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell) ...@@ -640,7 +639,7 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell)
return pDocSh; return pDocSh;
} }
ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone) ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, OutputDevice* pWin, bool isClone)
: :
mpEditView(pEditView), mpEditView(pEditView),
mpEditEngine(pEditView ? pEditView->GetEditEngine() : nullptr), mpEditEngine(pEditView ? pEditView->GetEditEngine() : nullptr),
...@@ -731,7 +730,7 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify&, rNotify, void) ...@@ -731,7 +730,7 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify&, rNotify, void)
GetBroadcaster().Broadcast(*aHint); GetBroadcaster().Broadcast(*aHint);
} }
ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin) ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, OutputDevice* pWin)
: :
ScAccessibleEditObjectTextData(pEditView, pWin), ScAccessibleEditObjectTextData(pEditView, pWin),
mbEditEngineCreated(false) mbEditEngineCreated(false)
......
...@@ -103,7 +103,7 @@ class ScAccessibleEditObjectTextData : public ScAccessibleTextData ...@@ -103,7 +103,7 @@ class ScAccessibleEditObjectTextData : public ScAccessibleTextData
{ {
public: public:
// Add a para to indicate whether the object is cloned // Add a para to indicate whether the object is cloned
ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone = false); ScAccessibleEditObjectTextData(EditView* pEditView, OutputDevice* pWin, bool isClone = false);
virtual ~ScAccessibleEditObjectTextData() override; virtual ~ScAccessibleEditObjectTextData() override;
virtual ScAccessibleTextData* Clone() const override; virtual ScAccessibleTextData* Clone() const override;
...@@ -123,14 +123,14 @@ protected: ...@@ -123,14 +123,14 @@ protected:
EditView* mpEditView; EditView* mpEditView;
EditEngine* mpEditEngine; EditEngine* mpEditEngine;
std::unique_ptr<SvxEditEngineForwarder> mpForwarder; std::unique_ptr<SvxEditEngineForwarder> mpForwarder;
VclPtr<vcl::Window> mpWindow; VclPtr<OutputDevice> mpWindow;
bool mbIsCloned; bool mbIsCloned;
}; };
class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData
{ {
public: public:
ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin); ScAccessibleEditLineTextData(EditView* pEditView, OutputDevice* pWin);
virtual ~ScAccessibleEditLineTextData() override; virtual ~ScAccessibleEditLineTextData() override;
virtual ScAccessibleTextData* Clone() const override; virtual ScAccessibleTextData* Clone() const override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment