summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 08:57:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-05 12:12:26 +0100
commit191f85df5851473af270be486f95f940e3091fef (patch)
tree753d9513ccda8ee2a132bdad74eedc47bd71b179 /toolkit
parent983566119c926d0e2478f74548f00a789de55c15 (diff)
re-land "new loplugin typedefparam""
This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad, and adds a bunch more fixes. Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a Reviewed-on: https://gerrit.libreoffice.org/68680 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxwindows.cxx20
-rw-r--r--toolkit/source/controls/unocontrols.cxx24
2 files changed, 22 insertions, 22 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index d68c09a9eef6..b25cdce8acba 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, short Flags )
+void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
{
SolarMutexGuard aGuard;
@@ -863,7 +863,7 @@ void VCLXCheckBox::setLabel( const OUString& rLabel )
pWindow->SetText( rLabel );
}
-void VCLXCheckBox::setState( short n )
+void VCLXCheckBox::setState( sal_Int16 n )
{
SolarMutexGuard aGuard;
@@ -891,11 +891,11 @@ void VCLXCheckBox::setState( short n )
}
}
-short VCLXCheckBox::getState()
+sal_Int16 VCLXCheckBox::getState()
{
SolarMutexGuard aGuard;
- short nState = -1;
+ sal_Int16 nState = -1;
VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >();
if ( pCheckBox )
{
@@ -2956,7 +2956,7 @@ OUString VCLXFixedHyperlink::getURL( )
return aText;
}
-void VCLXFixedHyperlink::setAlignment( short nAlign )
+void VCLXFixedHyperlink::setAlignment( sal_Int16 nAlign )
{
SolarMutexGuard aGuard;
@@ -2977,11 +2977,11 @@ void VCLXFixedHyperlink::setAlignment( short nAlign )
}
}
-short VCLXFixedHyperlink::getAlignment()
+sal_Int16 VCLXFixedHyperlink::getAlignment()
{
SolarMutexGuard aGuard;
- short nAlign = 0;
+ sal_Int16 nAlign = 0;
VclPtr< vcl::Window > pWindow = GetWindow();
if ( pWindow )
{
@@ -3204,7 +3204,7 @@ OUString VCLXFixedText::getText()
return aText;
}
-void VCLXFixedText::setAlignment( short nAlign )
+void VCLXFixedText::setAlignment( sal_Int16 nAlign )
{
SolarMutexGuard aGuard;
@@ -3225,11 +3225,11 @@ void VCLXFixedText::setAlignment( short nAlign )
}
}
-short VCLXFixedText::getAlignment()
+sal_Int16 VCLXFixedText::getAlignment()
{
SolarMutexGuard aGuard;
- short nAlign = 0;
+ sal_Int16 nAlign = 0;
VclPtr< vcl::Window > pWindow = GetWindow();
if ( pWindow )
{
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 2a9c42705b30..50b954452a30 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( short n )
+void UnoCheckBoxControl::setState( sal_Int16 n )
{
- ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(static_cast<sal_Int16>(n)), true );
+ ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_STATE ), uno::Any(n), true );
}
-short UnoCheckBoxControl::getState()
+sal_Int16 UnoCheckBoxControl::getState()
{
- short nState = 0;
+ sal_Int16 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( short nAlign )
+void UnoFixedHyperlinkControl::setAlignment( sal_Int16 nAlign )
{
- ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(static_cast<sal_Int16>(nAlign)), true );
+ ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(nAlign), true );
}
-short UnoFixedHyperlinkControl::getAlignment()
+sal_Int16 UnoFixedHyperlinkControl::getAlignment()
{
- short nAlign = 0;
+ sal_Int16 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( short nAlign )
+void UnoFixedTextControl::setAlignment( sal_Int16 nAlign )
{
- ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(static_cast<sal_Int16>(nAlign)), true );
+ ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ), uno::Any(nAlign), true );
}
-short UnoFixedTextControl::getAlignment()
+sal_Int16 UnoFixedTextControl::getAlignment()
{
- short nAlign = 0;
+ sal_Int16 nAlign = 0;
if ( mxModel.is() )
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_ALIGN ) );