std::set->o3tl::sorted_vector in MathTypeFontSet
Change-Id: I8b664f10bee232355eeb431de6b1445d9c797f6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134921 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
@@ -45,6 +45,7 @@ void MathType::Init()
|
|||||||
stored in the document
|
stored in the document
|
||||||
*/
|
*/
|
||||||
MathTypeFont aFont;
|
MathTypeFont aFont;
|
||||||
|
aUserStyles.reserve(11);
|
||||||
for(sal_uInt8 i=1;i<=11;i++)
|
for(sal_uInt8 i=1;i<=11;i++)
|
||||||
{
|
{
|
||||||
aFont.nTface = i+128;
|
aFont.nTface = i+128;
|
||||||
@@ -540,7 +541,7 @@ void MathTypeFont::AppendStyleToText(OUString &rRet)
|
|||||||
void MathType::TypeFaceToString(OUString &rTxt,sal_uInt8 nFace)
|
void MathType::TypeFaceToString(OUString &rTxt,sal_uInt8 nFace)
|
||||||
{
|
{
|
||||||
MathTypeFont aFont(nFace);
|
MathTypeFont aFont(nFace);
|
||||||
MathTypeFontSet::iterator aItr = aUserStyles.find(aFont);
|
auto aItr = aUserStyles.find(aFont);
|
||||||
if (aItr != aUserStyles.end())
|
if (aItr != aUserStyles.end())
|
||||||
aFont.nStyle = aItr->nStyle;
|
aFont.nStyle = aItr->nStyle;
|
||||||
aFont.AppendStyleToText(rTxt);
|
aFont.AppendStyleToText(rTxt);
|
||||||
|
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
#include <node.hxx>
|
#include <node.hxx>
|
||||||
|
|
||||||
#include <set>
|
#include <o3tl/sorted_vector.hxx>
|
||||||
|
|
||||||
class SfxMedium;
|
class SfxMedium;
|
||||||
class SotStorage;
|
class SotStorage;
|
||||||
@@ -46,7 +46,7 @@ struct LessMathTypeFont
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef ::std::set< MathTypeFont, LessMathTypeFont > MathTypeFontSet;
|
typedef o3tl::sorted_vector< MathTypeFont, LessMathTypeFont > MathTypeFontSet;
|
||||||
|
|
||||||
class MathType
|
class MathType
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user