summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-02-05 10:26:03 +0100
committerMichael Stahl <mstahl@redhat.com>2015-02-05 15:29:53 +0100
commit893362bc396408faff0db19bca9a8de554bf5c68 (patch)
treefa6afdea43c73fbacf83e80b960f80f35221f6d7 /comphelper
parentb8cf9b3359195f4f9f7e92f5db224a91cf994306 (diff)
comphelper: do not use "r" prefix for uno::Reference
Change-Id: I5e92ca9dbb0c9f33c9511cc4b12db1433e40fa68
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/compare/AnyCompareFactory.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index 3de918e6655c..5e9ba82cd058 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -41,13 +41,13 @@ using namespace com::sun::star::i18n;
class AnyCompare : public ::cppu::WeakImplHelper1< XAnyCompare >
{
- Reference< XCollator > m_rCollator;
+ Reference< XCollator > m_xCollator;
public:
AnyCompare( Reference< XComponentContext > xContext, const Locale& rLocale )
{
- m_rCollator = Collator::create( xContext );
- m_rCollator->loadDefaultCollator( rLocale,
+ m_xCollator = Collator::create( xContext );
+ m_xCollator->loadDefaultCollator( rLocale,
0 ); //???
}
@@ -56,12 +56,12 @@ public:
class AnyCompareFactory : public cppu::WeakImplHelper3< XAnyCompareFactory, XInitialization, XServiceInfo >
{
- Reference< XAnyCompare > m_rAnyCompare;
- Reference< XComponentContext > m_rContext;
+ Reference< XAnyCompare > m_xAnyCompare;
+ Reference< XComponentContext > m_xContext;
Locale m_Locale;
public:
- AnyCompareFactory( Reference< XComponentContext > xContext ) : m_rContext( xContext )
+ AnyCompareFactory( Reference< XComponentContext > xContext ) : m_xContext( xContext )
{}
// XAnyCompareFactory
@@ -92,7 +92,7 @@ sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw
any1 >>= aStr1;
any2 >>= aStr2;
- aResult = ( sal_Int16 )m_rCollator->compareString( aStr1, aStr2 );
+ aResult = static_cast<sal_Int16>(m_xCollator->compareString(aStr1, aStr2));
return aResult;
}
@@ -103,7 +103,7 @@ Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( con
// so no check for the property name is done
if( aPropertyName == "Title" )
- return m_rAnyCompare;
+ return m_xAnyCompare;
return Reference< XAnyCompare >();
}
@@ -114,7 +114,7 @@ void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments )
{
if( aArguments[0] >>= m_Locale )
{
- m_rAnyCompare = new AnyCompare( m_rContext, m_Locale );
+ m_xAnyCompare = new AnyCompare( m_xContext, m_Locale );
return;
}
}