diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 13:15:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 13:16:38 +0200 |
| commit | 03a9f139bd9ea1a4f9096fc982e6b326def58532 (patch) | |
| tree | bfb7a08bb4831a1a46b48c3bb49afa77ca436349 /comphelper/source/container | |
| parent | n#778828 testcase (diff) | |
| download | core-03a9f139bd9ea1a4f9096fc982e6b326def58532.tar.gz core-03a9f139bd9ea1a4f9096fc982e6b326def58532.zip | |
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up.
Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'comphelper/source/container')
| -rw-r--r-- | comphelper/source/container/enumerablemap.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 45f1c5cb4eae..058310e4cd09 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -22,7 +22,6 @@ #include "comphelper/anytostring.hxx" #include "comphelper/anycompare.hxx" #include "comphelper/componentbase.hxx" -#include "comphelper/componentcontext.hxx" #include "comphelper/extract.hxx" #include <com/sun/star/container/XEnumerableMap.hpp> @@ -191,7 +190,7 @@ namespace comphelper ,public ComponentBase { protected: - EnumerableMap( const ComponentContext& _rContext ); + EnumerableMap(); virtual ~EnumerableMap(); // XInitialization @@ -238,7 +237,6 @@ namespace comphelper private: ::osl::Mutex m_aMutex; - ComponentContext m_aContext; MapData m_aData; ::std::vector< ::com::sun::star::uno::WeakReference< XInterface > > @@ -347,10 +345,9 @@ namespace comphelper //= EnumerableMap //==================================================================== //-------------------------------------------------------------------- - EnumerableMap::EnumerableMap( const ComponentContext& _rContext ) + EnumerableMap::EnumerableMap() :Map_IFace( m_aMutex ) ,ComponentBase( Map_IFace::rBHelper ) - ,m_aContext( _rContext ) { } @@ -729,9 +726,9 @@ namespace comphelper } //-------------------------------------------------------------------- - Reference< XInterface > SAL_CALL EnumerableMap::Create( const Reference< XComponentContext >& _context ) + Reference< XInterface > SAL_CALL EnumerableMap::Create( SAL_UNUSED_PARAMETER const Reference< XComponentContext >& ) { - return *new EnumerableMap( ComponentContext( _context ) ); + return *new EnumerableMap; } //==================================================================== |