diff options
| author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
|---|---|---|
| committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
| commit | 3491b4ac4fe34cacea5f4d0a4594d4a88cbbe7b2 (patch) | |
| tree | 8dc60b794b88dd87c965d149c93fa3ac81e3096c /vcl/source/window/msgbox.cxx | |
| parent | 66e7dc1197e76e686ba731382d032a9a72849959 (diff) | |
| parent | 95f71183414a50d12cd4bbacf47d711672e63268 (diff) | |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'vcl/source/window/msgbox.cxx')
| -rw-r--r-- | vcl/source/window/msgbox.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 487476e97fc2..60d6f6b27fbf 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -196,10 +196,9 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : sal_uInt16 nLoButtons = ReadShortRes(); sal_uInt16 nHiDefButton = ReadShortRes(); sal_uInt16 nLoDefButton = ReadShortRes(); - sal_uInt16 nHiHelpId = ReadShortRes(); - sal_uInt16 nLoHelpId = ReadShortRes(); + rtl::OString aHelpId( ReadByteStringRes() ); /* sal_uInt16 bSysModal = */ ReadShortRes(); - SetHelpId( ((sal_uIntPtr)nHiHelpId << 16) + nLoHelpId ); + SetHelpId( aHelpId ); WinBits nBits = (((sal_uIntPtr)nHiButtons << 16) + nLoButtons) | (((sal_uIntPtr)nHiDefButton << 16) + nLoDefButton); ImplInit( pParent, nBits | WB_MOVEABLE | WB_HORZ | WB_CENTER ); @@ -233,7 +232,7 @@ MessBox::~MessBox() void MessBox::ImplPosControls() { - if ( GetHelpId() ) + if ( GetHelpId().getLength() ) { if ( !mbHelpBtn ) { |