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>

7 files changed, 13 insertions, 13 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;
     }
 }
 
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 978f6bdf3705..3bc760446b02 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -67,9 +67,9 @@ private:
     ScTypedCaseStrSet::const_iterator miAutoPosFormula;
 
     VclPtr<vcl::Window>     pTipVisibleParent;
-    sal_uLong               nTipVisible;
+    void*                   nTipVisible;
     VclPtr<vcl::Window>     pTipVisibleSecParent;
-    sal_uLong               nTipVisibleSec;
+    void*                   nTipVisibleSec;
     OUString                aManualTip;
     OUString                aAutoSearch;
 
@@ -231,7 +231,7 @@ public:
     bool            DataChanging( sal_Unicode cTyped = 0, bool bFromCommand = false );
     void            DataChanged( bool bFromTopNotify = false, bool bSetModified = true );
 
-    bool            TakesReturn() const     { return ( nTipVisible != 0 ); }
+    bool            TakesReturn() const     { return ( nTipVisible != nullptr ); }
 
     void            SetModified()       { bModified = true; }
 
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 4eb44bd269b0..2c645a509307 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -155,7 +155,7 @@ class ScPosWnd : public ComboBox, public SfxListener        // Display position
 {
 private:
     OUString        aPosStr;
-    sal_uLong       nTipVisible;
+    void*           nTipVisible;
     bool            bFormulaMode;
 
 public:
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 0424a639759c..6eddd88a5c5f 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -170,7 +170,7 @@ private:
 
     ScExtraEditViewManager aExtraEditViewManager;
 
-    sal_uLong               nTipVisible;
+    void*                   nTipVisible;
     tools::Rectangle               aTipRectangle;
     QuickHelpFlags          nTipAlign;
     OUString                sTipString;
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 3e3a3c037f99..1c6e61cc6ad4 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -213,7 +213,7 @@ ScTabView::ScTabView( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell*
     pDrawBrushSet( nullptr ),
     pTimerWindow( nullptr ),
     aExtraEditViewManager( pViewShell, pGridWin ),
-    nTipVisible( 0 ),
+    nTipVisible( nullptr ),
     nTipAlign( QuickHelpFlags::NONE ),
     nPrevDragPos( 0 ),
     meBlockMode(None),
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 4ddb18f7ec01..d56dcbf439ef 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -38,7 +38,7 @@ void ScTabView::HideTip()
         ScSplitPos eWhich = aViewData.GetActivePart();
         vcl::Window* pWin = pGridWin[eWhich];
         Help::HidePopover(pWin, nTipVisible);
-        nTipVisible = 0;
+        nTipVisible = nullptr;
         aTipRectangle = tools::Rectangle();
         nTipAlign = QuickHelpFlags::NONE;
         sTipString.clear();