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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/fontdialog.cxx | 9 | ||||
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 9578f132f18f..88721feffa37 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -22,6 +22,7 @@ #include "formresid.hrc" #include "modulepcr.hxx" #include <vcl/svapp.hxx> +#include <vcl/unohelp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/types.hxx> #include <comphelper/extract.hxx> @@ -226,8 +227,8 @@ namespace pcr nFontHeight = (float)OutputDevice::LogicToLogic(Size(0, (sal_Int32)nFontHeight), MapUnit::MapPoint, MapUnit::MapTwip).Height(); SvxFontHeightItem aSvxFontHeightItem((sal_uInt32)nFontHeight,100,CFID_HEIGHT); - FontWeight eWeight=VCLUnoHelper::ConvertFontWeight(nFontWeight); - FontItalic eItalic=VCLUnoHelper::ConvertFontSlant(nFontSlant); + FontWeight eWeight=vcl::unohelper::ConvertFontWeight(nFontWeight); + FontItalic eItalic=vcl::unohelper::ConvertFontSlant(nFontSlant); FontLineStyle eUnderline=(FontLineStyle)nFontLineStyle; FontStrikeout eStrikeout=(FontStrikeout)nFontStrikeout; @@ -341,7 +342,7 @@ namespace pcr const SvxWeightItem& rWeightItem = static_cast<const SvxWeightItem&>(_rSet.Get(CFID_WEIGHT)); - float nWeight = VCLUnoHelper::ConvertFontWeight(rWeightItem.GetWeight()); + float nWeight = vcl::unohelper::ConvertFontWeight(rWeightItem.GetWeight()); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_WEIGHT,makeAny(nWeight)); } @@ -354,7 +355,7 @@ namespace pcr const SvxPostureItem& rPostureItem = static_cast<const SvxPostureItem&>(_rSet.Get(CFID_POSTURE)); - css::awt::FontSlant eSlant = VCLUnoHelper::ConvertFontSlant(rPostureItem.GetPosture()); + css::awt::FontSlant eSlant = vcl::unohelper::ConvertFontSlant(rPostureItem.GetPosture()); lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_SLANT, makeAny((sal_Int16)eSlant)); } diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index bb65731c13f2..0593d8839492 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -93,7 +93,7 @@ #include <svx/numinf.hxx> #include <svx/svxdlg.hxx> #include <svx/svxids.hrc> -#include <toolkit/helper/vclunohelper.hxx> +#include <vcl/unohelp.hxx> #include <tools/diagnose_ex.h> #include <tools/resary.hxx> #include <vcl/msgbox.hxx> @@ -760,7 +760,7 @@ namespace pcr displayName.append( ", " ); // font style - ::FontWeight eWeight = VCLUnoHelper::ConvertFontWeight( aFont.Weight ); + ::FontWeight eWeight = vcl::unohelper::ConvertFontWeight( aFont.Weight ); sal_uInt16 nStyleResID = RID_STR_FONTSTYLE_REGULAR; if ( aFont.Slant == FontSlant_ITALIC ) { |