mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused SubsFontFlags flags

Browse Source 
and document in the registry that the SubstFontsPS is unused

Change-Id: I66a9e0b4353f17b34cffb02823726c9887b7bdd3
Reviewed-on: https://gerrit.libreoffice.org/64065
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2018-11-26 10:25:31 +02:00
parent 11fc3b52db
commit 33e80611c4
6 changed files with 13 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compilerplugins/clang/unusedenumconstants.readonly.results
View File

@ -580,10 +580,6 @@ include/unotools/fontcfg.hxx:85
enum ImplFontAttrs AllSubscript
include/unotools/fontcfg.hxx:86
enum ImplFontAttrs AllSerifStyle
include/unotools/fontdefs.hxx:31
enum SubsFontFlags PS
include/unotools/fontdefs.hxx:32
enum SubsFontFlags HTML
include/unotools/fontdefs.hxx:70
enum DefaultFontType LATIN_DISPLAY
include/unotools/fontdefs.hxx:71

2
include/unotools/fontcfg.hxx
View File

@ -129,8 +129,6 @@ struct UNOTOOLS_DLLPUBLIC FontNameAttr
OUString Name;
::std::vector< OUString > Substitutions;
::std::vector< OUString > MSSubstitutions;
::std::vector< OUString > PSSubstitutions;
::std::vector< OUString > HTMLSubstitutions;
FontWeight Weight;
FontWidth Width;
ImplFontAttrs Type;

6
include/unotools/fontdefs.hxx
View File

@ -27,14 +27,12 @@
enum class SubsFontFlags
{
ONLYONE = 0x01,
MS = 0x02,
PS = 0x04,
HTML = 0x08,
MS = 0x02
};
namespace o3tl
{
template<> struct typed_flags<SubsFontFlags> : is_typed_flags<SubsFontFlags, 0x0f> {};
template<> struct typed_flags<SubsFontFlags> : is_typed_flags<SubsFontFlags, 0x03> {};
}
UNOTOOLS_DLLPUBLIC OUString GetSubsFontName( const OUString& rName, SubsFontFlags nFlags );

4
officecfg/registry/schema/org/openoffice/VCL.xcs
View File

@ -38,12 +38,12 @@
</prop>
<prop oor:name="SubstFontsPS" oor:type="xs:string">
<info>
<desc>Contains a list of substitute fonts used in a PostScript context (for example, EPS export).</desc>
<desc>Unused. Used to contain a list of substitute fonts used in a PostScript context (for example, EPS export).</desc>
</info>
</prop>
<prop oor:name="SubstFontsHTML" oor:type="xs:string">
<info>
<desc>Contains a list of substitute fonts used in a HTML context (for example, HTML import/export).</desc>
<desc>Unused. Used to contain a list of substitute fonts used in a HTML context (for example, HTML import/export).</desc>
</info>
</prop>
<prop oor:name="FontWeight" oor:type="xs:string">

4
unotools/source/config/fontcfg.cxx
View File

@ -1002,8 +1002,6 @@ void FontSubstConfiguration::readLocaleSubst( const OUString& rBcp47 ) const
// strings for subst retrieval, construct only once
OUString const aSubstFontsStr ( "SubstFonts" );
OUString const aSubstFontsMSStr ( "SubstFontsMS" );
OUString const aSubstFontsPSStr ( "SubstFontsPS" );
OUString const aSubstFontsHTMLStr ( "SubstFontsHTML" );
OUString const aSubstWeightStr ( "FontWeight" );
OUString const aSubstWidthStr ( "FontWidth" );
OUString const aSubstTypeStr ( "FontType" );
@ -1032,8 +1030,6 @@ void FontSubstConfiguration::readLocaleSubst( const OUString& rBcp47 ) const
aAttr.Name = pFontNames[i];
fillSubstVector( xFont, aSubstFontsStr, aAttr.Substitutions );
fillSubstVector( xFont, aSubstFontsMSStr, aAttr.MSSubstitutions );
fillSubstVector( xFont, aSubstFontsPSStr, aAttr.PSSubstitutions );
fillSubstVector( xFont, aSubstFontsHTMLStr, aAttr.HTMLSubstitutions );
aAttr.Weight = getSubstWeight( xFont, aSubstWeightStr );
aAttr.Width = getSubstWidth( xFont, aSubstWidthStr );
aAttr.Type = getSubstType( xFont, aSubstTypeStr );

37
unotools/source/misc/fontdefs.cxx
View File

@ -529,37 +529,18 @@ OUString GetSubsFontName( const OUString& rName, SubsFontFlags nFlags )
const utl::FontNameAttr* pAttr = utl::FontSubstConfiguration::get().getSubstInfo( aOrgName );
if ( pAttr )
{
for( int i = 0; i < 3; i++ )
{
const ::std::vector< OUString >* pVector = nullptr;
switch( i )
if( nFlags & SubsFontFlags::MS && !pAttr->MSSubstitutions.empty() )
{
case 0:
if( nFlags & SubsFontFlags::MS && !pAttr->MSSubstitutions.empty() )
pVector = &pAttr->MSSubstitutions;
break;
case 1:
if( nFlags & SubsFontFlags::PS && !pAttr->PSSubstitutions.empty() )
pVector = &pAttr->PSSubstitutions;
break;
case 2:
if( nFlags & SubsFontFlags::HTML && !pAttr->HTMLSubstitutions.empty() )
pVector = &pAttr->HTMLSubstitutions;
break;
}
if( ! pVector )
continue;
for( const auto& rSubstitution : *pVector )
if( ! ImplIsFontToken( rName, rSubstitution ) )
{
ImplAppendFontToken( aName, rSubstitution );
if( nFlags & SubsFontFlags::ONLYONE )
for( const auto& rSubstitution : pAttr->MSSubstitutions )
if( ! ImplIsFontToken( rName, rSubstitution ) )
{
i = 4;
break;
ImplAppendFontToken( aName, rSubstitution );
if( nFlags & SubsFontFlags::ONLYONE )
{
break;
}
}
}
}
}
}
return aName;