diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-04 04:25:16 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-04 05:16:08 +1100 |
| commit | 7eab7f3485e525635f06a505776618c30e442a26 (patch) | |
| tree | b02a328084b90e43306589ccf73dddbb757277be /sc | |
| parent | 6aa4496c789fec271dcdc7995cf62ef2dabf1f96 (diff) | |
Cleanup after removing vcl::FontInfo class
Change-Id: I544eac439cb7277e47a23a90c6fbc45496161c3b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index a179192a09ae..8299b9dcfea1 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -740,11 +740,11 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico aParaText = "&\"" + OUString(aNewData.maName); if( pFontList ) { - FontMetric aFontInfo( pFontList->Get( + FontMetric aFontMetric( pFontList->Get( aNewData.maName, (aNewData.mnWeight > EXC_FONTWGHT_NORMAL) ? WEIGHT_BOLD : WEIGHT_NORMAL, aNewData.mbItalic ? ITALIC_NORMAL : ITALIC_NONE ) ); - aNewData.maStyle = pFontList->GetStyleName( aFontInfo ); + aNewData.maStyle = pFontList->GetStyleName( aFontMetric ); if( !aNewData.maStyle.isEmpty() ) aParaText += "," + aNewData.maStyle; } diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 2bac32676951..ad99a0286fb3 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -207,9 +207,9 @@ void XclImpFont::SetFontData( const XclFontData& rFontData, bool bHasCharSet ) { if( const FontList* pFontList = pInfoItem->GetFontList() ) { - FontMetric aFontInfo( pFontList->Get( maData.maName, maData.maStyle ) ); - maData.SetScWeight( aFontInfo.GetWeight() ); - maData.SetScPosture( aFontInfo.GetItalic() ); + FontMetric aFontMetric( pFontList->Get( maData.maName, maData.maStyle ) ); + maData.SetScWeight( aFontMetric.GetWeight() ); + maData.SetScPosture( aFontMetric.GetItalic() ); } } } |