[Libreoffice-commits] core.git: 7 commits - accessibility/inc avmedia/source basctl/source basic/source codemaker/source comphelper/inc comphelper/source cppuhelper/inc cppuhelper/source cppu/source filter/source i18nutil/source include/comphelper sal/rtl
Caolán McNamara
caolanm at redhat.com
Sat Dec 27 15:01:20 PST 2014
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 4 -
avmedia/source/macavf/macavfcommon.hxx | 4 -
basctl/source/inc/bastypes.hxx | 4 -
basic/source/classes/sb.cxx | 6 +-
basic/source/classes/sbunoobj.cxx | 4 -
basic/source/inc/namecont.hxx | 4 -
basic/source/inc/sbunoobj.hxx | 4 -
basic/source/inc/scriptcont.hxx | 4 -
basic/source/runtime/runtime.cxx | 4 -
basic/source/runtime/stdobj.cxx | 1
codemaker/source/cppumaker/cpputype.cxx | 12 ++--
codemaker/source/javamaker/javatype.cxx | 26 ++++------
comphelper/inc/pch/precompiled_comphelper.hxx | 1
comphelper/source/container/embeddedobjectcontainer.cxx | 4 -
comphelper/source/misc/namedvaluecollection.cxx | 7 +-
comphelper/source/misc/numberedcollection.cxx | 4 -
cppu/source/threadpool/threadpool.cxx | 4 -
cppu/source/threadpool/threadpool.hxx | 5 -
cppu/source/typelib/typelib.cxx | 4 -
cppu/source/uno/EnvStack.cxx | 5 -
cppu/source/uno/lbenv.cxx | 10 +--
cppu/source/uno/lbmap.cxx | 8 +--
cppuhelper/inc/pch/precompiled_cppuhelper.hxx | 1
cppuhelper/source/component_context.cxx | 4 -
cppuhelper/source/interfacecontainer.cxx | 1
filter/source/msfilter/msdffimp.cxx | 2
i18nutil/source/utility/oneToOneMapping.cxx | 15 +++--
include/comphelper/PropertyInfoHash.hxx | 7 +-
include/comphelper/numberedcollection.hxx | 6 +-
include/comphelper/sequenceashashmap.hxx | 5 -
sal/rtl/bootstrap.cxx | 4 -
31 files changed, 81 insertions(+), 93 deletions(-)
New commits:
commit 7f476fea47f06a7f8cc961dd4f6595a524346fa5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 27 21:01:22 2014 +0000
boost::unordered_map -> c++11 std::unordered_map
Change-Id: I28438000c2b0a8e6ce4f5640f861f572c0cb83c8
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index bd0dbd1..05c87f0 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -54,7 +54,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <queue>
#include <boost/scoped_ptr.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class TextEngine;
class TextView;
@@ -383,7 +383,7 @@ private:
};
-typedef ::boost::unordered_map< OUString,
+typedef std::unordered_map< OUString,
css::beans::PropertyValue,
OUStringHash,
::std::equal_to< OUString > > tPropValMap;
diff --git a/avmedia/source/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx
index 79bf79c..ff4559e 100644
--- a/avmedia/source/macavf/macavfcommon.hxx
+++ b/avmedia/source/macavf/macavfcommon.hxx
@@ -25,7 +25,7 @@
#import <AVFoundation/AVFoundation.h>
#include <postmac.h>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
@@ -67,7 +67,7 @@ namespace avmedia { namespace macavf {
class MacAVObserverHandler;
} }
-typedef boost::unordered_map<NSObject*,avmedia::macavf::MacAVObserverHandler*> HandlersForObject;
+typedef std::unordered_map<NSObject*,avmedia::macavf::MacAVObserverHandler*> HandlersForObject;
@interface MacAVObserverObject : NSObject
{
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 7ccf511..da11bc7 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -26,7 +26,7 @@
#include <svtools/tabbar.hxx>
#include <vcl/toolbox.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
class SbModule;
class SfxItemSet;
@@ -287,7 +287,7 @@ public:
ItemType GetCurrentType() const { return m_eCurrentType; }
};
private:
- typedef boost::unordered_map<Key, Item, Key::Hash> Map;
+ typedef std::unordered_map<Key, Item, Key::Hash> Map;
Map m_aMap;
};
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 4d6c9a3..b8933b1 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/util/XCloseListener.hpp>
#include "errobject.hxx"
#include <boost/scoped_array.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/script/ModuleInfo.hpp>
@@ -167,7 +167,7 @@ void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) thr
namespace {
typedef ::rtl::Reference< DocBasicItem > DocBasicItemRef;
-typedef boost::unordered_map< const StarBASIC *, DocBasicItemRef > DocBasicItemMap;
+typedef std::unordered_map< const StarBASIC *, DocBasicItemRef > DocBasicItemMap;
class GaDocBasicItems : public rtl::Static<DocBasicItemMap,GaDocBasicItems> {};
@@ -1177,7 +1177,7 @@ struct ClassModuleRunInitItem
// Derive from unordered_map type instead of typedef
// to allow forward declaration in sbmod.hxx
class ModuleInitDependencyMap : public
- boost::unordered_map< OUString, ClassModuleRunInitItem,
+ std::unordered_map< OUString, ClassModuleRunInitItem,
OUStringHash, ::std::equal_to< OUString > >
{};
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 2277961..e0309f4 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -83,7 +83,7 @@
#include <math.h>
#include <boost/scoped_array.hpp>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <com/sun/star/reflection/XTypeDescriptionEnumerationAccess.hpp>
#include <com/sun/star/reflection/XConstantsTypeDescription.hpp>
@@ -3301,7 +3301,7 @@ Reference< XTypeDescriptionEnumeration > getTypeDescriptorEnumeration( const OUS
return xEnum;
}
-typedef boost::unordered_map< OUString, Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash;
+typedef std::unordered_map< OUString, Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash;
VBAConstantHelper&
VBAConstantHelper::instance()
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index c1c90d3..2295231 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX
#define INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -70,7 +70,7 @@ typedef ::cppu::WeakImplHelper3<
class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE
{
- typedef boost::unordered_map < OUString, sal_Int32, OUStringHash > NameContainerNameMap;
+ typedef std::unordered_map < OUString, sal_Int32, OUStringHash > NameContainerNameMap;
NameContainerNameMap mHashMap;
::com::sun::star::uno::Sequence< OUString > mNames;
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 5300e2c..8a985d0 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/reflection/XServiceTypeDescription2.hpp>
#include <com/sun/star/reflection/XSingletonTypeDescription.hpp>
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <map>
#include <boost/shared_ptr.hpp>
@@ -393,7 +393,7 @@ public:
virtual void Clear() SAL_OVERRIDE;
};
-typedef boost::unordered_map< OUString, ::com::sun::star::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash;
+typedef std::unordered_map< OUString, ::com::sun::star::uno::Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash;
typedef std::vector< OUString > VBAConstantsVector;
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 0a331b9..116e05c 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -132,7 +132,7 @@ public:
};
-typedef boost::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash, ::std::equal_to< OUString > > ModuleInfoMap;
+typedef std::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash, ::std::equal_to< OUString > > ModuleInfoMap;
typedef ::cppu::ImplHelper1< ::com::sun::star::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE;
@@ -140,7 +140,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
{
friend class SfxScriptLibraryContainer;
- typedef boost::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash > ModuleInfoMap;
+ typedef std::unordered_map< OUString, ::com::sun::star::script::ModuleInfo, OUStringHash > ModuleInfoMap;
bool mbLoadedSource;
bool mbLoadedBinary;
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 85f3549..e05ea92 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -21,7 +21,7 @@
#include <algorithm>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -1792,7 +1792,7 @@ struct SbxVariablePtrHash
{ return reinterpret_cast<size_t>(pVar); }
};
-typedef boost::unordered_map< SbxVariable*, DimAsNewRecoverItem,
+typedef std::unordered_map< SbxVariable*, DimAsNewRecoverItem,
SbxVariablePtrHash > DimAsNewRecoverHash;
class GaDimAsNewRecoverHash : public rtl::Static<DimAsNewRecoverHash, GaDimAsNewRecoverHash> {};
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 664d76c..f9f0b54 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -24,7 +24,6 @@
#include <sal/macros.h>
#include "rtlproto.hxx"
#include "sbintern.hxx"
-#include <boost/unordered_map.hpp>
// The nArgs-field of a table entry is encrypted as follows:
// At the moment it is assumed that properties don't need any
// parameters!
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx
index 5acedfd..fdbc176 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.hxx
@@ -23,7 +23,6 @@
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/static_assert.hpp>
-#include <boost/unordered_map.hpp>
#include <cassert>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index e3696f1..376ba35 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -41,15 +41,15 @@
#include <comphelper/embeddedobjectcontainer.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/weakref.hxx>
-#include <boost/unordered_map.hpp>
#include <algorithm>
+#include <unordered_map>
using namespace ::com::sun::star;
namespace comphelper {
-typedef boost::unordered_map<OUString, uno::Reference <embed::XEmbeddedObject>, OUStringHash>
+typedef std::unordered_map<OUString, uno::Reference <embed::XEmbeddedObject>, OUStringHash>
EmbeddedObjectContainerNameMap;
struct EmbedImpl
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index 0903579..e382235 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -26,10 +26,9 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
-#include <boost/unordered_map.hpp>
-#include <functional>
#include <algorithm>
-
+#include <functional>
+#include <unordered_map>
namespace comphelper
{
@@ -49,7 +48,7 @@ namespace comphelper
//= NamedValueCollection_Impl
- typedef ::boost::unordered_map< OUString, Any, OUStringHash > NamedValueRepository;
+ typedef std::unordered_map< OUString, Any, OUStringHash > NamedValueRepository;
struct NamedValueCollection_Impl
{
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index e927475..1056a5e 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -17,12 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
+#include <algorithm>
#include <comphelper/numberedcollection.hxx>
-
#include <com/sun/star/frame/UntitledNumbersConst.hpp>
-
namespace comphelper{
static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed.";
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index f41213b..f910cba 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -19,8 +19,8 @@
#include "sal/config.h"
-#include <boost/unordered_map.hpp>
#include <cassert>
+#include <unordered_map>
#include <stdio.h>
#include <osl/diagnose.h>
@@ -381,7 +381,7 @@ struct uno_ThreadPool_Hash
-typedef ::boost::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
+typedef std::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
static ThreadpoolHashSet *g_pThreadpoolHashSet;
diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx
index b1db7b3..a6b2fbc 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_CPPU_SOURCE_THREADPOOL_THREADPOOL_HXX
#include <list>
-
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <osl/conditn.h>
@@ -58,7 +57,7 @@ namespace cppu_threadpool {
}
};
- typedef ::boost::unordered_map
+ typedef std::unordered_map
<
::rtl::ByteSequence, // ThreadID
::std::pair < JobQueue * , JobQueue * >,
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 9ab878c..507b20f 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -22,7 +22,7 @@
#include <stdio.h>
#endif
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <cassert>
#include <list>
#include <set>
@@ -165,7 +165,7 @@ struct hashStr_Impl
// Heavy hack, the const sal_Unicode * is hold by the typedescription reference
-typedef boost::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
+typedef std::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
hashStr_Impl, equalStr_Impl > WeakMap_Impl;
typedef pair< void *, typelib_typedescription_Callback > CallbackEntry;
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index f19eeb0..080fa2e 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -29,8 +29,7 @@
#include "osl/thread.hxx"
#include "osl/mutex.hxx"
-#include <boost/unordered_map.hpp>
-
+#include <unordered_map>
using namespace com::sun::star;
@@ -58,7 +57,7 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const
return s1;
}
-typedef ::boost::unordered_map<oslThreadIdentifier,
+typedef std::unordered_map<oslThreadIdentifier,
uno_Environment *,
oslThreadIdentifier_hash,
oslThreadIdentifier_equal> ThreadMap;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 0d2bc0a..eb4e105 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -41,7 +41,7 @@
#include "destr.hxx"
#include "loadmodule.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <vector>
#include <stdio.h>
@@ -104,19 +104,17 @@ struct FctPtrHash :
// mapping from environment name to environment
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
OUString, uno_Environment *, OUStringHash > OUString2EnvironmentMap;
// mapping from ptr to object entry
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
void *, ObjectEntry *, FctPtrHash,
::std::equal_to< void * > > Ptr2ObjectMap;
// mapping from oid to object entry
-typedef ::boost::unordered_map<
+typedef std::unordered_map<
OUString, ObjectEntry *, OUStringHash > OId2ObjectMap;
-
-
struct EnvironmentsData
{
::osl::Mutex mutex;
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 48185d2..cd9db7f 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -21,10 +21,10 @@
#include "IdentityMapping.hxx"
-#include <boost/unordered_map.hpp>
-#include <set>
#include <algorithm>
#include <cassert>
+#include <set>
+#include <unordered_map>
#include "rtl/ustring.hxx"
#include "rtl/ustrbuf.hxx"
@@ -127,9 +127,9 @@ struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
{ return reinterpret_cast<size_t>(pKey); }
};
-typedef boost::unordered_map<
+typedef std::unordered_map<
OUString, MappingEntry *, OUStringHash > t_OUString2Entry;
-typedef boost::unordered_map<
+typedef std::unordered_map<
uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry;
typedef set< uno_getMappingFunc > t_CallbackSet;
diff --git a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
index fc69379..81686f2 100644
--- a/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
+++ b/cppuhelper/inc/pch/precompiled_cppuhelper.hxx
@@ -18,7 +18,6 @@
#include <boost/noncopyable.hpp>
#include <boost/scoped_array.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/unordered_map.hpp>
#include <cassert>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/Property.hpp>
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index 53b5eb0..ece0d64 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -26,7 +26,7 @@
#include <stdio.h>
#endif
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#ifdef CONTEXT_DIAG
#include <map>
#endif
@@ -347,7 +347,7 @@ protected:
, lateInit( lateInit_ )
{}
};
- typedef ::boost::unordered_map< OUString, ContextEntry * , OUStringHash > t_map;
+ typedef std::unordered_map< OUString, ContextEntry * , OUStringHash > t_map;
t_map m_map;
Reference< lang::XMultiComponentFactory > m_xSMgr;
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index 6c71660..da37a8c 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -26,7 +26,6 @@
#include <osl/mutex.hxx>
#include <boost/scoped_array.hpp>
-#include <boost/unordered_map.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
diff --git a/include/comphelper/PropertyInfoHash.hxx b/include/comphelper/PropertyInfoHash.hxx
index b0c89a0..365e2e4 100644
--- a/include/comphelper/PropertyInfoHash.hxx
+++ b/include/comphelper/PropertyInfoHash.hxx
@@ -22,7 +22,8 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Type.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
+
namespace comphelper
{
struct PropertyInfo
@@ -43,10 +44,10 @@ namespace comphelper
};
}
-typedef boost::unordered_map < OUString,
+typedef std::unordered_map < OUString,
::comphelper::PropertyInfo const *,
OUStringHash > PropertyInfoHash;
-typedef boost::unordered_map < OUString,
+typedef std::unordered_map < OUString,
::comphelper::PropertyData*,
OUStringHash > PropertyDataHash;
#endif
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index cd0ba95..f1d6ccc 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -30,9 +30,9 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/implbase1.hxx>
-
+#include <boost/functional/hash.hpp>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
namespace comphelper{
@@ -58,7 +58,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
::sal_Int32 nNumber;
};
- typedef ::boost::unordered_map<
+ typedef std::unordered_map<
long ,
TNumberedItem ,
::boost::hash< long > ,
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index 7d9cdfd..cd90643 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -20,9 +20,8 @@
#ifndef INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX
#define INCLUDED_COMPHELPER_SEQUENCEASHASHMAP_HXX
-#include <boost/unordered_map.hpp>
-
#include <algorithm>
+#include <unordered_map>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
@@ -41,7 +40,7 @@ namespace comphelper{
such name sequences very easy ...
*/
-struct SequenceAsHashMapBase : public ::boost::unordered_map<
+struct SequenceAsHashMapBase : public std::unordered_map<
OUString ,
::com::sun::star::uno::Any ,
OUStringHash ,
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 01f5331..775d327 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -39,8 +39,8 @@
#include <rtl/uri.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
#include <list>
+#include <unordered_map>
#ifdef ANDROID
#include <osl/detail/android-bootstrap.h>
@@ -594,7 +594,7 @@ void Bootstrap_Impl::expandValue(
namespace {
struct bootstrap_map: private boost::noncopyable {
- typedef boost::unordered_map<
+ typedef std::unordered_map<
rtl::OUString, Bootstrap_Impl *,
rtl::OUStringHash, std::equal_to< rtl::OUString > > t;
commit fc95782eb39cf4974ac4b3096695eeb89008937c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 27 20:34:27 2014 +0000
coverity#984097 Uninitialized pointer field
Change-Id: I3098e446f0a2a4cd82785d7dcaf101575ed0b476
diff --git a/i18nutil/source/utility/oneToOneMapping.cxx b/i18nutil/source/utility/oneToOneMapping.cxx
index 2ced0f8..3c73542 100644
--- a/i18nutil/source/utility/oneToOneMapping.cxx
+++ b/i18nutil/source/utility/oneToOneMapping.cxx
@@ -62,24 +62,25 @@ oneToOneMappingWithFlag::oneToOneMappingWithFlag( UnicodePairWithFlag *rpTableWF
mnFlag ( rnFlag ),
mbHasIndex( false )
{
+ memset(mpIndex, 0, sizeof(mpIndex));
}
oneToOneMappingWithFlag::~oneToOneMappingWithFlag()
{
if( mbHasIndex )
- for( int i = 0; i < 256; i++ )
- if( mpIndex[i] )
- delete [] mpIndex[i];
+ {
+ for (size_t i = 0; i < SAL_N_ELEMENTS(mpIndex); ++i)
+ delete [] mpIndex[i];
+ }
}
-
void oneToOneMappingWithFlag::makeIndex()
{
if( !mbHasIndex && mpTableWF )
{
- int i, j, current = -1;
+ int current = -1;
- for( i = 0; i < 256; i++ )
+ for (size_t i = 0; i < SAL_N_ELEMENTS(mpIndex); ++i)
mpIndex[i] = NULL;
for( size_t k = 0; k < mnSize; k++ )
@@ -91,7 +92,7 @@ void oneToOneMappingWithFlag::makeIndex()
current = high;
mpIndex[high] = new UnicodePairWithFlag*[256];
- for( j = 0; j < 256; j++ )
+ for (int j = 0; j < 256; ++j)
mpIndex[high][j] = NULL;
}
mpIndex[high][low] = &mpTableWF[k];
commit 4e7b2a7885ac0a3194f7f9d974c901cd41640a71
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 27 20:29:07 2014 +0000
coverity#735429 Logically dead code
Change-Id: I2f2bd16d04b8058ba0d253eb3d5455fabbad54cd
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 00320a3..f575f5a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5078,8 +5078,6 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
if (nTextRotationAngle)
{
- while (nTextRotationAngle > 360000)
- nTextRotationAngle-=9000;
switch (nTextRotationAngle)
{
case 9000:
commit 02d83cb52fe0e02d79389ce4b45204358d59fbb0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 27 20:24:37 2014 +0000
coverity#1019332 Unchecked dynamic_cast
Change-Id: I280928da005b8cdd94c8bf33eb5aaa86a5ea2fcd
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 09ba4af..d9639c1 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -1371,17 +1371,16 @@ void addPlainStructBaseArguments(
"unexpected entity \"" + base
+ "\" in call to addPlainStructBaseArguments");
}
- rtl::Reference< unoidl::PlainStructTypeEntity > ent2(
- dynamic_cast< unoidl::PlainStructTypeEntity * >(ent.get()));
- assert(ent2.is());
- if (!ent2->getDirectBase().isEmpty()) {
+ unoidl::PlainStructTypeEntity& ent2(
+ dynamic_cast<unoidl::PlainStructTypeEntity&>(*ent.get()));
+ if (!ent2.getDirectBase().isEmpty()) {
addPlainStructBaseArguments(
manager, dependencies, methodDescriptor, code,
- ent2->getDirectBase(), index);
+ ent2.getDirectBase(), index);
}
for (std::vector< unoidl::PlainStructTypeEntity::Member >::const_iterator i(
- ent2->getDirectMembers().begin());
- i != ent2->getDirectMembers().end(); ++i)
+ ent2.getDirectMembers().begin());
+ i != ent2.getDirectMembers().end(); ++i)
{
methodDescriptor->addParameter(i->type, false, true, 0);
addLoadLocal(manager, code, index, false, i->type, false, dependencies);
commit 435a3a32b12f4f13ab4d693c1b06780f77ed7a8d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 27 20:23:47 2014 +0000
coverity#1019331 Unchecked dynamic_cast
Change-Id: I902fdbcfd171e93ac57b5021269d2279610b4b0d
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index f60b163..09ba4af 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -1579,20 +1579,19 @@ void addExceptionBaseArguments(
"unexpected entity \"" + base
+ "\" in call to addExceptionBaseArguments");
}
- rtl::Reference< unoidl::ExceptionTypeEntity > ent2(
- dynamic_cast< unoidl::ExceptionTypeEntity * >(ent.get()));
- assert(ent2.is());
+ unoidl::ExceptionTypeEntity& ent2(
+ dynamic_cast<unoidl::ExceptionTypeEntity&>(*ent.get()));
bool baseException = base == "com.sun.star.uno.Exception";
if (!baseException) {
addExceptionBaseArguments(
manager, dependencies, methodDescriptor, code,
- ent2->getDirectBase(), index);
+ ent2.getDirectBase(), index);
}
for (std::vector< unoidl::ExceptionTypeEntity::Member >::const_iterator i(
- ent2->getDirectMembers().begin());
- i != ent2->getDirectMembers().end(); ++i)
+ ent2.getDirectMembers().begin());
+ i != ent2.getDirectMembers().end(); ++i)
{
- if (!baseException || i != ent2->getDirectMembers().begin()) {
+ if (!baseException || i != ent2.getDirectMembers().begin()) {
methodDescriptor->addParameter(i->type, false, true, 0);
addLoadLocal(
manager, code, index, false, i->type, false, dependencies);
commit be94376c74c5d1eedb8353bc28367b5d9e533482
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 27 20:22:18 2014 +0000
coverity#1019327 Unchecked dynamic_cast
Change-Id: Ibc5a1478d196681cbc124886924eebf065bbdb11
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index c76ef0d..3e27729 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3090,11 +3090,10 @@ sal_uInt32 ExceptionType::getTotalMemberCount(OUString const & base) const {
throw CannotDumpException(
"exception type base " + base + " is not an exception type");
}
- rtl::Reference< unoidl::ExceptionTypeEntity > ent2(
- dynamic_cast< unoidl::ExceptionTypeEntity * >(ent.get()));
- assert(ent2.is());
- return getTotalMemberCount(ent2->getDirectBase())
- + ent2->getDirectMembers().size(); //TODO: overflow
+ unoidl::ExceptionTypeEntity& ent2(
+ dynamic_cast< unoidl::ExceptionTypeEntity&>(*ent.get()));
+ return getTotalMemberCount(ent2.getDirectBase())
+ + ent2.getDirectMembers().size(); //TODO: overflow
}
class EnumType: public CppuType {
commit 6198aa8c14ade1c0d82316411d128aa8175552b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 27 20:21:11 2014 +0000
coverity#1019325 Unchecked dynamic_cast
Change-Id: Ic1607eea119a7321f65b0a0145a263a03406ed6d
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 5c015c9..c76ef0d 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2082,6 +2082,9 @@ bool PlainStructType::dumpBaseMembers(
rtl::Reference< unoidl::PlainStructTypeEntity > ent2(
dynamic_cast< unoidl::PlainStructTypeEntity * >(ent.get()));
assert(ent2.is());
+ if (!ent2.is()) {
+ return false;
+ }
hasMember = dumpBaseMembers(out, ent2->getDirectBase(), withType);
for (std::vector< unoidl::PlainStructTypeEntity::Member >::
const_iterator i(ent2->getDirectMembers().begin());
More information about the Libreoffice-commits
mailing list