diff options
| -rw-r--r-- | include/vcl/outdev.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index fdbffaedbf8d..761050cdab7d 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -581,7 +581,7 @@ public: /// Height where any character of the current font fits; in logic coordinates. long GetTextHeight() const; float approximate_char_width() const; - void DrawTextArray( const Point& rStartPt, const XubString& rStr, + void DrawTextArray( const Point& rStartPt, const OUString& rStr, const sal_Int32* pDXAry = NULL, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); @@ -592,7 +592,7 @@ public: sal_Int32* pDXAry = NULL, long nWidth = 0, sal_Bool bCellBreaking = sal_True ) const; void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, - const XubString& rStr, + const OUString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); xub_StrLen GetTextBreak( const OUString& rStr, long nTextWidth, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 401b25ec7c84..55910d12f272 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -5478,7 +5478,7 @@ float OutputDevice::approximate_char_width() const return GetTextWidth("aemnnxEM") / 8.0; } -void OutputDevice::DrawTextArray( const Point& rStartPt, const String& rStr, +void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr, const sal_Int32* pDXAry, xub_StrLen nIndex, xub_StrLen nLen ) { @@ -5620,7 +5620,7 @@ bool OutputDevice::GetCaretPositions( const OUString& rStr, sal_Int32* pCaretXAr } void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth, - const String& rStr, + const OUString& rStr, xub_StrLen nIndex, xub_StrLen nLen ) { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); |