summaryrefslogtreecommitdiff
path: root/cui/source/customize/selector.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-19 13:15:15 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-19 13:16:38 +0200
commit03a9f139bd9ea1a4f9096fc982e6b326def58532 (patch)
treebfb7a08bb4831a1a46b48c3bb49afa77ca436349 /cui/source/customize/selector.cxx
parente8a169c93d7e2443a2e56afe7e99cd0721a2c27b (diff)
ComponentContext::getUnoContext -> getComponentContext simplification
...and some further clean-up. Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
Diffstat (limited to 'cui/source/customize/selector.cxx')
-rw-r--r--cui/source/customize/selector.cxx76
1 files changed, 31 insertions, 45 deletions
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 280393a6486f..c0023032d8ea 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -44,7 +44,6 @@
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/componentcontext.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
@@ -352,8 +351,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
SvLBoxEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry );
- ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
- Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode );
+ Image aImage = GetImage( theChild, comphelper::getProcessComponentContext(), bIsRootNode );
SetExpandedEntryBmp( pNewEntry, aImage );
SetCollapsedEntryBmp( pNewEntry, aImage );
@@ -400,16 +398,11 @@ void SvxConfigGroupListBox_Impl::Init()
SetUpdateMode(sal_False);
ClearAll();
- Reference< XComponentContext > xContext;
- Reference < beans::XPropertySet > xProps(
- ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-
- xContext.set( xProps->getPropertyValue(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
- UNO_QUERY );
+ Reference< XComponentContext > xContext(
+ comphelper::getProcessComponentContext() );
// are we showing builtin commands?
- if ( m_bShowSlots && xContext.is() && m_xFrame.is() )
+ if ( m_bShowSlots && m_xFrame.is() )
{
Reference< lang::XMultiComponentFactory > xMCF =
xContext->getServiceManager();
@@ -502,45 +495,38 @@ void SvxConfigGroupListBox_Impl::Init()
}
}
- if ( xContext.is() )
- {
- // Add Scripting Framework entries
- Reference< browse::XBrowseNode > rootNode;
- Reference< XComponentContext> xCtx;
+ // Add Scripting Framework entries
+ Reference< browse::XBrowseNode > rootNode;
- try
- {
- Reference < beans::XPropertySet > _xProps(
- ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
- xCtx.set( _xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
- Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW );
- rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
+ try
+ {
+ Reference< browse::XBrowseNodeFactory > xFac( xContext->getValueByName(
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW );
+ rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
- if ( rootNode.is() )
+ if ( rootNode.is() )
+ {
+ if ( m_bShowSlots )
{
- if ( m_bShowSlots )
- {
- SvxGroupInfo_Impl *pInfo =
- new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, rootNode );
+ SvxGroupInfo_Impl *pInfo =
+ new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, rootNode );
- String aTitle =
- String( CUI_RES( STR_SELECTOR_MACROS ) );
+ String aTitle =
+ String( CUI_RES( STR_SELECTOR_MACROS ) );
- SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
- pNewEntry->SetUserData( pInfo );
- pNewEntry->EnableChildrenOnDemand( sal_True );
- aArr.push_back( pInfo );
- }
- else
- {
- fillScriptList( rootNode, NULL, false );
- }
+ SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
+ pNewEntry->SetUserData( pInfo );
+ pNewEntry->EnableChildrenOnDemand( sal_True );
+ aArr.push_back( pInfo );
+ }
+ else
+ {
+ fillScriptList( rootNode, NULL, false );
}
}
MakeVisible( GetEntry( 0,0 ) );