User: vg      
Date: 05/02/21 04:32:11

Modified:
 /dba/connectivity/source/drivers/mozab/mozillasrc/
  MNSMozabProxy.hxx

Log:
 INTEGRATION: CWS mozab05 (1.2.46); FILE MERGED
 2005/02/01 07:32:57 windly 1.2.46.4: #i20088# run should have a return value 
to give a chance to return some values
 2005/01/28 07:21:44 windly 1.2.46.3: #i20088# thunderbird support
 2005/01/24 08:04:59 windly 1.2.46.2: #i20088# fix build bugs on solaris sparc
 2005/01/17 05:30:55 windly 1.2.46.1: #i20088# Detect Mozilla Thunderbird 
Address Book: patchs for connectivity

File Changes:

Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/
=============================================================

File [changed]: MNSMozabProxy.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx?r1=1.2&r2=1.3
Delta lines:  +85 -7
--------------------
--- MNSMozabProxy.hxx   25 Jun 2004 18:32:46 -0000      1.2
+++ MNSMozabProxy.hxx   21 Feb 2005 12:32:08 -0000      1.3
@@ -1,3 +1,64 @@
+/*************************************************************************
+ *
+ *  $RCSfile$
+ *
+ *  $Revision$
+ *
+ *  last change: $Author$ $Date$
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
 #ifndef _CONNECTIVITY_MAB_MOZABHELPER_HXX_
 #define _CONNECTIVITY_MAB_MOZABHELPER_HXX_
 #ifndef _CONNECTIVITY_MAB_NS_DECLARES_HXX_
@@ -8,6 +69,15 @@
 #endif
 
 #include <MNSInclude.hxx>
+#ifndef _CPPUHELPER_COMPBASE2_HXX_
+#include <cppuhelper/compbase1.hxx>
+#endif
+#ifndef _COM_SUN_STAR_MOZILLA_XCODEPROXY_HDL_
+#include <com/sun/star/mozilla/XCodeProxy.hpp>
+#endif
+#ifndef _COM_SUN_STAR_MOZILLA_XPROXYRUNNER_HDL_
+#include "com/sun/star/mozilla/XProxyRunner.hdl"
+#endif
 
 namespace connectivity
 {
@@ -51,25 +121,33 @@
                        }
                };
                typedef RunArgs RunArgs;
-       class MNSMozabProxy : public nsIRunnable
+               typedef ::cppu::WeakImplHelper1< 
::com::sun::star::mozilla::XCodeProxy > MNSMozabProxy_BASE;
+
+
+       class MNSMozabProxy : public MNSMozabProxy_BASE
         {
         public:
-            nsIRunnable * ProxiedObject();
             MNSMozabProxy();
             virtual ~MNSMozabProxy();
-            NS_DECL_ISUPPORTS
-            NS_DECL_NSIRUNNABLE
+
+                       //XCodeProxy
+                   virtual sal_Int32 SAL_CALL run(  ) throw 
(::com::sun::star::uno::RuntimeException);
+                       virtual ::com::sun::star::mozilla::MozillaProductType 
SAL_CALL getProductType(  ) throw (::com::sun::star::uno::RuntimeException);
+                       virtual ::rtl::OUString SAL_CALL getProfileName(  ) 
throw (::com::sun::star::uno::RuntimeException);
         
         public:
-               sal_Int32 StartProxy(RunArgs * args); //Call this to start proxy
+               sal_Int32 StartProxy(RunArgs * 
args,::com::sun::star::mozilla::MozillaProductType aProduct,const 
::rtl::OUString &aProfile); //Call this to start proxy
 
         protected:
                        nsresult testLDAPConnection();
                        nsresult InitLDAP(sal_Char* sUri, sal_Unicode* sBindDN, 
sal_Unicode* sPasswd,sal_Bool * nUseSSL);
                        nsresult QueryHelperStub();
         private:
-            nsIRunnable* _ProxiedObject;
+                       ::com::sun::star::uno::Reference< 
::com::sun::star::mozilla::XProxyRunner > xRunner;
+
             RunArgs * m_Args;
+                       ::com::sun::star::mozilla::MozillaProductType m_Product;
+                       ::rtl::OUString m_Profile;
 #if OSL_DEBUG_LEVEL > 0
             oslThreadIdentifier m_oThreadID;
 #endif




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to