From 4c539fac018dfd44cd8db52161a8cb930c627da7 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Tue, 17 Dec 2013 05:18:35 -0600 Subject: vcl get rid of xub_StrLen and STRING_LEN in outdev3 a new log section (sal.rtl.xub) is used to display alert in case of suspicious len == 0xFFFF (aka STRING_LEN) Change-Id: I3ed2aa7896e12592be9e003580dd6c8eda4add5e Reviewed-on: https://gerrit.libreoffice.org/7117 Tested-by: LibreOffice gerrit bot Reviewed-by: Norbert Thiebaud --- vcl/source/window/toolbox.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/source/window/toolbox.cxx') diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index b59d14336d36..bcde38e4eec0 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -3138,7 +3138,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa mpData->m_pLayoutData->m_aLineItemIds.push_back( pItem->mnId ); mpData->m_pLayoutData->m_aLineItemPositions.push_back( nPos ); } - DrawCtrlText( aPos, pItem->maText, 0, STRING_LEN, TEXT_DRAW_MNEMONIC, pVector, pDisplayText ); + DrawCtrlText( aPos, pItem->maText, 0, pItem->maText.getLength(), TEXT_DRAW_MNEMONIC, pVector, pDisplayText ); if ( bClip ) SetClipRegion(); SetFont( aOldFont ); @@ -3307,7 +3307,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa mpData->m_pLayoutData->m_aLineItemPositions.push_back( nPos ); } DrawCtrlText( Point( nTextOffX, nTextOffY ), pItem->maText, - 0, STRING_LEN, nTextStyle, pVector, pDisplayText ); + 0, pItem->maText.getLength(), nTextStyle, pVector, pDisplayText ); if ( bRotate ) SetFont( aOldFont ); } -- cgit