diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-10-26 13:08:00 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2016-10-26 08:39:09 +0000 |
| commit | c498c97f7457fe7ef34164a822c9a1e2f04e9b1d (patch) | |
| tree | 6ec5c887fa9c6ba418dee904f34cfff7c2a6e305 /filter | |
| parent | 41832d27c3325808333c21b9181db84ae9788978 (diff) | |
The default std::less<sal_uInt16> is fine
Change-Id: I29cd62ef0b687613ed9bda5170511dcae2fc6e7e
Reviewed-on: https://gerrit.libreoffice.org/30282
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/flash/swfwriter.hxx | 12 | ||||
| -rw-r--r-- | filter/source/flash/swfwriter2.cxx | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 8d3c8b4a0801..002a6e6775f0 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -109,16 +109,6 @@ sal_uInt32 getFixed( double fValue ); typedef ::std::map<BitmapChecksum, sal_uInt16> ChecksumCache; -/** unsigned int 16 compare operation for stl */ -struct ltuint16 -{ - bool operator()(sal_uInt16 s1, sal_uInt16 s2) const - { - return s1 < s2; - } -}; - - /** container class to create bit structures */ class BitStream { @@ -159,7 +149,7 @@ public: private: const vcl::Font maFont; - std::map<sal_uInt16, sal_uInt16, ltuint16> maGlyphIndex; + std::map<sal_uInt16, sal_uInt16> maGlyphIndex; sal_uInt16 mnNextIndex; sal_uInt16 mnId; BitStream maGlyphData; diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index 9c39a2cac3ac..185bd6056c8b 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -400,7 +400,7 @@ FlashFont::~FlashFont() sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev ) { // see if we already created a glyph for this character - std::map<sal_uInt16, sal_uInt16, ltuint16>::iterator aIter( maGlyphIndex.find(nChar) ); + std::map<sal_uInt16, sal_uInt16>::iterator aIter( maGlyphIndex.find(nChar) ); if( aIter != maGlyphIndex.end() ) { return aIter->second; |