diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-24 12:54:28 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-25 07:00:51 +0200 |
commit | 8f254a45d78dee53764321244aca108e2a1d344c (patch) | |
tree | 0de6c2591e041e3e75085880b84e9c80afaa5f26 /sw | |
parent | e4f28aea21ce7e8f960cc2062f83715549be215e (diff) |
loplugin:checkunusedparams in vcl
Change-Id: I26661684e634aa15a18f78442de15c9db832f319
Reviewed-on: https://gerrit.libreoffice.org/36886
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 14 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c59dc7520f5f..6c0176fd3bba 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5951,14 +5951,14 @@ void DocxAttributeOutput::FontPitchType( FontPitch ePitch ) const FSEND ); } -void DocxAttributeOutput::EmbedFont( const OUString& name, FontFamily family, FontPitch pitch, rtl_TextEncoding encoding ) +void DocxAttributeOutput::EmbedFont( const OUString& name, FontFamily family, FontPitch pitch ) { if( !m_rExport.m_pDoc->getIDocumentSettingAccess().get( DocumentSettingId::EMBED_FONTS )) return; // no font embedding with this document - EmbedFontStyle( name, XML_embedRegular, family, ITALIC_NONE, WEIGHT_NORMAL, pitch, encoding ); - EmbedFontStyle( name, XML_embedBold, family, ITALIC_NONE, WEIGHT_BOLD, pitch, encoding ); - EmbedFontStyle( name, XML_embedItalic, family, ITALIC_NORMAL, WEIGHT_NORMAL, pitch, encoding ); - EmbedFontStyle( name, XML_embedBoldItalic, family, ITALIC_NORMAL, WEIGHT_BOLD, pitch, encoding ); + EmbedFontStyle( name, XML_embedRegular, family, ITALIC_NONE, WEIGHT_NORMAL, pitch ); + EmbedFontStyle( name, XML_embedBold, family, ITALIC_NONE, WEIGHT_BOLD, pitch ); + EmbedFontStyle( name, XML_embedItalic, family, ITALIC_NORMAL, WEIGHT_NORMAL, pitch ); + EmbedFontStyle( name, XML_embedBoldItalic, family, ITALIC_NORMAL, WEIGHT_BOLD, pitch ); } static inline char toHexChar( int value ) @@ -5967,11 +5967,11 @@ static inline char toHexChar( int value ) } void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, FontFamily family, FontItalic italic, - FontWeight weight, FontPitch pitch, rtl_TextEncoding encoding ) + FontWeight weight, FontPitch pitch ) { // Embed font if at least viewing is allowed (in which case the opening app must check // the font license rights too and open either read-only or not use the font for editing). - OUString fontUrl = EmbeddedFontsHelper::fontFileUrl( name, family, italic, weight, pitch, encoding, + OUString fontUrl = EmbeddedFontsHelper::fontFileUrl( name, family, italic, weight, pitch, EmbeddedFontsHelper::FontRights::ViewingAllowed ); if( fontUrl.isEmpty()) return; diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 4cb05b0b470b..9fb89a318a8a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -340,7 +340,7 @@ public: void FontPitchType( FontPitch ePitch ) const; /// Write out the font into the document, if it's an embedded font. - void EmbedFont( const OUString& name, FontFamily family, FontPitch pitch, rtl_TextEncoding encoding ); + void EmbedFont( const OUString& name, FontFamily family, FontPitch pitch ); /// Definition of a numbering instance. virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) override; @@ -438,7 +438,7 @@ private: void WritePendingPlaceholder(); void EmbedFontStyle( const OUString& name, int tag, FontFamily family, FontItalic italic, FontWeight weight, - FontPitch pitch, rtl_TextEncoding encoding ); + FontPitch pitch ); /** * Translate an ico value to the corresponding HighlightColorValues enumaration item diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 21a60dabdfdd..b610e8211b1f 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -794,7 +794,7 @@ void wwFont::WriteDocx( DocxAttributeOutput* rAttrOutput ) const rAttrOutput->FontCharset( sw::ms::rtl_TextEncodingToWinCharset( meChrSet ), meChrSet ); rAttrOutput->FontFamilyType( meFamily ); rAttrOutput->FontPitchType( mePitch ); - rAttrOutput->EmbedFont( msFamilyNm, meFamily, mePitch, meChrSet ); + rAttrOutput->EmbedFont( msFamilyNm, meFamily, mePitch ); rAttrOutput->EndFont(); } |