diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-14 12:20:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-15 07:17:07 +0100 |
| commit | a45548c39537a0d881c79484be35c948b216f84b (patch) | |
| tree | 3b7cf271afd1011f3d934ecb0f47cb0fa6521894 /vcl/source/app/help.cxx | |
| parent | 17da4ab25303902dd58f854cabce59f168404e2d (diff) | |
sal_uIntPtr/sal_uLong->void* in Popover ids
Change-Id: Ifd7eeadeacffb90ea303c1e6bca807d310098f66
Reviewed-on: https://gerrit.libreoffice.org/46484
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/app/help.cxx')
| -rw-r--r-- | vcl/source/app/help.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index ebd861999667..081c3612abb8 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -191,10 +191,10 @@ void Help::HideBalloonAndQuickHelp() ImplDestroyHelpWindow( bIsVisible ); } -sal_uIntPtr Help::ShowPopover(vcl::Window* pParent, const tools::Rectangle& rScreenRect, +void* Help::ShowPopover(vcl::Window* pParent, const tools::Rectangle& rScreenRect, const OUString& rText, QuickHelpFlags nStyle) { - sal_uIntPtr nId = pParent->ImplGetFrame()->ShowPopover(rText, rScreenRect, nStyle); + void* nId = pParent->ImplGetFrame()->ShowPopover(rText, rScreenRect, nStyle); if (nId) { //popovers are handled natively, return early @@ -204,14 +204,14 @@ sal_uIntPtr Help::ShowPopover(vcl::Window* pParent, const tools::Rectangle& rScr sal_uInt16 nHelpWinStyle = ( nStyle & QuickHelpFlags::TipStyleBalloon ) ? HELPWINSTYLE_BALLOON : HELPWINSTYLE_QUICK; VclPtrInstance<HelpTextWindow> pHelpWin( pParent, rText, nHelpWinStyle, nStyle ); - nId = reinterpret_cast< sal_uIntPtr >( pHelpWin.get() ); + nId = pHelpWin.get(); UpdatePopover(nId, pParent, rScreenRect, rText); pHelpWin->ShowHelp( HELPDELAY_NONE ); return nId; } -void Help::UpdatePopover(sal_uIntPtr nId, vcl::Window* pParent, const tools::Rectangle& rScreenRect, +void Help::UpdatePopover(void* nId, vcl::Window* pParent, const tools::Rectangle& rScreenRect, const OUString& rText) { if (pParent->ImplGetFrame()->UpdatePopover(nId, rText, rScreenRect)) @@ -220,7 +220,7 @@ void Help::UpdatePopover(sal_uIntPtr nId, vcl::Window* pParent, const tools::Rec return; } - HelpTextWindow* pHelpWin = reinterpret_cast< HelpTextWindow* >( nId ); + HelpTextWindow* pHelpWin = static_cast< HelpTextWindow* >( nId ); ENSURE_OR_RETURN_VOID( pHelpWin != nullptr, "Help::UpdatePopover: invalid ID!" ); Size aSz = pHelpWin->CalcOutSize(); @@ -232,7 +232,7 @@ void Help::UpdatePopover(sal_uIntPtr nId, vcl::Window* pParent, const tools::Rec pHelpWin->Invalidate(); } -void Help::HidePopover(vcl::Window const * pParent, sal_uLong nId) +void Help::HidePopover(vcl::Window const * pParent, void* nId) { if (pParent->ImplGetFrame()->HidePopover(nId)) { @@ -240,7 +240,7 @@ void Help::HidePopover(vcl::Window const * pParent, sal_uLong nId) return; } - VclPtr<HelpTextWindow> pHelpWin = reinterpret_cast<HelpTextWindow*>(nId); + VclPtr<HelpTextWindow> pHelpWin = static_cast<HelpTextWindow*>(nId); vcl::Window* pFrameWindow = pHelpWin->ImplGetFrameWindow(); pHelpWin->Hide(); // trigger update, so that a Paint is instantly triggered since we do not save the background |