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

cppu::OMultiTypeInterfaceContainerHelperVar hashImpl param is unused

Browse Source 
...since f059134fab "INTEGRATION: CWS
cppuhelpshrink: #i72766# save memory in cppuhelper, using a vector instead of a
hash_map" (but a dummy "void" default is left in place for backwards
compatibility).

Change-Id: I3bb0af8158f34737d41c344464f3cf944e2891ed
This commit is contained in:
Stephan Bergmann
2014-04-15 07:44:14 +02:00
parent c2ffc9e180
commit fa0ffdbeb5
21 changed files with 37 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
comphelper/source/property/genericpropertyset.cxx
View File

@@ -58,7 +58,7 @@ namespace comphelper
{
private:
GenericAnyMapImpl maAnyMap;
::cppu::OMultiTypeInterfaceContainerHelperVar<OUString, OUStringHash> m_aListener;
cppu::OMultiTypeInterfaceContainerHelperVar<OUString> m_aListener;
protected:
virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) SAL_OVERRIDE;

4
cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
View File

@@ -237,8 +237,8 @@ namespace cppu_ifcontainer
void testOMultiTypeInterfaceContainerHelperVar()
{
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<
const char*, rtl::CStringHash, rtl::CStringEqual> StrContainer;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<
char const *, void, rtl::CStringEqual> StrContainer;
const char *pTypes[nTests] =
{

6
dbaccess/source/core/inc/ContentHelper.hxx
View File

@@ -77,10 +77,8 @@ namespace dbaccess
typedef ::boost::shared_ptr<OContentHelper_Impl> TContentPtr;
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString,
OUStringHash
> PropertyChangeListenerContainer;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer;
typedef ::comphelper::OBaseMutex OContentHelper_MBASE;
typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent
, ::com::sun::star::ucb::XCommandProcessor

9
dbaccess/source/ui/inc/sbagrid.hxx
View File

@@ -48,12 +48,6 @@ namespace dbaui
bool operator() (const ::com::sun::star::util::URL& x, const ::com::sun::star::util::URL& y) const {return x.Complete == y.Complete ? true : false;}
};
struct SbaURLHash
{
sal_Int32 operator() (const ::com::sun::star::util::URL& x) const {return x.Complete.hashCode();}
};
// SbaXGridControl
class SbaXStatusMultiplexer;
class SbaXGridControl
:public FmXGridControl
@@ -103,7 +97,8 @@ namespace dbaui
:public FmXGridPeer
,public ::com::sun::star::frame::XDispatch
{
::cppu::OMultiTypeInterfaceContainerHelperVar< ::com::sun::star::util::URL,SbaURLHash , SbaURLCompare> m_aStatusListeners;
cppu::OMultiTypeInterfaceContainerHelperVar<
css::util::URL, void, SbaURLCompare> m_aStatusListeners;
public:
SbaXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);

2
dbaccess/source/ui/inc/sbamultiplex.hxx
View File

@@ -185,7 +185,7 @@ namespace dbaui
,public listenerclass \
{ \
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< \
OUString, OUStringHash > ListenerContainerMap; \
OUString > ListenerContainerMap; \
ListenerContainerMap m_aListeners; \
\
public: \

6
embeddedobj/source/general/intercept.cxx
View File

@@ -32,13 +32,11 @@ using namespace ::com::sun::star;
uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL);
class StatusChangeListenerContainer
: public ::cppu::OMultiTypeInterfaceContainerHelperVar<
OUString,OUStringHash>
: public cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
{
public:
StatusChangeListenerContainer( ::osl::Mutex& aMutex )
: cppu::OMultiTypeInterfaceContainerHelperVar<
OUString,OUStringHash>(aMutex)
: cppu::OMultiTypeInterfaceContainerHelperVar<OUString>(aMutex)
{
}
};

6
embedserv/source/embed/intercept.cxx
View File

@@ -33,13 +33,11 @@ using namespace ::com::sun::star;
uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL);
class StatusChangeListenerContainer
: public ::cppu::OMultiTypeInterfaceContainerHelperVar<
OUString,OUStringHash>
: public cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
{
public:
StatusChangeListenerContainer( ::osl::Mutex& aMutex )
: cppu::OMultiTypeInterfaceContainerHelperVar<
OUString,OUStringHash>(aMutex)
: cppu::OMultiTypeInterfaceContainerHelperVar<OUString>(aMutex)
{
}
};

9
framework/inc/dispatch/menudispatcher.hxx
View File

@@ -47,13 +47,8 @@
namespace framework{
/*-************************************************************************************************************
We must save information about our listener and URL for listening.
We implement this as a hashtable for strings.
*//*-*************************************************************************************************************/
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
OUStringHash > IMPL_ListenerHashContainer;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
IMPL_ListenerHashContainer;
/*-************************************************************************************************************
@short helper for desktop only(!) to create new tasks on demand for dispatches

9
framework/inc/dispatch/popupmenudispatcher.hxx
View File

@@ -49,13 +49,8 @@
namespace framework{
/*-************************************************************************************************************
We must save information about our listener and URL for listening.
We implement this as a hashtable for strings.
*//*-*************************************************************************************************************/
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
OUStringHash > IMPL_ListenerHashContainer;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
IMPL_ListenerHashContainer;
/*-************************************************************************************************************
@short helper for desktop only(!) to create new tasks on demand for dispatches

8
framework/inc/stdtypes.h
View File

@@ -152,13 +152,7 @@ typedef BaseHash< OUString > OUStringHashMap;
*/
typedef BaseHash< sal_Int32 > NameToHandleHash;
/**
Sometimes we need this template to implement listener container ...
and we need it at different positions ...
So it's better to declare it one times only!
*/
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
OUStringHash > ListenerHash;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString> ListenerHash;
} // namespace framework

2
include/cppuhelper/interfacecontainer.h
View File

