diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-13 08:20:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-05-13 09:38:03 +0200 |
| commit | 49e422e58e3193f1614298eb61c756abb299330f (patch) | |
| tree | b228a5d379cbf6c5c9a3422d484d96c010d3447f /cui/source/customize/selector.cxx | |
| parent | 088e86b865062dd4cc5ba0c85c6068dea62238db (diff) | |
fdo#46808, Convert ui::UICategoryDescripion to new style
Change-Id: I4fbba222b8429b5935c8e15c74d1670edd4fb303
Diffstat (limited to 'cui/source/customize/selector.cxx')
| -rw-r--r-- | cui/source/customize/selector.cxx | 54 |
1 files changed, 23 insertions, 31 deletions
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 9a8e5d026847..89d0a7627efe 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -37,22 +37,24 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> -#include <com/sun/star/script/provider/XScriptProvider.hpp> -#include <com/sun/star/script/browse/XBrowseNode.hpp> -#include <com/sun/star/script/browse/BrowseNodeTypes.hpp> -#include <com/sun/star/script/browse/XBrowseNodeFactory.hpp> -#include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp> -#include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> +#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/frame/DispatchInformation.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/frame/UICommandDescription.hpp> +#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> +#include <com/sun/star/script/provider/XScriptProvider.hpp> +#include <com/sun/star/script/browse/XBrowseNode.hpp> +#include <com/sun/star/script/browse/BrowseNodeTypes.hpp> +#include <com/sun/star/script/browse/XBrowseNodeFactory.hpp> +#include <com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp> +#include <com/sun/star/ui/UICategoryDescription.hpp> + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -396,9 +398,6 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame // are we showing builtin commands? if ( m_bShowSlots && m_xFrame.is() ) { - Reference< lang::XMultiComponentFactory > xMCF = - xContext->getServiceManager(); - Reference< frame::XDispatchInformationProvider > xDIP( m_xFrame, UNO_QUERY ); @@ -414,34 +413,27 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame frame::UICommandDescription::create(xContext) ); xNameAccess->getByName( aModuleId ) >>= m_xModuleCommands; - Reference< container::XNameAccess > xAllCategories( - xMCF->createInstanceWithContext( - OUString( - "com.sun.star.ui.UICategoryDescription" ), - xContext ), - UNO_QUERY ); + Reference< container::XNameAccess > xAllCategories = + ui::UICategoryDescription::create( xContext ); Reference< container::XNameAccess > xModuleCategories; - if ( xAllCategories.is() ) + if ( !aModuleId.isEmpty() ) { - if ( !aModuleId.isEmpty() ) + try { - try - { - xModuleCategories = Reference< container::XNameAccess >( - xAllCategories->getByName( aModuleId ), UNO_QUERY ); - } - catch ( container::NoSuchElementException& ) - { - } + xModuleCategories = Reference< container::XNameAccess >( + xAllCategories->getByName( aModuleId ), UNO_QUERY ); } - - if ( !xModuleCategories.is() ) + catch ( container::NoSuchElementException& ) { - xModuleCategories = xAllCategories; } } + if ( !xModuleCategories.is() ) + { + xModuleCategories = xAllCategories; + } + if ( xModuleCategories.is() ) { Sequence< sal_Int16 > gids = |