summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/customize/cfg.cxx30
-rw-r--r--cui/source/inc/cfg.hxx5
-rw-r--r--desktop/source/app/app.cxx88
-rw-r--r--framework/inc/services.h1
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx4
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx2
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx50
-rw-r--r--offapi/UnoApi_offapi.mk2
-rw-r--r--offapi/com/sun/star/ui/WindowStateConfiguration.idl29
-rw-r--r--sfx2/source/dialog/dockwin.cxx6
-rw-r--r--vbahelper/source/vbahelper/vbacommandbarhelper.cxx5
11 files changed, 102 insertions, 120 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a6bc4d8ca01a..1c234cbc56a8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -78,6 +78,7 @@
#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
#include <com/sun/star/ui/ImageType.hpp>
+#include <com/sun/star/ui/WindowStateConfiguration.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
@@ -881,8 +882,7 @@ SaveInData::SaveInData(
bDocConfig( isDocConfig ),
bReadOnly( sal_False ),
m_xCfgMgr( xCfgMgr ),
- m_xParentCfgMgr( xParentCfgMgr ),
- m_xComponentContext( comphelper::getProcessComponentContext() )
+ m_xParentCfgMgr( xParentCfgMgr )
{
m_aSeparatorSeq.realloc( 1 );
m_aSeparatorSeq[0].Name = OUString( ITEM_DESCRIPTOR_TYPE );
@@ -896,12 +896,10 @@ SaveInData::SaveInData(
bReadOnly = xDocPersistence->isReadOnly();
}
- m_xServiceManager = uno::Reference< lang::XMultiServiceFactory >(
- ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
+ uno::Reference<uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
uno::Reference< container::XNameAccess > xNameAccess(
- css::frame::UICommandDescription::create(
- comphelper::getComponentContext(m_xServiceManager)) );
+ css::frame::UICommandDescription::create(xContext) );
xNameAccess->getByName( aModuleId ) >>= m_xCommandToLabelMap;
@@ -1265,6 +1263,8 @@ void MenuSaveInData::Apply(
SvxEntries::const_iterator iter = GetEntries()->begin();
SvxEntries::const_iterator end = GetEntries()->end();
+ uno::Reference<uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
+
for ( ; iter != end; ++iter )
{
SvxConfigEntry* pEntryData = *iter;
@@ -1273,7 +1273,7 @@ void MenuSaveInData::Apply(
ConvertSvxConfigEntry( m_xCommandToLabelMap, pEntryData );
uno::Reference< container::XIndexContainer > xSubMenuBar(
- rFactory->createInstanceWithContext( m_xComponentContext ),
+ rFactory->createInstanceWithContext( xContext ),
uno::UNO_QUERY );
sal_Int32 nIndex = aPropValueSeq.getLength();
@@ -1291,6 +1291,8 @@ void MenuSaveInData::ApplyMenu(
uno::Reference< lang::XSingleComponentFactory >& rFactory,
SvxConfigEntry* pMenuData )
{
+ uno::Reference<uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
+
SvxEntries::const_iterator iter = pMenuData->GetEntries()->begin();
SvxEntries::const_iterator end = pMenuData->GetEntries()->end();
@@ -1304,7 +1306,7 @@ void MenuSaveInData::ApplyMenu(
ConvertSvxConfigEntry( m_xCommandToLabelMap, pEntry );
uno::Reference< container::XIndexContainer > xSubMenuBar(
- rFactory->createInstanceWithContext( m_xComponentContext ),
+ rFactory->createInstanceWithContext( xContext ),
uno::UNO_QUERY );
sal_Int32 nIndex = aPropValueSeq.getLength();
@@ -3706,13 +3708,9 @@ ToolbarSaveInData::ToolbarSaveInData(
{
// Initialize the m_xPersistentWindowState variable which is used
// to get the default properties of system toolbars such as name
- uno::Reference< container::XNameAccess > xPWSS(
- m_xServiceManager->createInstance(
- OUString( "com.sun.star.ui.WindowStateConfiguration" ) ),
- uno::UNO_QUERY );
+ uno::Reference< container::XNameAccess > xPWSS = css::ui::WindowStateConfiguration::create( m_xContext );
- if ( xPWSS.is() )
- xPWSS->getByName( aModuleId ) >>= m_xPersistentWindowState;
+ xPWSS->getByName( aModuleId ) >>= m_xPersistentWindowState;
}
ToolbarSaveInData::~ToolbarSaveInData()
@@ -4191,6 +4189,8 @@ void ToolbarSaveInData::ApplyToolbar(
uno::Reference< lang::XSingleComponentFactory >& rFactory,
SvxConfigEntry* pToolbarData )
{
+ uno::Reference<uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
+
SvxEntries::const_iterator iter = pToolbarData->GetEntries()->begin();
SvxEntries::const_iterator end = pToolbarData->GetEntries()->end();
@@ -4204,7 +4204,7 @@ void ToolbarSaveInData::ApplyToolbar(
ConvertToolbarEntry( m_xCommandToLabelMap, pEntry );
uno::Reference< container::XIndexContainer > xSubMenuBar(
- rFactory->createInstanceWithContext( m_xComponentContext ),
+ rFactory->createInstanceWithContext( xContext ),
uno::UNO_QUERY );
sal_Int32 nIndex = aPropValueSeq.getLength();
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index bccef1c089c1..87c758dd6b0c 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -132,14 +132,11 @@ public:
GetParentImageManager() { return m_xParentImgMgr; };
::com::sun::star::uno::Reference
- < com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+ < com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference
< com::sun::star::container::XNameAccess > m_xCommandToLabelMap;
- com::sun::star::uno::Reference
- < com::sun::star::uno::XComponentContext > m_xComponentContext;
-
com::sun::star::uno::Sequence
< com::sun::star::beans::PropertyValue > m_aSeparatorSeq;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index abea8e1e556f..c78c76b2214d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -63,6 +63,7 @@
#include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/frame/UICommandDescription.hpp>
#include <com/sun/star/ui/XUIElementFactoryRegistration.hpp>
+#include <com/sun/star/ui/WindowStateConfiguration.hpp>
#include <com/sun/star/frame/XUIControllerRegistration.hpp>
#include <toolkit/unohlp.hxx>
@@ -127,6 +128,7 @@ using namespace ::com::sun::star::document;
using namespace ::com::sun::star::view;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::system;
+using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::container;
@@ -1977,8 +1979,6 @@ void Desktop::EnableOleAutomation()
void Desktop::PreloadModuleData( const CommandLineArgs& rArgs )
{
- Reference< XMultiServiceFactory > rFactory = ::comphelper::getProcessServiceFactory();
-
Sequence < com::sun::star::beans::PropertyValue > args(1);
args[0].Name = ::rtl::OUString("Hidden");
args[0].Value <<= sal_True;
@@ -2092,51 +2092,47 @@ void Desktop::PreloadConfigurationData()
}
// preload window state configuration
- xNameAccess = Reference< XNameAccess >( rFactory->createInstance(
- rtl::OUString( "com.sun.star.ui.WindowStateConfiguration" )), UNO_QUERY );
- if ( xNameAccess.is() )
+ xNameAccess = WindowStateConfiguration::create( xContext );
+ Reference< XNameAccess > xWindowAccess;
+ try
+ {
+ a = xNameAccess->getByName( aWriterDoc );
+ a >>= xWindowAccess;
+ if ( xWindowAccess.is() )
+ xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" ));
+ }
+ catch ( const ::com::sun::star::uno::Exception& )
+ {
+ }
+ try
+ {
+ a = xNameAccess->getByName( aCalcDoc );
+ a >>= xWindowAccess;
+ if ( xWindowAccess.is() )
+ xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" ));
+ }
+ catch ( const ::com::sun::star::uno::Exception& )
+ {
+ }
+ try
+ {
+ a = xNameAccess->getByName( aDrawDoc );
+ a >>= xWindowAccess;
+ if ( xWindowAccess.is() )
+ xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" ));
+ }
+ catch ( const ::com::sun::star::uno::Exception& )
+ {
+ }
+ try
+ {
+ a = xNameAccess->getByName( aImpressDoc );
+ a >>= xWindowAccess;
+ if ( xWindowAccess.is() )
+ xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" ));
+ }
+ catch ( const ::com::sun::star::uno::Exception& )
{
- Reference< XNameAccess > xWindowAccess;
- try
- {
- a = xNameAccess->getByName( aWriterDoc );
- a >>= xWindowAccess;
- if ( xWindowAccess.is() )
- xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" ));
- }
- catch ( const ::com::sun::star::uno::Exception& )
- {
- }
- try
- {
- a = xNameAccess->getByName( aCalcDoc );
- a >>= xWindowAccess;
- if ( xWindowAccess.is() )
- xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" ));
- }
- catch ( const ::com::sun::star::uno::Exception& )
- {
- }
- try
- {
- a = xNameAccess->getByName( aDrawDoc );
- a >>= xWindowAccess;
- if ( xWindowAccess.is() )
- xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" ));
- }
- catch ( const ::com::sun::star::uno::Exception& )
- {
- }
- try
- {
- a = xNameAccess->getByName( aImpressDoc );
- a >>= xWindowAccess;
- if ( xWindowAccess.is() )
- xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" ));
- }
- catch ( const ::com::sun::star::uno::Exception& )
- {
- }
}
// preload user interface element factories
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 7ad58c5bfac9..fcae2a074a7b 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -61,7 +61,6 @@ namespace framework{
#define SERVICENAME_UICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.ui.UIConfigurationManager" )
#define SERVICENAME_MODULEUICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.ui.ModuleUIConfigurationManager" )
#define SERVICENAME_MENUBARFACTORY DECLARE_ASCII("com.sun.star.ui.UIElementFactory" )
-#define SERVICENAME_WINDOWSTATECONFIGURATION DECLARE_ASCII("com.sun.star.ui.WindowStateConfiguration" )
#define SERVICENAME_STARTMODULE DECLARE_ASCII("com.sun.star.frame.StartModule" )
#define SERVICENAME_FRAMECONTROLLER DECLARE_ASCII("com.sun.star.frame.Controller" )
#define SERVICENAME_MODULEACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.ModuleAcceleratorConfiguration")
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 1c20dd3faebe..18f1f81ec386 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -50,6 +50,7 @@
#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/WindowStateConfiguration.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/frame/LayoutManagerEvents.hpp>
@@ -132,8 +133,7 @@ LayoutManager::LayoutManager( const Reference< XMultiServiceFactory >& xServiceM
, m_xModuleManager( ModuleManager::create( comphelper::getComponentContext(xServiceManager) ))
, m_xUIElementFactoryManager( Reference< ui::XUIElementFactory >(
xServiceManager->createInstance( SERVICENAME_UIELEMENTFACTORYMANAGER ), UNO_QUERY ))
- , m_xPersistentWindowStateSupplier( Reference< XNameAccess >(
- xServiceManager->createInstance( SERVICENAME_WINDOWSTATECONFIGURATION ), UNO_QUERY ))
+ , m_xPersistentWindowStateSupplier( ui::WindowStateConfiguration::create( comphelper::getComponentContext(xServiceManager) ) )
, m_pGlobalSettings( 0 )
, m_aStatusBarAlias( "private:resource/statusbar/statusbar" )
, m_aProgressBarAlias( "private:resource/progressbar/progressbar" )
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index a6989d2d29f1..8ed6853c4110 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1345,7 +1345,7 @@ DEFINE_XTYPEPROVIDER_4 ( WindowStateConfiguration
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( WindowStateConfiguration ,
::cppu::OWeakObject ,
- SERVICENAME_WINDOWSTATECONFIGURATION ,
+ DECLARE_ASCII("com.sun.star.ui.WindowStateConfiguration"),
IMPLEMENTATIONNAME_WINDOWSTATECONFIGURATION
)
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 34520aa830ec..75b8351ff620 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -41,6 +41,7 @@
#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/WindowStateConfiguration.hpp>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
@@ -824,38 +825,33 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume
if ( m_bInitialized )
{
Reference< XModuleManager2 > xModuleManager = ModuleManager::create( comphelper::getComponentContext(m_xServiceManager) );
- Reference< XNameAccess > xPersistentWindowStateSupplier( m_xServiceManager->createInstance(
- SERVICENAME_WINDOWSTATECONFIGURATION ),
- UNO_QUERY );
+ Reference< XNameAccess > xPersistentWindowStateSupplier = ::com::sun::star::ui::WindowStateConfiguration::create( comphelper::getComponentContext(m_xServiceManager) );
// Retrieve persistent window state reference for our module
- if ( xPersistentWindowStateSupplier.is() && xModuleManager.is() )
+ rtl::OUString aModuleIdentifier;
+ try
{
- rtl::OUString aModuleIdentifier;
- try
- {
- aModuleIdentifier = xModuleManager->identify( m_xFrame );
- xPersistentWindowStateSupplier->getByName( aModuleIdentifier ) >>= m_xPersistentWindowState;
-
- Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier =
- ModuleUIConfigurationManagerSupplier::create( comphelper::getComponentContext(m_xServiceManager) );
- m_xModuleCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
-
- Reference< XController > xController = m_xFrame->getController();
- Reference< XModel > xModel;
- if ( xController.is() )
- xModel = xController->getModel();
- if ( xModel.is() )
- {
- Reference< XUIConfigurationManagerSupplier > xUIConfigurationManagerSupplier( xModel, UNO_QUERY );
- if ( xUIConfigurationManagerSupplier.is() )
- m_xDocCfgMgr = xUIConfigurationManagerSupplier->getUIConfigurationManager();
- }
- m_aModuleIdentifier = aModuleIdentifier;
- }
- catch ( const Exception& )
+ aModuleIdentifier = xModuleManager->identify( m_xFrame );
+ xPersistentWindowStateSupplier->getByName( aModuleIdentifier ) >>= m_xPersistentWindowState;
+
+ Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier =
+ ModuleUIConfigurationManagerSupplier::create( comphelper::getComponentContext(m_xServiceManager) );
+ m_xModuleCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
+
+ Reference< XController > xController = m_xFrame->getController();
+ Reference< XModel > xModel;
+ if ( xController.is() )
+ xModel = xController->getModel();
+ if ( xModel.is() )
{
+ Reference< XUIConfigurationManagerSupplier > xUIConfigurationManagerSupplier( xModel, UNO_QUERY );
+ if ( xUIConfigurationManagerSupplier.is() )
+ m_xDocCfgMgr = xUIConfigurationManagerSupplier->getUIConfigurationManager();
}
+ m_aModuleIdentifier = aModuleIdentifier;
+ }
+ catch ( const Exception& )
+ {
}
}
}
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 5bf747e28558..9c1aa3f6e66b 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -305,6 +305,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
GlobalAcceleratorConfiguration \
ModuleUIConfigurationManagerSupplier \
WindowContentFactory \
+ WindowStateConfiguration \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\
FolderPicker \
@@ -1448,7 +1449,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\
UIElementFactory \
UIElementFactoryManager \
UIElementSettings \
- WindowStateConfiguration \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\
FilePicker \
diff --git a/offapi/com/sun/star/ui/WindowStateConfiguration.idl b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
index 6a13e9dcc3d1..afd43f7cce75 100644
--- a/offapi/com/sun/star/ui/WindowStateConfiguration.idl
+++ b/offapi/com/sun/star/ui/WindowStateConfiguration.idl
@@ -36,26 +36,23 @@ module com { module sun { module star { module ui {
part of OpenOffice.org modules, like Writer or Calc.
</p>
- @since OOo 2.0
-*/
+ Provides access to window based information about user interface elements
+ of all installed application modules.
-service WindowStateConfiguration
-{
- /** provides access to window based information about user interface elements
- of all installed application modules.
+ <p>
+ To access the window based information of a module, a unique module specifier
+ must be provided to <member scope="com::sun::star::container">XNameAccess::getByName()</member> function.
+ The module specifier can be retrieved from the <type scope="com::sun::star::frame">ModuleManager</type>
+ service. The interface provides references to a <type scope="com::sun:star::ui">ModuleWindowStateConfiguration</type>.
+ </p>
- <p>
- To access the window based information of a module, a unique module specifier
- must be provided to <member scope="com::sun::star::container">XNameAccess::getByName()</member> function.
- The module specifier can be retrieved from the <type scope="com::sun::star::frame">ModuleManager</type>
- service. The interface provides references to a <type scope="com::sun:star::ui">ModuleWindowStateConfiguration</type>.
- </p>
+ @see com::sun::star::frame::ModuleManager
+
+ @since OOo 2.0
+*/
- @see com::sun::star::frame::ModuleManager
- */
+service WindowStateConfiguration : com::sun::star::container::XNameAccess;
- interface com::sun::star::container::XNameAccess;
-};
}; }; }; };
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index d95318b00704..8932896412a1 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -45,6 +45,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/ui/WindowStateConfiguration.hpp>
#define MAX_TOGGLEAREA_WIDTH 20
#define MAX_TOGGLEAREA_HEIGHT 20
@@ -184,10 +185,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd ,
uno::Reference< container::XNameAccess > xWindowStateConfiguration( m_xWindowStateConfiguration );
if ( !xWindowStateConfiguration.is() )
{
- xWindowStateConfiguration = uno::Reference< container::XNameAccess >(
- xServiceManager->createInstance(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.WindowStateConfiguration" ))),
- uno::UNO_QUERY );
+ xWindowStateConfiguration = ui::WindowStateConfiguration::create( comphelper::getComponentContext(xServiceManager) );
m_xWindowStateConfiguration = xWindowStateConfiguration;
}
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index 9595def041dd..5bfd4d213ab7 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
+#include <com/sun/star/ui/WindowStateConfiguration.hpp>
#include <comphelper/processfactory.hxx>
#include <vbahelper/vbahelper.hxx>
#include <rtl/ustrbuf.hxx>
@@ -109,14 +110,12 @@ void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException)
throw uno::RuntimeException( "Not implemented" , uno::Reference< uno::XInterface >() );
}
- uno::Reference< lang::XMultiServiceFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-
css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUICfgMgrSupp(
css::ui::ModuleUIConfigurationManagerSupplier::create(mxContext) );
m_xAppCfgMgr.set( xUICfgMgrSupp->getUIConfigurationManager( maModuleId ), uno::UNO_QUERY_THROW );
- css::uno::Reference< css::container::XNameAccess > xNameAccess( xServiceManager->createInstance( "com.sun.star.ui.WindowStateConfiguration" ), uno::UNO_QUERY_THROW );
+ css::uno::Reference< css::container::XNameAccess > xNameAccess = css::ui::WindowStateConfiguration::create( mxContext );
m_xWindowState.set( xNameAccess->getByName( maModuleId ), uno::UNO_QUERY_THROW );
}
generated by cgit (git 2.34.1) at 2024-06-29 09:51:19 +0000