unused variables and simplify

Change-Id: Ib2412d5bd3e3db42b972783bb8d17bc6559c9c21

6 files changed, 5 insertions, 18 deletions

diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index c2f1dd29845e..43a2a850f02f 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
@@ -34,8 +34,6 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
                 const uno::Reference< uno::XComponentContext > & rxContext )
     throw( DAVException )
 {
-    m_xMSF = rxContext;
-
     osl::MutexGuard aGuard( m_aMutex );
 
     if ( !m_xProxyDecider.get() )
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
index 6617e8cee19e..9f9f5c50f132 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
@@ -56,7 +56,6 @@ public:
                                 rxContext )
             throw( DAVException );
 
-    ::uno::Reference< ::uno::XComponentContext > getServiceFactory() {  return m_xMSF; }
 private:
     typedef std::map< OUString, DAVSession * > Map;
 
@@ -64,8 +63,6 @@ private:
     osl::Mutex m_aMutex;
     std::auto_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider;
 
-    ::uno::Reference< ::uno::XComponentContext > m_xMSF;
-
     void releaseElement( DAVSession * pElement ) SAL_THROW(());
 
     friend class DAVSession;
diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx
index a9696b331aec..183d39303152 100644
--- a/ucb/source/ucp/webdav/SerfLockStore.cxx
+++ b/ucb/source/ucp/webdav/SerfLockStore.cxx
@@ -91,8 +91,7 @@ SerfLockStore::~SerfLockStore()
     const LockInfoMap::const_iterator end( m_aLockInfoMap.end() );
     while ( it != end )
     {
-        const OUString& rLock = (*it).first;
-        (*it).second.m_xSession->UNLOCK( rLock );
+        (*it).second.m_xSession->UNLOCK( (*it).first );
         ++it;
     }
 }
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 65fd5dcea22f..017b978df192 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -36,6 +36,7 @@
 #include "SerfInputStream.hxx"
 #include "UCBDeadPropertyValue.hxx"
 
+#include <com/sun/star/xml/crypto/SEInitializer.hpp>
 #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
 #include <com/sun/star/security/CertificateValidity.hpp>
@@ -354,7 +355,6 @@ apr_status_t SerfSession::verifySerfCertificateChain (
 
     // Create some crypto objects to decode and handle the base64
     // encoded certificate chain.
-    uno::Reference< xml::crypto::XSEInitializer > xSEInitializer;
     uno::Reference< security::XCertificateContainer > xCertificateContainer;
     uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext;
     uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv;
@@ -365,10 +365,8 @@ apr_status_t SerfSession::verifySerfCertificateChain (
         // Create a certificate container.
         xCertificateContainer = security::CertificateContainer::create( xContext );
 
-        xSEInitializer = uno::Reference< xml::crypto::XSEInitializer >(
-            xContext->getServiceManager()->createInstanceWithContext(
-                OUString( "com.sun.star.xml.crypto.SEInitializer" ), xContext ),
-            uno::UNO_QUERY_THROW);
+        css::uno::Reference< css::xml::crypto::XSEInitializer > xSEInitializer =
+            css::xml::crypto::SEInitializer::create( xContext );
 
         xSecurityContext = xSEInitializer->createSecurityContext( OUString() );
         if (xSecurityContext.is())
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 16684d8d8bfa..0cf92da2010e 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -39,7 +39,6 @@ using namespace http_dav_ucp;
 ContentProvider::ContentProvider(
                 const uno::Reference< uno::XComponentContext >& rContext )
 : ::ucbhelper::ContentProviderImplHelper( rContext ),
-  m_xDAVSessionFactory( new DAVSessionFactory() ),
   m_pProps( 0 )
 {
 }
@@ -196,7 +195,7 @@ ContentProvider::queryContent(
     try
     {
         xContent = new ::http_dav_ucp::Content(
-                        m_xContext, this, xCanonicId, m_xDAVSessionFactory );
+                        m_xContext, this, xCanonicId, new DAVSessionFactory() );
         registerNewContent( xContent );
     }
     catch ( ucb::ContentCreationException const & )
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index 6947650cd767..caf95600bfa5 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -68,7 +68,6 @@ namespace http_dav_ucp {
 
 class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
 {
-    rtl::Reference< DAVSessionFactory > m_xDAVSessionFactory;
     PropertyMap * m_pProps;
 
 public:
@@ -121,9 +120,6 @@ public:
     // Non-interface methods.
 
 
-    rtl::Reference< DAVSessionFactory > getDAVSessionFactory()
-    { return m_xDAVSessionFactory; }
-
     bool getProperty( const OUString & rPropName,
                       ::com::sun::star::beans::Property & rProp,
                       bool bStrict = false );