SbxArray: drop 16-bit indices

Change-Id: I43b478187636b9bb53fdf7ab938436ae364bd7a7
Reviewed-on: https://gerrit.libreoffice.org/84733
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

2 files changed, 16 insertions, 16 deletions

diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 2f11382e5298..b0dc7d481d09 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -40,15 +40,15 @@ static Sequence<Any> *lcl_docbasic_convertArgs( SbxArray& rArgs )
 {
     Sequence<Any> *pRet = nullptr;
 
-    sal_uInt16 nCount = rArgs.Count();
+    sal_uInt32 nCount = rArgs.Count32();
     if( nCount > 1 )
     {
         nCount--;
         pRet = new Sequence<Any>( nCount );
         Any *pUnoArgs = pRet->getArray();
-        for( sal_uInt16 i=0; i<nCount; i++ )
+        for( sal_uInt32 i=0; i<nCount; i++ )
         {
-            SbxVariable *pVar = rArgs.Get( i+1 );
+            SbxVariable *pVar = rArgs.Get32( i+1 );
             switch( pVar->GetType() )
             {
             case SbxSTRING:
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 0cf38b1632b2..9ae217cafc09 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1523,14 +1523,14 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
             SbxArrayRef xArgs = new SbxArray;
             SbxVariableRef xVar = new SbxVariable;
             xVar->PutString( pFlyFormat->GetName() );
-            xArgs->Put( xVar.get(), 1 );
+            xArgs->Put32( xVar.get(), 1 );
 
             xVar = new SbxVariable;
             if( SvMacroItemId::SwFrmKeyInputAlpha == nEvent )
                 xVar->PutChar( aCh );
             else
                 xVar->PutUShort( rKeyCode.GetModifier() | rKeyCode.GetCode() );
-            xArgs->Put( xVar.get(), 2 );
+            xArgs->Put32( xVar.get(), 2 );
 
             OUString sRet;
             rSh.ExecMacro( *pMacro, &sRet, xArgs.get() );
@@ -4036,25 +4036,25 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                             m_aRszMvHdlPt != aDocPt )
                         {
                             m_aRszMvHdlPt = aDocPt;
-                            sal_uInt16 nPos = 0;
+                            sal_uInt32 nPos = 0;
                             SbxArrayRef xArgs = new SbxArray;
                             SbxVariableRef xVar = new SbxVariable;
                             xVar->PutString( pFlyFormat->GetName() );
-                            xArgs->Put( xVar.get(), ++nPos );
+                            xArgs->Put32( xVar.get(), ++nPos );
 
                             if( SvMacroItemId::SwFrmResize == nEvent )
                             {
                                 xVar = new SbxVariable;
                                 xVar->PutUShort( static_cast< sal_uInt16 >(g_eSdrMoveHdl) );
-                                xArgs->Put( xVar.get(), ++nPos );
+                                xArgs->Put32( xVar.get(), ++nPos );
                             }
 
                             xVar = new SbxVariable;
                             xVar->PutLong( aDocPt.X() - aSttPt.X() );
-                            xArgs->Put( xVar.get(), ++nPos );
+                            xArgs->Put32( xVar.get(), ++nPos );
                             xVar = new SbxVariable;
                             xVar->PutLong( aDocPt.Y() - aSttPt.Y() );
-                            xArgs->Put( xVar.get(), ++nPos );
+                            xArgs->Put32( xVar.get(), ++nPos );
 
                             OUString sRet;
 
@@ -4495,29 +4495,29 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                         {
                             const Point aSttPt( PixelToLogic( m_aStartPos ) );
                             m_aRszMvHdlPt = aDocPt;
-                            sal_uInt16 nPos = 0;
+                            sal_uInt32 nPos = 0;
                             SbxArrayRef xArgs = new SbxArray;
                             SbxVariableRef xVar = new SbxVariable;
                             xVar->PutString( pFlyFormat->GetName() );
-                            xArgs->Put( xVar.get(), ++nPos );
+                            xArgs->Put32( xVar.get(), ++nPos );
 
                             if( SvMacroItemId::SwFrmResize == nEvent )
                             {
                                 xVar = new SbxVariable;
                                 xVar->PutUShort( static_cast< sal_uInt16 >(eOldSdrMoveHdl) );
-                                xArgs->Put( xVar.get(), ++nPos );
+                                xArgs->Put32( xVar.get(), ++nPos );
                             }
 
                             xVar = new SbxVariable;
                             xVar->PutLong( aDocPt.X() - aSttPt.X() );
-                            xArgs->Put( xVar.get(), ++nPos );
+                            xArgs->Put32( xVar.get(), ++nPos );
                             xVar = new SbxVariable;
                             xVar->PutLong( aDocPt.Y() - aSttPt.Y() );
-                            xArgs->Put( xVar.get(), ++nPos );
+                            xArgs->Put32( xVar.get(), ++nPos );
 
                             xVar = new SbxVariable;
                             xVar->PutUShort( 1 );
-                            xArgs->Put( xVar.get(), ++nPos );
+                            xArgs->Put32( xVar.get(), ++nPos );
 
                             ReleaseMouse();