#i122365# RmMoz 1/9: start replacing AOO's dependency on full Mozilla with just the NSS library

Patch by: Fan Zheng

15 files changed, 162 insertions, 216 deletions

diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 509b61cc6f9a..fcc61a71383d 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity    :    shell  L10N:l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
+cn  connectivity    :    shell  L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
 cn  connectivity                                    usr1    -   all cn_mkout NULL
 cn  connectivity\inc                                nmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -   all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 1d09e409b3f2..eaae63d81a94 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -32,16 +32,20 @@ using namespace com::sun::star::mozilla;
 using namespace connectivity::mozab;
 #include <MNSFolders.hxx>
 #include "MNSProfileDiscover.hxx"
+/*
 #ifndef MINIMAL_PROFILEDISCOVER
 #  include "MNSProfileManager.hxx"
 #  include "MNSRunnable.hxx"
 #endif
 #include <MNSInit.hxx>
+*/
 
 static MozillaBootstrap *pMozillaBootstrap=NULL;
 static Reference<XMozillaBootstrap> xMozillaBootstrap;
 extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
 {
+    return NULL;
+    /*
     if (!pMozillaBootstrap)
     {
         pMozillaBootstrap=new connectivity::mozab::MozillaBootstrap( _rxFactory );
@@ -49,6 +53,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL OMozillaBootstrap_CreateInstance
         xMozillaBootstrap = pMozillaBootstrap;
     }
     return  pMozillaBootstrap;
+     */
 }
 
 // --------------------------------------------------------------------------------
@@ -67,6 +72,8 @@ MozillaBootstrap::~MozillaBootstrap()
 // -----------------------------------------------------------------------------
 void MozillaBootstrap::Init()
 {
+    return;
+    /*
     sal_Bool aProfileExists=sal_False;
 
 #ifndef MINIMAL_PROFILEDISCOVER
@@ -75,24 +82,30 @@ void MozillaBootstrap::Init()
 
     m_ProfileManager = new ProfileManager();
 #else
-    (void)aProfileExists; /* avoid warning about unused parameter */
+    (void)aProfileExists; // avoid warning about unused parameter
 #endif
     m_ProfileAccess = new ProfileAccess();
     bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString());
+    */
 }
 
 // --------------------------------------------------------------------------------
 void MozillaBootstrap::disposing()
 {
+    /*
     ::osl::MutexGuard aGuard(m_aMutex);
     OMozillaBootstrap_BASE::disposing();
+     */
 }
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
 rtl::OUString MozillaBootstrap::getImplementationName_Static(  ) throw(RuntimeException)
 {
+    return rtl::OUString();
+    /*
     return rtl::OUString::createFromAscii(MOZAB_MozillaBootstrap_IMPL_NAME);
+     */
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static(  ) throw (RuntimeException)
@@ -100,7 +113,8 @@ Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static(
     // which service is supported
     // for more information @see com.sun.star.mozilla.MozillaBootstrap
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+    //aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+    aSNS[0] = ::rtl::OUString();
     return aSNS;
 }
 
@@ -113,6 +127,8 @@ Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static(
 //------------------------------------------------------------------
 sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
 {
+    return sal_False;
+    /*
     Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
     const ::rtl::OUString* pSupported = aSupported.getConstArray();
     const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
@@ -120,6 +136,7 @@ sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rSe
         ;
 
     return pSupported != pEnd;
+     */
 }
 
 //------------------------------------------------------------------
@@ -132,32 +149,40 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 // XProfileDiscover
 ::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException)
 {
-    return m_ProfileAccess->getProfileCount(product);
+    return 0;
+    //return m_ProfileAccess->getProfileCount(product);
 }
 ::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return m_ProfileAccess->getProfileList(product,list);
+    return 0;
+    //return m_ProfileAccess->getProfileList(product,list);
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return m_ProfileAccess->getDefaultProfile(product);
+    return ::rtl::OUString();
+    //return m_ProfileAccess->getDefaultProfile(product);
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return m_ProfileAccess->getProfilePath(product,profileName);
+    return ::rtl::OUString();
+    //return m_ProfileAccess->getProfilePath(product,profileName);
 }
 ::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return m_ProfileAccess->isProfileLocked(product,profileName);
+    return sal_True;
+    //return m_ProfileAccess->isProfileLocked(product,profileName);
 }
 ::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return m_ProfileAccess->getProfileExists(product,profileName);
+    return sal_False;
+    //return m_ProfileAccess->getProfileExists(product,profileName);
 }
 
 // XProfileManager
 ::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
+    return -1;
+
 #ifndef MINIMAL_PROFILEDISCOVER
     return m_ProfileManager->bootupProfile(product,profileName);
 #else
@@ -168,6 +193,7 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 }
 ::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+    return -1;
 #ifndef MINIMAL_PROFILEDISCOVER
     return m_ProfileManager->shutdownProfile();
 #else
@@ -176,6 +202,7 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 }
 ::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+    return ::com::sun::star::mozilla::MozillaProductType_Default;
 #ifndef MINIMAL_PROFILEDISCOVER
     return m_ProfileManager->getCurrentProduct();
 #else
@@ -184,6 +211,7 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+    return ::rtl::OUString();
 #ifndef MINIMAL_PROFILEDISCOVER
     return m_ProfileManager->getCurrentProfile();
 #else
@@ -192,6 +220,7 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 }
 ::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+    return sal_True;
 #ifndef MINIMAL_PROFILEDISCOVER
     return isProfileLocked(getCurrentProduct(),m_ProfileManager->getCurrentProfile());
 #else
@@ -200,6 +229,7 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
+    return ::rtl::OUString();
 #ifndef MINIMAL_PROFILEDISCOVER
     return m_ProfileManager->setCurrentProfile(product,profileName);
 #else
@@ -212,6 +242,7 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 // XProxyRunner
 ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException)
 {
+    return -1;
 #ifndef MINIMAL_PROFILEDISCOVER
     ::rtl::OUString profileName = aCode->getProfileName();
     ::rtl::OUString currProfileName = getCurrentProfile();
@@ -243,13 +274,17 @@ component_getImplementationEnvironment(
                 uno_Environment ** /*ppEnv*/
             )
 {
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+    //*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
 static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
 {
+    /*
         MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
         return *pBootstrap;
+     */
+    MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(NULL);
+    return *pBootstrap;
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
@@ -257,6 +292,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                                         void* pServiceManager,
                                         void* /*pRegistryKey*/)
 {
+    return 0;
+    /*
         void* pRet = 0;
 
         if (pServiceManager)
@@ -280,6 +317,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
         }
 
         return pRet;
+     */
 };
 
 #endif
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 980395ec3a87..ce0f8bd6f3d8 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -47,8 +47,8 @@ namespace connectivity
             ::osl::Mutex                m_aMutex;       // mutex is need to control member access
             virtual ~MozillaBootstrap();
         protected:
-            ProfileAccess * m_ProfileAccess;
-            ProfileManager  * m_ProfileManager;
+            //ProfileAccess * m_ProfileAccess;
+            //ProfileManager    * m_ProfileManager;
         public:
 
             void Init();
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index b4696e4d021b..9ebc80197dcf 100644
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -52,14 +52,14 @@ MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 INCPRE += -I../mozillasrc
 
 # --- Files -------------------------------------
-
-SLOFILES += \
-    $(SLO)$/MNSINIParser.obj \
-    $(SLO)$/MNSProfileDiscover.obj \
-    $(SLO)$/MMozillaBootstrap.obj \
-    $(SLO)$/MNSFolders.obj
-
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES" ) || ( "$(WITH_MOZILLA)" == "NO" ) || ( "$(OS)" == "MACOSX" )
+SLOFILES += $(SLO)$/MMozillaBootstrap.obj
+#SLOFILES += \
+#	$(SLO)$/MNSINIParser.obj \
+#	$(SLO)$/MNSProfileDiscover.obj \
+#	$(SLO)$/MMozillaBootstrap.obj \
+#	$(SLO)$/MNSFolders.obj
+
+#.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES" ) || ( "$(WITH_MOZILLA)" == "NO" ) || ( "$(OS)" == "MACOSX" )
 CDEFS+=-DMINIMAL_PROFILEDISCOVER
 
 SHL1TARGET=$(TARGET)
@@ -82,14 +82,14 @@ $(MISC)/mozbootstrap.component .ERRREMOVE : \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
 
-.ELSE
-SLOFILES += \
-    $(SLO)$/MNSInit.obj			            \
-    $(SLO)$/MNSProfileManager.obj	\
-    $(SLO)$/MNSRunnable.obj	\
-    $(SLO)$/MNSProfile.obj					\
-    $(SLO)$/MNSProfileDirServiceProvider.obj
-.ENDIF
+#.ELSE
+#SLOFILES += \
+#	$(SLO)$/MNSInit.obj			            \
+#	$(SLO)$/MNSProfileManager.obj	\
+#	$(SLO)$/MNSRunnable.obj	\
+#	$(SLO)$/MNSProfile.obj					\
+#	$(SLO)$/MNSProfileDirServiceProvider.obj
+#.ENDIF
 
 # --- Targets ----------------------------------
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
index e6b78dea6904..fa06266990f8 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
@@ -25,7 +25,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include "nsIServiceManager.h"
 #include "nsIEventQueueService.h"
 #include "nsIChromeRegistry.h"
@@ -46,5 +46,5 @@
 #include "nsEmbedAPI.h"
 
 #include "nsDirectoryService.h"
-
+*/
 #include "post_include_mozilla.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 326043dbd56f..309f681dc16e 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
@@ -81,5 +81,5 @@
 #include "nsHashtable.h"
 #include "nsIAtom.h"
 #include "nsCRT.h"
-
+*/
 #include "post_include_mozilla.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
index f67c673c34d1..12020d99eb46 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
@@ -25,7 +25,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include "nsIDirectoryService.h"
 #include "nsILocalFile.h"
 #include "nsString.h"
@@ -33,5 +33,5 @@
 #pragma disable_warn
     // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
 #endif
-
+*/
 #include "post_include_mozilla.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
index 4e9341684dc3..ed0332e67d3d 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
@@ -25,7 +25,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsString.h"
@@ -38,5 +38,5 @@
 #include "nsVoidArray.h"
 #include "nsIFile.h"
 #include "nsILocalFile.h"
-
+*/
 #include "post_include_mozilla.h"
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
index 07351229def4..c54f49270f96 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
@@ -25,7 +25,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsString.h"
@@ -76,5 +76,5 @@
 
 #include "nsIPlatformCharset.h"
 #include <MNSInit.hxx>
-
+*/
 #include "post_include_mozilla.h"
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 1149021686e4..9e6e0401260e 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -27,45 +27,45 @@ TARGET=mozab
 TARGET2=$(TARGET)drv
 VISIBILITY_HIDDEN=TRUE
 
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) || ( "$(OS)" == "OS2" )
+#.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) || ( "$(OS)" == "OS2" )
 all: 
     @echo "    Not building the mozilla address book driver"
     @echo "    dependency to Mozilla developer snapshots not feasable at the moment"
     @echo "    see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"
     @echo "    see http://www.mozilla.org/issues/show_bug.cgi?id=91209"
-.ENDIF
+#.ENDIF
 
 # --- begin of mozilla specific stuff
 MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
 MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 
-.IF "$(OS)"=="WNT" 
-  MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
-  MOZ_REG_LIB	  := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
+#.IF "$(OS)"=="WNT" 
+#  MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
+#  MOZ_REG_LIB	  := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
 
-  MOZ_EMBED_LIB *:= $(MOZ_LIB)$/baseembed_s.lib
-  MOZ_REG_LIB *:= $(MOZ_LIB)$/mozreg.lib
+#  MOZ_EMBED_LIB *:= $(MOZ_LIB)$/baseembed_s.lib
+#  MOZ_REG_LIB *:= $(MOZ_LIB)$/mozreg.lib
 
-  .IF "$(COM)"=="GCC"
-    MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
-  .ELSE
-    LIB += $(MOZ_LIB)
-    MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
-  .ENDIF
+#  .IF "$(COM)"=="GCC"
+#    MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
+#  .ELSE
+#    LIB += $(MOZ_LIB)
+#    MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
+#  .ENDIF
 
-.ELSE "$(OS)"=="WNT" 
-  MOZ_LIB_XPCOM = -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
-.ENDIF
+#.ELSE "$(OS)"=="WNT" 
+#  MOZ_LIB_XPCOM = -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
+#.ENDIF
 # --- end of mozilla specific stuff
 
 USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 VISIBILITY_HIDDEN=TRUE
 
-.IF "$(OS)"!="WNT" 
+#.IF "$(OS)"!="WNT" 
 COMPONENT_CONFIG_DATA=$(TARGET)2.xcu
 COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
-.ENDIF
+#.ENDIF
 
 # --- Settings ----------------------------------
 
@@ -73,97 +73,6 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
 
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Files -------------------------------------
-
-SLOFILES=\
-        $(SLO)$/MDriver.obj						\
-        $(SLO)$/MServices.obj
-            
-# --- MOZAB BASE Library -----------------------------------
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
-    $(CPPULIB)					\
-    $(CPPUHELPERLIB)			\
-    $(SALLIB)					\
-    $(DBTOOLSLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)$(DLLPOSTFIX)
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
-            $(SLB)$/$(TARGET).lib
-DEFLIB1NAME=$(TARGET)
-
-
-# --- Files -------------------------------------
-MOZSLOFILES=\
-    $(SLO)$/MNSInit.obj			            \
-    $(SLO)$/MQueryHelper.obj			    \
-    $(SLO)$/MDatabaseMetaDataHelper.obj		\
-    $(SLO)$/MQuery.obj			            \
-    $(SLO)$/MTypeConverter.obj              \
-    $(SLO)$/MNameMapper.obj					\
-    $(SLO)$/MNSMozabProxy.obj	\
-    $(SLO)$/MNSTerminateListener.obj	\
-    $(SLO)$/MMozillaBootstrap.obj	\
-    $(SLO)$/MNSFolders.obj	\
-    $(SLO)$/MNSProfileDiscover.obj	\
-    $(SLO)$/MNSProfileManager.obj	\
-    $(SLO)$/MNSINIParser.obj	\
-    $(SLO)$/MNSRunnable.obj	\
-    $(SLO)$/MNSProfile.obj					\
-    $(SLO)$/MNSProfileDirServiceProvider.obj    \
-    $(SLO)$/MLdapAttributeMap.obj
-
-
-SLO2FILES=\
-        $(SLO)$/MConfigAccess.obj				\
-        $(SLO)$/MCatalog.obj					\
-        $(SLO)$/MColumns.obj					\
-        $(SLO)$/MTable.obj						\
-        $(SLO)$/MTables.obj						\
-        $(SLO)$/MColumnAlias.obj				\
-        $(SLO)$/MPreparedStatement.obj			\
-        $(SLO)$/MStatement.obj					\
-        $(SLO)$/MResultSetMetaData.obj			\
-        $(SLO)$/MResultSet.obj					\
-        $(SLO)$/MDatabaseMetaData.obj			\
-        $(SLO)$/MConnection.obj					\
-        $(MOZSLOFILES)
-
-DEPOBJFILES=$(SLO2FILES)
-
-# --- MOZAB BASE Library -----------------------------------
-
-SHL2VERSIONMAP= $(TARGET2).map
-SHL2NOCHECK=TRUE
-SHL2TARGET=	$(TARGET2)$(DLLPOSTFIX)
-SHL2OBJS=$(SLO2FILES)
-SHL2STDLIBS=\
-    $(CPPULIB)					\
-    $(CPPUHELPERLIB)			\
-    $(VOSLIB)					\
-    $(SALLIB)					\
-    $(DBTOOLSLIB)				\
-    $(COMPHELPERLIB)			\
-    $(MOZ_LIB_XPCOM)
-
-.IF "$(GUI)"=="WNT"
-    SHL2STDLIBS += \
-                 $(SHELL32LIB)
-.ENDIF # "$(GUI)"=="WNT"
-
-SHL2DEPN=
-SHL2IMPLIB=	i$(TARGET2)
-SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=	$(SHL2TARGET)
-
 # --- Targets ----------------------------------
 
 .INCLUDE : $(PRJ)$/target.pmk
@@ -175,12 +84,6 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo _TI				>$@
     @echo _real				>>$@
 
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo _TI				>$@
-    @echo _real				>>$@
-
-
 ALLTAR : $(MISC)/mozab.component
 
 $(MISC)/mozab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
index 7a94ea4b03e2..f06b2ac13282 100644
--- a/connectivity/source/drivers/mozab/makefile_mozab.mk
+++ b/connectivity/source/drivers/mozab/makefile_mozab.mk
@@ -32,26 +32,26 @@ CDEFS += -DMOZILLA_INTERNAL_API
 
 MOZINC = . \
         -I.. \
-        -I$(MOZ_INC) \
-        -I$(MOZ_INC)$/nspr \
-        -I$(MOZ_INC)$/xpcom \
-        -I$(MOZ_INC)$/string \
-        -I$(MOZ_INC)$/rdf \
-        -I$(MOZ_INC)$/msgbase \
-        -I$(MOZ_INC)$/addrbook \
-        -I$(MOZ_INC)$/mork \
-        -I$(MOZ_INC)$/locale \
-        -I$(MOZ_INC)$/pref \
-        -I$(MOZ_INC)$/mime \
-        -I$(MOZ_INC)$/chrome \
-        -I$(MOZ_INC)$/necko \
-        -I$(MOZ_INC)$/intl \
-        -I$(MOZ_INC)$/profile \
-        -I$(MOZ_INC)$/embed_base \
-        -I$(MOZ_INC)$/mozldap \
-        -I$(MOZ_INC)$/uconv \
-        -I$(MOZ_INC)$/xpcom_obsolete \
-        -I$(MOZ_INC)$/content
+        -I$(MOZ_INC)
+#       -I$(MOZ_INC)$/nspr \
+#        -I$(MOZ_INC)$/xpcom \
+#	    -I$(MOZ_INC)$/string \
+#	    -I$(MOZ_INC)$/rdf \
+#	    -I$(MOZ_INC)$/msgbase \
+#	    -I$(MOZ_INC)$/addrbook \
+#	    -I$(MOZ_INC)$/mork \
+#	    -I$(MOZ_INC)$/locale \
+#	    -I$(MOZ_INC)$/pref \
+#	    -I$(MOZ_INC)$/mime \
+#	    -I$(MOZ_INC)$/chrome \
+#	    -I$(MOZ_INC)$/necko \
+#	    -I$(MOZ_INC)$/intl \
+#	    -I$(MOZ_INC)$/profile \
+#	    -I$(MOZ_INC)$/embed_base \
+#	    -I$(MOZ_INC)$/mozldap \
+#	    -I$(MOZ_INC)$/uconv \
+#	    -I$(MOZ_INC)$/xpcom_obsolete \
+#	    -I$(MOZ_INC)$/content
         
 .IF "$(GUI)" == "WNT"
   CDEFS +=    \
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index 7097e2bb0d8c..b9edc611d325 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
@@ -34,7 +34,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include <nsDebug.h>
 
 #include <nsCOMPtr.h>
@@ -71,7 +71,7 @@
 #include <nsILDAPMessage.h>
 
 #include <prerr.h>
-
+*/
 #include "post_include_mozilla.h"
 
 #endif // _CONNECTIVITY_MAB_NS_INCLUDE_HXX_
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index 600406f92e3e..e1b7fb9c2454 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -32,18 +32,18 @@
 #include <osl/conditn.hxx>
 
 #include "pre_include_mozilla.h"
-#include <nsIProxyObjectManager.h>
+//#include <nsIProxyObjectManager.h>
 // More Mozilla includes for LDAP Connection Test
-#include "prprf.h"
-#include "nsILDAPURL.h"
-#include "nsILDAPMessage.h"
-#include "nsILDAPMessageListener.h"
-#include "nsILDAPErrors.h"
-#include "nsILDAPConnection.h"
-#include "nsILDAPOperation.h"
+//#include "prprf.h"
+//#include "nsILDAPURL.h"
+//#include "nsILDAPMessage.h"
+//#include "nsILDAPMessageListener.h"
+//#include "nsILDAPErrors.h"
+//#include "nsILDAPConnection.h"
+//#include "nsILDAPOperation.h"
 #include "post_include_mozilla.h"
-#include "MQuery.hxx"
-#include <MQueryHelper.hxx>
+//#include "MQuery.hxx"
+//#include <MQueryHelper.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <unotools/processfactory.hxx>
 #include "com/sun/star/mozilla/XProxyRunner.hpp"
@@ -60,16 +60,18 @@ using namespace connectivity::mozab;
 /* Implementation file */
 
 static ::osl::Mutex m_aThreadMutex;
-extern nsresult NewAddressBook(const ::rtl::OUString * aName);
+//extern nsresult NewAddressBook(const ::rtl::OUString * aName);
 
 
 MNSMozabProxy::MNSMozabProxy()
 {
+/*
   m_Args = NULL;
 #if OSL_DEBUG_LEVEL > 0
   m_oThreadID = osl_getThreadIdentifier(NULL);
 #endif
   acquire();
+*/
 }
 
 MNSMozabProxy::~MNSMozabProxy()
@@ -78,6 +80,7 @@ MNSMozabProxy::~MNSMozabProxy()
 
 sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile)
 {
+/*
     OSL_TRACE( "IN : MNSMozabProxy::StartProxy() \n" );
     ::osl::MutexGuard aGuard(m_aThreadMutex);
     m_Product = aProduct;
@@ -93,30 +96,34 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo
     }
     const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy > aCode(this);
     return xRunner->Run(aCode);
+*/
+    return -1;
 }
 
-extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap,
-                        ::std::vector< ::rtl::OUString >*   _rStrings,
-                        ::std::vector< ::rtl::OUString >*   _rTypes,
-                        sal_Int32* pErrorId );
+//extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap,
+//                      ::std::vector< ::rtl::OUString >*   _rStrings,
+//                        ::std::vector< ::rtl::OUString >*   _rTypes,
+//                        sal_Int32* pErrorId );
 
 ::com::sun::star::mozilla::MozillaProductType SAL_CALL MNSMozabProxy::getProductType(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return m_Product;
+    return ::com::sun::star::mozilla::MozillaProductType_Default;
 }
 ::rtl::OUString SAL_CALL MNSMozabProxy::getProfileName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return m_Profile;
+    return rtl::OUString();
 }
 
 sal_Int32 SAL_CALL MNSMozabProxy::run(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+    return (sal_Int32)0x80070057L;//NS_ERROR_INVALID_ARG;
+/*
 #if OSL_DEBUG_LEVEL > 0
     OSL_TRACE( "IN : MNSMozabProxy::Run() Caller thread :%4d \n" , m_oThreadID );
 #else
     OSL_TRACE( "IN : MNSMozabProxy::Run() \n" );
 #endif
-    nsresult rv = NS_ERROR_INVALID_ARG;
+    //nsresult rv = NS_ERROR_INVALID_ARG;
     if (m_Args == NULL)
         return NS_ERROR_INVALID_ARG;
     switch(m_Args->funcIndex)
@@ -159,8 +166,9 @@ sal_Int32 SAL_CALL MNSMozabProxy::run(  ) throw (::com::sun::star::uno::RuntimeE
            return NS_ERROR_INVALID_ARG;
     }
     return rv;
+*/
 }
