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

starmath: Make stricter assertion to prevent out of range

Browse Source 
Change-Id: I3ce0712e5095ade35628bad026a91a11dc6b9967
Reviewed-on: https://gerrit.libreoffice.org/34146
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
This commit is contained in:
Takeshi Abe
2017-02-11 19:06:51 +09:00
parent 258f2f439b
commit ad849f4bda
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
starmath/source/format.cxx
View File

@@ -21,6 +21,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <editeng/scripttypeitem.hxx> #include <editeng/scripttypeitem.hxx>
#include "format.hxx" #include "format.hxx"
#include <cassert>
// Latin default-fonts // Latin default-fonts
@@ -68,28 +69,20 @@ static const DefaultFontType aCTLDefFnts[FNT_END] =
OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent )
{ {
OSL_ENSURE( /*FNT_BEGIN <= nIdent &&*/ nIdent <= FNT_END, assert(nIdent < FNT_END);
"index out opd range" ); const DefaultFontType *pTable;
switch ( SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ) )
if (FNT_MATH == nIdent)
return OUString(FNTNAME_MATH);
else
{ {
const DefaultFontType *pTable; case SvtScriptType::LATIN : pTable = aLatinDefFnts; break;
switch ( SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ) ) case SvtScriptType::ASIAN : pTable = aCJKDefFnts; break;
{ case SvtScriptType::COMPLEX : pTable = aCTLDefFnts; break;
case SvtScriptType::LATIN : pTable = aLatinDefFnts; break; default :
case SvtScriptType::ASIAN : pTable = aCJKDefFnts; break; pTable = aLatinDefFnts;
case SvtScriptType::COMPLEX : pTable = aCTLDefFnts; break; SAL_WARN("starmath", "unknown script-type");
default :
pTable = aLatinDefFnts;
SAL_WARN("starmath", "unknown script-type");
}
return OutputDevice::GetDefaultFont(
pTable[ nIdent ], nLang,
GetDefaultFontFlags::OnlyOne ).GetFamilyName();
} }
return OutputDevice::GetDefaultFont(pTable[ nIdent ], nLang,
GetDefaultFontFlags::OnlyOne ).GetFamilyName();
} }