diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-12-17 05:18:35 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-12-18 01:54:16 +0000 |
| commit | 4c539fac018dfd44cd8db52161a8cb930c627da7 (patch) | |
| tree | d7530d03926971e58584b64ce618984eb47baf74 /vcl/source/window/toolbox.cxx | |
| parent | 8272ffb8ed00f211a8fbda71136d695b42249b70 (diff) | |
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 <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'vcl/source/window/toolbox.cxx')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 ); } |