diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:56:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:56:11 +0200 |
| commit | c9bb48386bad7d2a40e6958883328145ae439cad (patch) | |
| tree | 8576ed314b2d219fdd96b8c1990f16fb70847a54 /toolkit/source/controls/unocontrols.cxx | |
| parent | 9865440d217d975206a3f91612f0666312bc8fd8 (diff) | |
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.
Diffstat (limited to 'toolkit/source/controls/unocontrols.cxx')
| -rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
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 ) ); |