mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert OutputDevice::DrawTextArray from XubString to OUString

Browse Source 
Change-Id: Ie16504ea004e39eda246a7ed170504a04a0764bb
This commit is contained in:
Noel Grandin
2013-07-25 11:32:39 +02:00
parent eb96a5296a
commit 0c7579d5de
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/vcl/outdev.hxx
View File

@@ -581,7 +581,7 @@ public:
/// Height where any character of the current font fits; in logic coordinates. /// Height where any character of the current font fits; in logic coordinates.
long GetTextHeight() const; long GetTextHeight() const;
float approximate_char_width() 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, const sal_Int32* pDXAry = NULL,
xub_StrLen nIndex = 0, xub_StrLen nIndex = 0,
xub_StrLen nLen = STRING_LEN ); xub_StrLen nLen = STRING_LEN );
@@ -592,7 +592,7 @@ public:
sal_Int32* pDXAry = NULL, long nWidth = 0, sal_Int32* pDXAry = NULL, long nWidth = 0,
sal_Bool bCellBreaking = sal_True ) const; sal_Bool bCellBreaking = sal_True ) const;
void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, 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 nIndex = 0, xub_StrLen nLen = STRING_LEN );
xub_StrLen GetTextBreak( const OUString& rStr, long nTextWidth, xub_StrLen GetTextBreak( const OUString& rStr, long nTextWidth,
sal_Int32 nIndex = 0, sal_Int32 nLen = -1, sal_Int32 nIndex = 0, sal_Int32 nLen = -1,

4
vcl/source/gdi/outdev3.cxx
View File

@@ -5478,7 +5478,7 @@ float OutputDevice::approximate_char_width() const
return GetTextWidth("aemnnxEM") / 8.0; 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, const sal_Int32* pDXAry,
xub_StrLen nIndex, xub_StrLen nLen ) 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, void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth,
const String& rStr, const OUString& rStr,
xub_StrLen nIndex, xub_StrLen nLen ) xub_StrLen nIndex, xub_StrLen nLen )
{ {
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );