[Libreoffice] [PATCH 2/3] Delete commented out code in ure/cppuhelper
Laurent Charrière
lcharriere at gmail.com
Wed Oct 13 22:28:40 PDT 2010
Signed-off-by: Laurent Charrière <lcharriere at gmail.com>
---
cppuhelper/inc/cppuhelper/interfacecontainer.hxx | 1 -
cppuhelper/source/factory.cxx | 2 --
cppuhelper/source/interfacecontainer.cxx | 1 -
cppuhelper/source/weak.cxx | 10 ----------
4 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
index 4b34e92..a933547 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
@@ -157,7 +157,6 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::dispos
{
typedef OInterfaceContainerHelper* ppp;
ppListenerContainers = new ppp[nSize];
- //ppListenerContainers = new (ListenerContainer*)[nSize];
typename InterfaceMap::iterator iter = m_pMap->begin();
typename InterfaceMap::iterator end = m_pMap->end();
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 6d1942e..d46e305 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -1084,8 +1084,6 @@ Reference<XSingleServiceFactory > SAL_CALL createOneInstanceFactory(
{
return new OFactoryComponentHelper(
rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_True );
-// return new OFactoryUnloadableComponentHelper(
-// rServiceManager, rImplementationName, pCreateFunction, 0, &rServiceNames, pModCount, sal_True );
}
// global function
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index afd3d09..ca6a1e2 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -686,7 +686,6 @@ void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
{
typedef OInterfaceContainerHelper* ppp;
ppListenerContainers = new ppp[nSize];
- //ppListenerContainers = new (ListenerContainer*)[nSize];
t_long2ptr::iterator iter = pMap->begin();
t_long2ptr::iterator end = pMap->end();
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 1c24f48..750981b 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -289,16 +289,6 @@ Any OWeakAggObject::queryInterface( const Type & rType ) throw(::com::sun::star:
{
Reference< XInterface > x( xDelegator ); // harden ref
return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType ));
-
-// // set rOut to zero, if failed
-// if( !xDelegator.queryHardRef( aUik, rOut ) )
-// {
-// XInterfaceRef x;
-// if( !xDelegator.queryHardRef( ((XInterface*)0)->getSmartUik(), x ) )
-// // reference is not valid
-// queryAggregation( aUik, rOut );
-// }
-// return rOut.is();
}
// XAggregation
--
1.7.1
More information about the LibreOffice
mailing list