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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsToolTip.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index 575eef4b97f3..3c9658a4f340 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -56,7 +56,7 @@ private: SlideSorter& mrSlideSorter; model::SharedPageDescriptor mpDescriptor; OUString msCurrentHelpText; - sal_uLong mnHelpWindowHandle; + void* mnHelpWindowHandle; Timer maShowTimer; Timer maHiddenTimer; diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index ca76917ef35c..5d341e35ada1 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -33,7 +33,7 @@ namespace sd { namespace slidesorter { namespace view { ToolTip::ToolTip (SlideSorter& rSlideSorter) : mrSlideSorter(rSlideSorter), msCurrentHelpText(), - mnHelpWindowHandle(0), + mnHelpWindowHandle(nullptr), maShowTimer(), maHiddenTimer() { @@ -139,11 +139,11 @@ void ToolTip::DoShow() bool ToolTip::Hide() { - if (mnHelpWindowHandle>0) + if (mnHelpWindowHandle) { sd::Window *pWindow (mrSlideSorter.GetContentWindow().get()); Help::HidePopover(pWindow, mnHelpWindowHandle); - mnHelpWindowHandle = 0; + mnHelpWindowHandle = nullptr; return true; } else |