diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-02 12:35:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-02 16:31:48 +0000 |
| commit | 2f33a8cd231d3842a1e5521e3a61d8e73517137b (patch) | |
| tree | 184c69d8545ce64cfc1c9e25fe4df9319eb252f4 /forms | |
| parent | fb41ebff32371ee7a7e07f671f7c769a8bb18718 (diff) | |
coverity#1403662 Mixing enum types
Change-Id: Ic5e797c65dfc736a9ef0ab14f3ae563216143947
Reviewed-on: https://gerrit.libreoffice.org/36020
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/Grid.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index c2bb083b7f9c..54b6809f6a41 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -33,7 +33,7 @@ #include <comphelper/container.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/queryinterface.hxx> -#include <toolkit/helper/vclunohelper.hxx> +#include <vcl/unohelp.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star::uno; @@ -823,7 +823,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream if ( nAnyMask & FONTDESCRIPTOR ) { // Attrib - _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( VCLUnoHelper::ConvertFontWeight( aFont.Weight ) ) ); + _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( vcl::unohelper::ConvertFontWeight( aFont.Weight ) ) ); _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( aFont.Slant ) ); _rxOutStream->writeShort( aFont.Underline ); _rxOutStream->writeShort( aFont.Strikeout ); @@ -833,7 +833,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream // Size _rxOutStream->writeLong( aFont.Width ); _rxOutStream->writeLong( aFont.Height ); - _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( VCLUnoHelper::ConvertFontWidth( aFont.CharacterWidth ) ) ); + _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( vcl::unohelper::ConvertFontWidth( aFont.CharacterWidth ) ) ); // Type _rxOutStream->writeUTF( aFont.Name ); _rxOutStream->writeUTF( aFont.StyleName ); @@ -933,7 +933,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) FontDescriptor aFont( getFont() ); if ( nAnyMask & FONTATTRIBS ) { - aFont.Weight = (float)VCLUnoHelper::ConvertFontWeight( _rxInStream->readShort() ); + aFont.Weight = (float)vcl::unohelper::ConvertFontWeight( _rxInStream->readShort() ); aFont.Slant = (FontSlant)_rxInStream->readShort(); aFont.Underline = _rxInStream->readShort(); aFont.Strikeout = _rxInStream->readShort(); @@ -945,7 +945,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) { aFont.Width = (sal_Int16)_rxInStream->readLong(); aFont.Height = (sal_Int16)_rxInStream->readLong(); - aFont.CharacterWidth = (float)VCLUnoHelper::ConvertFontWidth( _rxInStream->readShort() ); + aFont.CharacterWidth = (float)vcl::unohelper::ConvertFontWidth( _rxInStream->readShort() ); } if ( nAnyMask & FONTTYPE ) { |