diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index ea4e6188d9a4..0fd4ec9fa562 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -281,7 +281,7 @@ int GalApp::Main()
         OUString aName( "Default name" );
         std::vector<INetURLObject> aFiles;
 
-        for( sal_uInt32 i = 0; i < GetCommandLineParamCount(); i++ )
+        for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); ++i )
         {
             OUString aParam = GetCommandLineParam( i );
 
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index 8f5171ea064c..dd17a571d006 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -114,7 +114,7 @@ protected:
     {
         try
         {
-            sal_uInt32 nCmdParams = GetCommandLineParamCount();
+            const sal_uInt16 nCmdParams = GetCommandLineParamCount();
 
             if (nCmdParams == 0)
                 showHelp();
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index a323ab4156e3..ff79a6e125b9 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1785,7 +1785,7 @@ public:
             bool bPopup = false, bGLTest = false;
             DemoRenderer aRenderer;
 
-            for (sal_Int32 i = 0; i < GetCommandLineParamCount(); i++)
+            for (sal_uInt16 i = 0; i < GetCommandLineParamCount(); ++i)
             {
                 bool bLast = i == GetCommandLineParamCount() - 1;
                 OUString aArg = GetCommandLineParam(i);