-
+/*
 nsresult MNSMozabProxy::QueryHelperStub()
 {
     nsresult rv = NS_ERROR_INVALID_ARG;
@@ -197,6 +205,7 @@ nsresult MNSMozabProxy::QueryHelperStub()
     }
     return rv;
 }
+
 //-------------------------------------------------------------------
 
 #define NS_LDAPCONNECTION_CONTRACTID     "@mozilla.org/network/ldap-connection;1"
@@ -258,11 +267,6 @@ void MLDAPMessageListener::setConnectionStatus( sal_Bool _good )
     m_aCondition.set();
 }
 
-NS_IMETHODIMP MLDAPMessageListener::OnLDAPInit(nsILDAPConnection* /*aConn*/, nsresult aStatus )
-{
-    setConnectionStatus( NS_SUCCEEDED( aStatus ) ? sal_True : sal_False );
-    return aStatus;
-}
 
 NS_IMETHODIMP MLDAPMessageListener::OnLDAPMessage( nsILDAPMessage* aMessage )
 {
@@ -398,3 +402,4 @@ MNSMozabProxy::InitLDAP(sal_Char* sUri, sal_Unicode* sBindDN, sal_Unicode* pPass
         m_Args->arg5 = messageListener;
     return rv;
 }
+*/
\ No newline at end of file
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index aacab604f2b0..18ffbac64479 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
@@ -96,18 +96,18 @@ namespace connectivity
         public:
             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();
+        //protected:
+            //nsresult testLDAPConnection();
+            //nsresult InitLDAP(sal_Char* sUri, sal_Unicode* sBindDN, sal_Unicode* sPasswd,sal_Bool * nUseSSL);
+            //nsresult QueryHelperStub();
         private:
-            ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner > xRunner;
+            //::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;
+            //RunArgs * m_Args;
+            //::com::sun::star::mozilla::MozillaProductType m_Product;
+            //::rtl::OUString m_Profile;
 #if OSL_DEBUG_LEVEL > 0
-            oslThreadIdentifier m_oThreadID;
+            //oslThreadIdentifier m_oThreadID;
 #endif
         };
     }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index eb29b63a54bc..0aacf8c64b7c 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -55,15 +55,15 @@ INCPRE += -I../bootstrap
 
 # --- Files -------------------------------------
 
-SLOFILES = \
-    $(SLO)$/MQueryHelper.obj			    \
-    $(SLO)$/MDatabaseMetaDataHelper.obj		\
-    $(SLO)$/MQuery.obj			            \
-    $(SLO)$/MTypeConverter.obj              \
-    $(SLO)$/MNameMapper.obj					\
-    $(SLO)$/MNSMozabProxy.obj	            \
-    $(SLO)$/MNSTerminateListener.obj        \
-    $(SLO)$/MLdapAttributeMap.obj           \
+SLOFILES = $(SLO)$/MNSMozabProxy.obj
+#	$(SLO)$/MQueryHelper.obj			    \
+#	$(SLO)$/MDatabaseMetaDataHelper.obj		\
+#	$(SLO)$/MQuery.obj			            \
+#	$(SLO)$/MTypeConverter.obj              \
+#	$(SLO)$/MNameMapper.obj					\
+#	$(SLO)$/MNSMozabProxy.obj	            
+#	$(SLO)$/MNSTerminateListener.obj        \
+#	$(SLO)$/MLdapAttributeMap.obj           \
 
 .ENDIF