diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services.h | 1 | ||||
| -rw-r--r-- | framework/source/services/sessionlistener.cxx | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/framework/inc/services.h b/framework/inc/services.h index 38f8f59a4546..3a5496a565ea 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -54,7 +54,6 @@ namespace framework{ #define SERVICENAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.ui.StatusBarFactory" ) #define SERVICENAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.ui.UICategoryDescription" ) #define SERVICENAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.StatusbarControllerFactory" ) -#define SERVICENAME_SESSIONLISTENER DECLARE_ASCII("com.sun.star.frame.SessionListener" ) #define SERVICENAME_STATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.frame.StatusbarController" ) #define SERVICENAME_TABWINFACTORY DECLARE_ASCII("com.sun.star.frame.TabWindowFactory" ) #define SERVICENAME_TABWINDOW DECLARE_ASCII("com.sun.star.frame.TabWindow" ) diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 51f7a398ee86..d9881c0f0ee1 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -93,7 +93,7 @@ DEFINE_XTYPEPROVIDER_5( DEFINE_XSERVICEINFO_ONEINSTANCESERVICE( SessionListener, cppu::OWeakObject, - SERVICENAME_SESSIONLISTENER, + "com.sun.star.frame.SessionListener", IMPLEMENTATIONNAME_SESSIONLISTENER) DEFINE_INIT_SERVICE(SessionListener, @@ -195,7 +195,9 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) SAL_INFO("fwk.session", "SessionListener::initialize"); OUString aSMgr("com.sun.star.frame.SessionManagerClient"); - if (args.getLength() > 0) + if ( (args.getLength() == 1) && (args[0] >>= m_bAllowUserInteractionOnQuit) ) + ;// do nothing + else if (args.getLength() > 0) { NamedValue v; for (int i = 0; i < args.getLength(); i++) |