diff options
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; |