Revert "new loplugin typedefparam"

This reverts commit 9865440d217d975206a3f91612f0666312bc8fd8.

This is not ready to land yet, seems like the latest update
of the logic reveals a bunch more places I need to fix before it can land.

2 files changed, 22 insertions, 22 deletions

diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index b25cdce8acba..d68c09a9eef6 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -220,7 +220,7 @@ void VCLXGraphicControl::ImplSetNewImage()
     pButton->SetModeImage( GetImage() );
 }
 
-void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
+void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags )
 {
     SolarMutexGuard aGuard;
 
@@ -863,7 +863,7 @@ void VCLXCheckBox::setLabel( const OUString& rLabel )
         pWindow->SetText( rLabel );
 }
 
-void VCLXCheckBox::setState( sal_Int16 n )
+void VCLXCheckBox::setState( short n )
 {
     SolarMutexGuard aGuard;
 
@@ -891,11 +891,11 @@ void VCLXCheckBox::setState( sal_Int16 n )
     }
 }
 
-sal_Int16 VCLXCheckBox::getState()
+short VCLXCheckBox::getState()
 {
     SolarMutexGuard aGuard;
 
-    sal_Int16 nState = -1;
+    short nState = -1;
     VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >();
     if ( pCheckBox )
     {
@@ -2956,7 +2956,7 @@ OUString VCLXFixedHyperlink::getURL(  )
     return aText;
 }
 
-void VCLXFixedHyperlink::setAlignment( sal_Int16 nAlign )
+void VCLXFixedHyperlink::setAlignment( short nAlign )
 {
     SolarMutexGuard aGuard;
 
@@ -2977,11 +2977,11 @@ void VCLXFixedHyperlink::setAlignment( sal_Int16 nAlign )
     }
 }
 
-sal_Int16 VCLXFixedHyperlink::getAlignment()
+short VCLXFixedHyperlink::getAlignment()
 {
     SolarMutexGuard aGuard;
 
-    sal_Int16 nAlign = 0;
+    short nAlign = 0;
     VclPtr< vcl::Window > pWindow = GetWindow();
     if ( pWindow )
     {
@@ -3204,7 +3204,7 @@ OUString VCLXFixedText::getText()
     return aText;
 }
 
-void VCLXFixedText::setAlignment( sal_Int16 nAlign )
+void VCLXFixedText::setAlignment( short nAlign )
 {
     SolarMutexGuard aGuard;
 
@@ -3225,11 +3225,11 @@ void VCLXFixedText::setAlignment( sal_Int16 nAlign )
     }
 }
 
-sal_Int16 VCLXFixedText::getAlignment()
+short VCLXFixedText::getAlignment()
 {
     SolarMutexGuard aGuard;
 
-    sal_Int16 nAlign = 0;
+    short nAlign = 0;
     VclPtr< vcl::Window > pWindow = GetWindow();
     if ( pWindow )
     {
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 50b954452a30..2a9c42705b30 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -1466,14 +1466,14 @@ void UnoCheckBoxControl::setLabel( const OUString&  rLabel )
     ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), uno::Any(rLabel), true );
 }
 
-void UnoCheckBoxControl::setState( sal_Int16 n )
+void UnoCheckBoxControl::setState( short n )
 {
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(n), true );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(n)), true );
 }
 
-sal_Int16 UnoCheckBoxControl::getState()
+short UnoCheckBoxControl::getState()
 {
-    sal_Int16 nState = 0;
+    short nState = 0;
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ) );
     aVal >>= nState;
     return nState;
@@ -1646,14 +1646,14 @@ OUString UnoFixedHyperlinkControl::getURL(  )
     return ImplGetPropertyValue_UString( BASEPROPERTY_URL );
 }
 
-void UnoFixedHyperlinkControl::setAlignment( sal_Int16 nAlign )
+void UnoFixedHyperlinkControl::setAlignment( short nAlign )
 {
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(nAlign), true );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(static_cast<sal_Int16>(nAlign)), true );
 }
 
-sal_Int16 UnoFixedHyperlinkControl::getAlignment()
+short UnoFixedHyperlinkControl::getAlignment()
 {
-    sal_Int16 nAlign = 0;
+    short nAlign = 0;
     if ( mxModel.is() )
     {
         uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ) );
@@ -1839,14 +1839,14 @@ OUString UnoFixedTextControl::getText()
     return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL );
 }
 
-void UnoFixedTextControl::setAlignment( sal_Int16 nAlign )
+void UnoFixedTextControl::setAlignment( short nAlign )
 {
-    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(nAlign), true );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(static_cast<sal_Int16>(nAlign)), true );
 }
 
-sal_Int16 UnoFixedTextControl::getAlignment()
+short UnoFixedTextControl::getAlignment()
 {
-    sal_Int16 nAlign = 0;
+    short nAlign = 0;
     if ( mxModel.is() )
     {
         uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ) );