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 /sc/source/ui/app | |
| 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 'sc/source/ui/app')
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 94f3464c783f..7cf8faa1d231 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -607,9 +607,9 @@ ScInputHandler::ScInputHandler() pFormulaData( nullptr ), pFormulaDataPara( nullptr ), pTipVisibleParent( nullptr ), - nTipVisible( 0 ), + nTipVisible( nullptr ), pTipVisibleSecParent( nullptr ), - nTipVisibleSec( 0 ), + nTipVisibleSec( nullptr ), nFormSelStart( 0 ), nFormSelEnd( 0 ), nAutoPar( 0 ), @@ -869,7 +869,7 @@ void ScInputHandler::HideTip() { pTipVisibleParent->RemoveEventListener( LINK( this, ScInputHandler, ShowHideTipVisibleParentListener ) ); Help::HidePopover(pTipVisibleParent, nTipVisible ); - nTipVisible = 0; + nTipVisible = nullptr; pTipVisibleParent = nullptr; } aManualTip.clear(); @@ -880,7 +880,7 @@ void ScInputHandler::HideTipBelow() { pTipVisibleSecParent->RemoveEventListener( LINK( this, ScInputHandler, ShowHideTipVisibleSecParentListener ) ); Help::HidePopover(pTipVisibleSecParent, nTipVisibleSec); - nTipVisibleSec = 0; + nTipVisibleSec = nullptr; pTipVisibleSecParent = nullptr; } aManualTip.clear(); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 6572e0b01d95..a7ff74f109c2 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1783,7 +1783,7 @@ void ScTextWnd::TextGrabFocus() ScPosWnd::ScPosWnd( vcl::Window* pParent ) : ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), - nTipVisible ( 0 ), + nTipVisible ( nullptr ), bFormulaMode( false ) { set_id("pos_window"); @@ -1965,7 +1965,7 @@ void ScPosWnd::HideTip() if (!pWin) pWin = this; Help::HidePopover(pWin, nTipVisible); - nTipVisible = 0; + nTipVisible = nullptr; } } |