diff options
Diffstat (limited to 'framework/source/services/sessionlistener.cxx')
-rw-r--r-- | framework/source/services/sessionlistener.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 82e89010f6..c978eeed39 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ //_______________________________________________ // my own includes -#ifndef __FRAMEWORK_SERVICES_TYPEDETECTION_HXX_ #include <services/sessionlistener.hxx> -#endif #include <threadhelp/readguard.hxx> #include <threadhelp/resetableguard.hxx> #include <protocols.h> @@ -217,7 +216,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) throw (RuntimeException) { - OUString aSMgr = OUString::createFromAscii("com.sun.star.frame.SessionManagerClient"); + OUString aSMgr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient")); if (args.getLength() > 0) { NamedValue v; @@ -225,9 +224,9 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) { if (args[i] >>= v) { - if (v.Name.equalsAscii("SessionManagerName")) + if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManagerName"))) v.Value >>= aSMgr; - else if (v.Name.equalsAscii("SessionManager")) + else if (v.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SessionManager"))) v.Value >>= m_rSessionManager; else if (v.Name.equalsAscii("AllowUserInteractionOnQuit")) v.Value >>= m_bAllowUserInteractionOnQuit; @@ -247,14 +246,14 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event) throw (css::uno::RuntimeException) { - if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionRestore")) + if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore"))) { if (event.FeatureDescriptor.compareToAscii("update")==0) m_bRestored = sal_True; // a document was restored // if (event.FeatureDescriptor.compareToAscii("stop")==0) } - else if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionSave")) + else if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave"))) { if (event.FeatureDescriptor.compareToAscii("stop")==0) { @@ -274,7 +273,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW); URL aURL; - aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionRestore"); + aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")); css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW); xURLTransformer->parseStrict(aURL); Sequence< PropertyValue > args; @@ -366,3 +365,5 @@ void SessionListener::doQuit() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |