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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/filter/html/htmlform.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlforw.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index c8dc6f681a69..431509fd2f4b 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -22,7 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <toolkit/helper/vclunohelper.hxx> +#include <vcl/unohelp.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmltokn.h> #include <svl/urihelper.hxx> @@ -1030,7 +1030,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - float fVal = VCLUnoHelper::ConvertFontWeight( + float fVal = vcl::unohelper::ConvertFontWeight( static_cast<const SvxWeightItem *>(pItem)->GetWeight() ); aTmp <<= fVal; rFCompPropSet->setPropertyValue( sPropName, aTmp ); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 12332ff02e4f..1d6df4fdeaa7 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -38,7 +38,7 @@ #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> #include <svl/urihelper.hxx> -#include <toolkit/helper/vclunohelper.hxx> +#include <vcl/unohelp.hxx> #include <svx/svdouno.hxx> #include <svx/fmglob.hxx> #include <editeng/brushitem.hxx> @@ -1108,7 +1108,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, if( auto x = o3tl::tryAccess<float>(aTmp) ) { FontWeight eWeight = - VCLUnoHelper::ConvertFontWeight( *x ); + vcl::unohelper::ConvertFontWeight( *x ); if( eWeight != WEIGHT_DONTKNOW && eWeight != WEIGHT_NORMAL ) aItemSet.Put( SvxWeightItem( eWeight, RES_CHRATR_WEIGHT ) ); } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index fec9c2cd0e53..4e25a26c8cac 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -21,7 +21,7 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> -#include <toolkit/helper/vclunohelper.hxx> +#include <vcl/unohelp.hxx> #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapes.hpp> @@ -2353,7 +2353,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, break; case RES_CHRATR_WEIGHT: - aTmp <<= (float)VCLUnoHelper::ConvertFontWeight( + aTmp <<= (float)vcl::unohelper::ConvertFontWeight( static_cast<const SvxWeightItem*>(pItem)->GetWeight() ); aFont.SetWeight( static_cast<const SvxWeightItem*>(pItem)->GetWeight() ); break; |