Revert "pPos and pGetNextGlypInfo always have the same value"

This reverts commit 7453cb58df4ce434a1252567f961cfe497064aca.

and...

Revert "pEraseRect is always null"

I suspect the problem is the change to D2DWriteTextOutRenderer::operator
in 7453cb58df4ce434a1252567f961cfe497064aca

aborts during windows tinderboxes CppunitTest_dbaccess_empty_stdlib_save etc

This reverts commit 073d920ef5914b5dfe491dbaf7fb18ba56293b85.

Change-Id: I372e104bd09e49bcf08306169db9777f2f26fff5

1 files changed, 9 insertions, 3 deletions

diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index bc1890b0ee11..42b25b62c91f 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -179,7 +179,9 @@ public:
 
     virtual bool operator ()(CommonSalLayout const &rLayout,
         SalGraphics &rGraphics,
-        HDC hDC) = 0;
+        HDC hDC,
+        const Rectangle* pRectToErase,
+        Point* pPos, int* pGetNextGlypInfo) = 0;
 };
 
 class ExTextOutRenderer : public TextOutRenderer
@@ -192,7 +194,9 @@ public:
 
     bool operator ()(CommonSalLayout const &rLayout,
         SalGraphics &rGraphics,
-        HDC hDC) override;
+        HDC hDC,
+        const Rectangle* pRectToErase,
+        Point* pPos, int* pGetNextGlypInfo) override;
 };
 
 class D2DWriteTextOutRenderer : public TextOutRenderer
@@ -215,7 +219,9 @@ public:
 
     bool operator ()(CommonSalLayout const &rLayout,
         SalGraphics &rGraphics,
-        HDC hDC) override;
+        HDC hDC,
+        const Rectangle* pRectToErase,
+        Point* pPos, int* pGetNextGlypInfo) override;
 
     inline bool BindDC(HDC hDC, Rectangle const & rRect = Rectangle(0, 0, 0, 0)) {
         RECT const rc = { rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom() };