1 files changed, 12 insertions, 13 deletions

diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index bf21aea13ce4..2e154d0e0027 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -19,9 +19,9 @@
 
 #include <basic/sberrors.hxx>
 #include <tools/lineend.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/window.hxx>
 #include <rtlproto.hxx>
 #include <memory>
 
@@ -78,7 +78,7 @@ void SvRTLInputBox::PositionDialog(tools::Long nXTwips, tools::Long nYTwips)
     {
         Point aDlgPosApp( nXTwips, nYTwips );
         OutputDevice* pDefaultDevice = Application::GetDefaultDevice();
-        pDefaultDevice->Push(PushFlags::MAPMODE);
+        pDefaultDevice->Push(vcl::PushFlags::MAPMODE);
         pDefaultDevice->SetMapMode(MapMode( MapUnit::MapAppFont));
         aDlgPosApp = pDefaultDevice->LogicToPixel(aDlgPosApp, MapMode(MapUnit::MapTwip));
         pDefaultDevice->Pop();
@@ -110,7 +110,7 @@ IMPL_LINK_NOARG( SvRTLInputBox, CancelHdl, weld::Button&, void )
 
 void SbRtl_InputBox(StarBASIC *, SbxArray & rPar, bool)
 {
-    sal_uInt32 nArgCount = rPar.Count32();
+    sal_uInt32 nArgCount = rPar.Count();
     if ( nArgCount < 2 )
         StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
     else
@@ -118,11 +118,11 @@ void SbRtl_InputBox(StarBASIC *, SbxArray & rPar, bool)
         OUString aTitle;
         OUString aDefault;
         sal_Int32 nX = -1, nY = -1;  // center
-        const OUString& rPrompt = rPar.Get32(1)->GetOUString();
-        if ( nArgCount > 2 && !rPar.Get32(2)->IsErr() )
-            aTitle = rPar.Get32(2)->GetOUString();
-        if ( nArgCount > 3 && !rPar.Get32(3)->IsErr() )
-            aDefault = rPar.Get32(3)->GetOUString();
+        const OUString& rPrompt = rPar.Get(1)->GetOUString();
+        if (nArgCount > 2 && !rPar.Get(2)->IsErr())
+            aTitle = rPar.Get(2)->GetOUString();
+        if (nArgCount > 3 && !rPar.Get(3)->IsErr())
+            aDefault = rPar.Get(3)->GetOUString();
         if ( nArgCount > 4 )
         {
             if ( nArgCount != 6 )
@@ -130,13 +130,12 @@ void SbRtl_InputBox(StarBASIC *, SbxArray & rPar, bool)
                 StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
                 return;
             }
-            nX = rPar.Get32(4)->GetLong();
-            nY = rPar.Get32(5)->GetLong();
+            nX = rPar.Get(4)->GetLong();
+            nY = rPar.Get(5)->GetLong();
         }
-        vcl::Window* pParent = Application::GetDefDialogParent();
-        SvRTLInputBox aDlg(pParent ? pParent->GetFrameWeld() : nullptr,rPrompt,aTitle,aDefault,nX,nY);
+        SvRTLInputBox aDlg(Application::GetDefDialogParent(), rPrompt, aTitle, aDefault, nX, nY);
         aDlg.run();
-        rPar.Get32(0)->PutString(aDlg.GetText());
+        rPar.Get(0)->PutString(aDlg.GetText());
     }
 }