sc/source/ui/Accessibility/AccessibleText.cxx | 8 ++++----
sc/source/ui/inc/AccessibleText.hxx | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 3bb3e19ba79e40c3c3b2504213f5179f3ba5354f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 15 10:47:09 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 15 13:21:52 2019 +0200
only need an OutputDevice not a full vcl:Window
Change-Id: I79e0a5877a531cd1b0badf3adcc721254ad441d9
Reviewed-on: https://gerrit.libreoffice.org/80820
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx
b/sc/source/ui/Accessibility/AccessibleText.cxx
index 0e8f5b48feef..2fa6f42415c7 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1283,10 +1283,10 @@ SvxViewForwarder*
ScAccessibleNoteTextData::GetViewForwarder()
class ScCsvViewForwarder : public SvxViewForwarder
{
- VclPtr<vcl::Window> mpWindow;
+ VclPtr<OutputDevice> mpWindow;
public:
- explicit ScCsvViewForwarder( vcl::Window* pWindow );
+ explicit ScCsvViewForwarder( OutputDevice* pWindow );
virtual bool IsValid() const override;
virtual Point LogicToPixel( const Point& rPoint, const
MapMode& rMapMode ) const override;
@@ -1295,7 +1295,7 @@ public:
void SetInvalid();
};
-ScCsvViewForwarder::ScCsvViewForwarder( vcl::Window* pWindow ) :
+ScCsvViewForwarder::ScCsvViewForwarder( OutputDevice* pWindow ) :
mpWindow( pWindow )
{
}
@@ -1323,7 +1323,7 @@ void ScCsvViewForwarder::SetInvalid()
}
ScAccessibleCsvTextData::ScAccessibleCsvTextData(
- vcl::Window* pWindow, EditEngine* pEditEngine,
+ OutputDevice* pWindow, EditEngine* pEditEngine,
const OUString& rCellText, const Size& rCellSize ) :
mpWindow( pWindow ),
mpEditEngine( pEditEngine ),
diff --git a/sc/source/ui/inc/AccessibleText.hxx
b/sc/source/ui/inc/AccessibleText.hxx
index 1ce9fb46dfaa..0bcb2b5a6f3f 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -258,7 +258,7 @@ private:
typedef ::std::unique_ptr< SvxTextForwarder > TextForwarderPtr;
typedef ::std::unique_ptr< ScCsvViewForwarder > ViewForwarderPtr;
- VclPtr<vcl::Window> mpWindow;
+ VclPtr<OutputDevice> mpWindow;
EditEngine* mpEditEngine;
TextForwarderPtr mpTextForwarder;
ViewForwarderPtr mpViewForwarder;
@@ -267,7 +267,7 @@ private:
public:
explicit ScAccessibleCsvTextData(
- vcl::Window* pWindow,
+ OutputDevice* pWindow,
EditEngine* pEditEngine,
const OUString& rCellText,
const Size& rCellSize );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
