dbaccess/source/ui/inc/unodatbr.hxx | 2 +-
filter/source/flash/swfwriter.hxx | 12 +-----------
filter/source/flash/swfwriter2.cxx | 2 +-
include/xmloff/nmspmap.hxx | 9 +--------
4 files changed, 4 insertions(+), 21 deletions(-)
New commits:
commit c498c97f7457fe7ef34164a822c9a1e2f04e9b1d
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Wed Oct 26 13:08:00 2016 +0900
The default std::less<sal_uInt16> is fine
Change-Id: I29cd62ef0b687613ed9bda5170511dcae2fc6e7e
Reviewed-on: https://gerrit.libreoffice.org/30282
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Takeshi Abe <t...@fixedpoint.jp>
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx
b/dbaccess/source/ui/inc/unodatbr.hxx
index b66d671..f8bd65a 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -85,7 +85,7 @@ namespace dbaui
ExternalFeature( const css::util::URL& _rURL ) : aURL( _rURL ),
bEnabled( false ) { }
};
- typedef ::std::map< sal_uInt16, ExternalFeature, ::std::less<
sal_uInt16 > > ExternalFeaturesMap;
+ typedef ::std::map< sal_uInt16, ExternalFeature > ExternalFeaturesMap;
ExternalFeaturesMap m_aExternalFeatures;
svx::ODataAccessDescriptor m_aDocumentDataSource;
diff --git a/filter/source/flash/swfwriter.hxx
b/filter/source/flash/swfwriter.hxx
index 8d3c8b4..002a6e6 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 9c39a2c..185bd60 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;
diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx
index b2926d9..2befda4 100644
--- a/include/xmloff/nmspmap.hxx
+++ b/include/xmloff/nmspmap.hxx
@@ -50,13 +50,6 @@ public:
sal_uInt16 nKey;
};
-struct uInt32lt
-{
- bool operator()( sal_uInt32 r1, sal_uInt32 r2) const
- {
- return r1 < r2;
- }
-};
typedef ::std::pair < sal_uInt16, OUString > QNamePair;
struct QNamePairHash
@@ -69,7 +62,7 @@ struct QNamePairHash
typedef std::unordered_map < QNamePair, OUString, QNamePairHash > QNameCache;
typedef std::unordered_map < OUString, ::rtl::Reference <NameSpaceEntry >,
OUStringHash > NameSpaceHash;
-typedef std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt >
NameSpaceMap;
+typedef std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry > >
NameSpaceMap;
class XMLOFF_DLLPUBLIC SvXMLNamespaceMap
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