@@ -296,7 +296,7 @@ inline void OInterfaceContainerHelper::notifyEach( void ( SAL_CALL ListenerT::*N
@see OInterfaceIteratorHelper
@see OInterfaceContainerHelper
*/
template< class key , class hashImpl , class equalImpl = std::equal_to<key> >
template< class key, class hashImpl = void, class equalImpl = std::equal_to<key> >
class OMultiTypeInterfaceContainerHelperVar
{
public:

9
include/sfx2/unoctitm.hxx
View File

@@ -70,13 +70,8 @@ public:
void ReleaseBindings();
};
struct SfxStatusDispatcher_Impl_hashType
{
size_t operator()(const OUString& s) const
{ return s.hashCode(); }
};
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, SfxStatusDispatcher_Impl_hashType > SfxStatusDispatcher_Impl_ListenerContainer ;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
SfxStatusDispatcher_Impl_ListenerContainer;
class SfxStatusDispatcher : public ::cppu::WeakImplHelper1< css::frame::XNotifyingDispatch >
{

20
linguistic/source/lngopt.hxx
View File

@@ -66,24 +66,8 @@ public:
GetActiveConvDics() const { return pData->aActiveConvDics; }
};
// uses templates from <cppuhelper/interfacecontainer.h>
// helper function call class
struct PropHashType_Impl
{
size_t operator()(const sal_Int32 &s) const { return s; }
};
typedef cppu::OMultiTypeInterfaceContainerHelperVar
<
sal_Int32,
PropHashType_Impl
> OPropertyListenerContainerHelper;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<sal_Int32>
OPropertyListenerContainerHelper;
class LinguProps :
public cppu::WeakImplHelper5

8
svx/source/unodraw/shapepropertynotifier.cxx
View File

@@ -63,12 +63,8 @@ namespace svx
typedef ::boost::unordered_map< ShapeProperty, PPropertyValueProvider, ShapePropertyHash > PropertyProviders;
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < OUString
, OUStringHash
> PropertyChangeListenerContainer;
//= IPropertyValueProvider
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer;
IPropertyValueProvider::~IPropertyValueProvider()
{

16
sw/source/core/uibase/inc/unomailmerge.hxx
View File

@@ -56,20 +56,8 @@ namespace com { namespace sun { namespace star {
}}}
// uses templates from <cppuhelper/interfacecontainer.h>
// and <unotools/configitem.hxx>
// helper function call class
struct PropHashType_Impl
{
size_t operator()(const sal_Int32 &s) const { return s; }
};
typedef cppu::OMultiTypeInterfaceContainerHelperVar
<
sal_Int32,
PropHashType_Impl
> OPropertyListenerContainerHelper;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<sal_Int32>
OPropertyListenerContainerHelper;
class SwNewDBMgr;
class MailMergeExecuteFinalizer;

11
ucb/source/cacher/contentresultsetwrapper.hxx
View File

@@ -48,15 +48,8 @@ class ContentResultSetWrapper
, public com::sun::star::sdbc::XRow
{
protected:
//class PropertyChangeListenerContainer_Impl.
typedef cppu::OMultiTypeInterfaceContainerHelperVar
< OUString, OUStringHash >
PropertyChangeListenerContainer_Impl;
// class ReacquireableGuard
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer_Impl;
class ReacquireableGuard
{

18
ucb/source/core/ucbstore.cxx
View File

@@ -1119,23 +1119,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
return Reference< XInterface >();
}
// PropertyListeners_Impl.
typedef OMultiTypeInterfaceContainerHelperVar
<
OUString,
OUStringHash
> PropertyListeners_Impl;
// PersistentPropertySet_Impl.
typedef OMultiTypeInterfaceContainerHelperVar<OUString> PropertyListeners_Impl;
struct PersistentPropertySet_Impl
{

36
ucb/source/sorter/sortresult.cxx
View File

@@ -111,40 +111,8 @@ public:
throw( RuntimeException, std::exception ) SAL_OVERRIDE;
};
// PropertyChangeListenerContainer_Impl.
struct equalStr_Impl
{
bool operator()( const OUString& s1, const OUString& s2 ) const
{
return !!( s1 == s2 );
}
};
struct hashStr_Impl
{
size_t operator()( const OUString& rName ) const
{
return rName.hashCode();
}
};
typedef OMultiTypeInterfaceContainerHelperVar
<
OUString,
hashStr_Impl,
equalStr_Impl
> PropertyChangeListenerContainer_Impl;
// class PropertyChangeListeners_Impl
typedef OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer_Impl;
class PropertyChangeListeners_Impl : public PropertyChangeListenerContainer_Impl
{

7
ucb/source/ucp/file/bc.cxx
View File

@@ -54,11 +54,8 @@ using namespace com::sun::star::ucb;
#define THROW_WHERE ""
#endif
// PropertyListeners
typedef cppu::OMultiTypeInterfaceContainerHelperVar< OUString,OUStringHash >
PropertyListeners_impl;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyListeners_impl;
class fileaccess::PropertyListeners
: public PropertyListeners_impl

7
ucbhelper/source/provider/contenthelper.cxx
View File

@@ -83,11 +83,8 @@ typedef boost::unordered_map
>
PropertiesEventListenerMap;
typedef cppu::OMultiTypeInterfaceContainerHelperVar
<
OUString,
OUStringHash
> PropertyChangeListeners;
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListeners;
struct ContentImplHelper_Impl
{

19
ucbhelper/source/provider/resultset.cxx
View File

@@ -122,23 +122,8 @@ public:
throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
// PropertyChangeListenerContainer.
typedef cppu::OMultiTypeInterfaceContainerHelperVar
<
OUString,
OUStringHash
> PropertyChangeListenerContainer;
// class PropertyChangeListeners.
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer;
class PropertyChangeListeners : public PropertyChangeListenerContainer
{