summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx2
-rw-r--r--cppuhelper/qa/unourl/cppu_unourl.cxx1
-rw-r--r--cppuhelper/source/bootstrap.cxx2
-rw-r--r--cppuhelper/source/propshlp.cxx3
-rw-r--r--cppuhelper/source/tdmgr.cxx3
-rw-r--r--cppuhelper/test/testpropshlp.cxx2
6 files changed, 5 insertions, 8 deletions
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 8c76af380d3c..039586462ba2 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -129,7 +129,7 @@ namespace cppu_ifcontainer
for (i = 0; i < nTests; i++)
{
Reference<XEventListener> xRef = new ContainerListener(&aStats);
- int nNewLen = pContainer->addInterface(xRef);
+ pContainer->addInterface(xRef);
aListeners.push_back(xRef);
}
Sequence< Reference< XInterface > > aElements;
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index c7d2de6dbb99..be2626910534 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -126,7 +126,6 @@ namespace cppu_unourl
{ "abc,def=%22", "abc,def=%22" },
{ "abc,def=\"", "abc,def=\"" },
{ "abc,def=%ed%a0%80", "abc,def=%ed%a0%80" } };
- bool bResult = true;
for (int i = 0; i < sizeof aTests / sizeof (Test); ++i)
{
bool bValid = false;
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 98ac45b3eb03..6cbe33274fbb 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -273,7 +273,7 @@ OUString findBoostrapArgument(
}
Reference< registry::XSimpleRegistry > nestRegistries(
- const OUString baseDir,
+ const OUString &baseDir,
const Reference< lang::XSingleServiceFactory > & xSimRegFac,
const Reference< lang::XSingleServiceFactory > & xNesRegFac,
OUString csl_rdbs,
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 11aca838c288..c37bedec9902 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -909,11 +909,11 @@ void OPropertySetHelper::firePropertiesChangeEvent(
Sequence<PropertyChangeEvent> aChanges( nFireLen );
PropertyChangeEvent* pChanges = aChanges.getArray();
- sal_Int32 nFirePos = 0;
{
// must lock the mutex outside the loop. So all values are consistent.
MutexGuard aGuard( rBHelper.rMutex );
Reference < XInterface > xSource( (XPropertySet *)this, UNO_QUERY );
+ sal_Int32 nFirePos = 0;
for( i = 0; i < nLen; i++ )
{
if( pHandles[i] != -1 )
@@ -946,7 +946,6 @@ PropertyState OPropertySetHelper::getPropertyState( const OUString& PropertyName
Sequence< PropertyState > OPropertySetHelper::getPropertyStates( const Sequence< OUString >& PropertyNames )
{
ULONG nNames = PropertyNames.getLength();
- const OUString* pNames = PropertyNames.getConstArray();
Sequence< PropertyState > aStates( nNames );
return aStates;
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 570a7b4505d6..291d514fcd80 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -502,8 +502,7 @@ inline static typelib_TypeDescription * createCTD(
0, 0 );
// cleanup
- if (pRefType)
- typelib_typedescription_release( pRefType );
+ typelib_typedescription_release( pRefType );
}
return pRet;
}
diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index 94b1401e35e7..da6597d58493 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -461,7 +461,7 @@ public:
{
}
- sal_Int32 getRefCount()
+ sal_Int32 getRefCount() const
{ return m_refCount; }
// XEventListener