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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/control/headbar.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/tabbar.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index cb44b4dd7f24..fb6de9f41fa3 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -515,7 +515,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, if ( IsEnabled() ) pDev->DrawText( Point( nTxtPos, nTxtPosY ), pItem->maOutText ); else - pDev->DrawCtrlText( Point( nTxtPos, nTxtPosY ), pItem->maOutText, 0, STRING_LEN, TEXT_DRAW_DISABLE ); + pDev->DrawCtrlText( Point( nTxtPos, nTxtPosY ), pItem->maOutText, 0, pItem->maOutText.getLength(), TEXT_DRAW_DISABLE ); if( aSelectionTextColor != Color( COL_TRANSPARENT ) ) pDev->Pop(); } diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index c0b8059e8d1c..1f826da7916f 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1197,8 +1197,8 @@ public: if (mbEnabled) mrParent.DrawText(aPos, aText); else - mrParent.DrawCtrlText( - aPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC)); + mrParent.DrawCtrlText( aPos, aText, 0, aText.getLength(), + (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC)); } void drawOverTopBorder(bool b3DTab) |