diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:57:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-05 12:12:26 +0100 |
| commit | 191f85df5851473af270be486f95f940e3091fef (patch) | |
| tree | 753d9513ccda8ee2a132bdad74eedc47bd71b179 /toolkit/source/controls | |
| parent | Add support for <image> draw definition to draw a SVG image (diff) | |
| download | core-191f85df5851473af270be486f95f940e3091fef.tar.gz core-191f85df5851473af270be486f95f940e3091fef.zip | |
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/source/controls')
| -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 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 ) ); |