summaryrefslogtreecommitdiff
path: root/comphelper/source/property
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2009-05-06 07:07:40 +0000
committerOcke Janssen <oj@openoffice.org>2009-05-06 07:07:40 +0000
commitc654a8009d17b5388b7831ba9604db963793d3af (patch)
tree504e0d3600356d1a0fae44be45bdab3a7c4ee866 /comphelper/source/property
parent06929bc1b049150ffdc944360ba59eee8e7e07ac (diff)
revert change
Diffstat (limited to 'comphelper/source/property')
-rw-r--r--comphelper/source/property/propertybag.cxx5
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx4
2 files changed, 4 insertions, 5 deletions
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index 383e1cc2c5aa..a56793e05769 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -168,11 +168,10 @@ namespace comphelper
// will throw an UnknownPropertyException if necessary
if ( ( rProp.Attributes & PropertyAttribute::REMOVEABLE ) == 0 )
throw NotRemoveableException( ::rtl::OUString(), NULL );
- const sal_Int32 nHandle = rProp.Handle;
- revokeProperty( nHandle );
+ revokeProperty( rProp.Handle );
- m_pImpl->aDefaults.erase( nHandle );
+ m_pImpl->aDefaults.erase( rProp.Handle );
}
//--------------------------------------------------------------------
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 7f5db1d6cf7e..9d1662d1ecf2 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -76,12 +76,12 @@ namespace
// comparing two property descriptions (by name)
struct PropertyDescriptionNameMatch : public ::std::unary_function< PropertyDescription, bool >
{
- ::rtl::OUString m_rCompare;
+ const ::rtl::OUString& m_rCompare;
PropertyDescriptionNameMatch( const ::rtl::OUString& _rCompare ) : m_rCompare( _rCompare ) { }
bool operator() (const PropertyDescription& x ) const
{
- return x.aProperty.Name.equals(m_rCompare);
+ return x.aProperty.Name == m_rCompare;
}
};
}