Make it build under linux

6 files changed, 51 insertions, 53 deletions

diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 6c2e63ebda02..6714b702f8c9 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ftpcontent.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: abi $ $Date: 2002-08-28 07:23:11 $
+ *  last change: $Author: abi $ $Date: 2002-08-29 09:45:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -434,8 +434,8 @@ Reference< XRow > FTPContent::getPropertyValues(
     const Reference<XCommandEnvironment>& environment
 )
 {
-    vos::ORef<::ucb::PropertyValueSet> xRow =
-        new ::ucb::PropertyValueSet(m_xSMgr);
+    vos::ORef<ucb::PropertyValueSet> xRow =
+        new ucb::PropertyValueSet(m_xSMgr);
 
     FTPURL aFTPURL(m_xIdentifier->getContentIdentifier(),
                    m_pFCP);
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index c08940c3befe..a0165bf4cb12 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ftpdirp.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: abi $ $Date: 2002-08-28 07:23:12 $
+ *  last change: $Author: abi $ $Date: 2002-08-29 09:45:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,13 +96,13 @@ namespace ftp {
                  const sal_uInt16& day,
                  const sal_uInt16& month,
                  const sal_uInt16& year) SAL_THROW( () )
-                     : DateTime(hundredthSeconds,
-                                seconds,
-                                minutes,
-                                hours,
-                                day,
-                                month,
-                                year) { }
+                     : com::sun::star::util::DateTime(hundredthSeconds,
+                                                      seconds,
+                                                      minutes,
+                                                      hours,
+                                                      day,
+                                                      month,
+                                                      year) { }
 
         void SetYear(sal_uInt16 year) { Year = year; }
         void SetMonth(sal_uInt16 month) { Month = month; }
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 8f5718711106..b723848d4125 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ftpresultsetI.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: abi $ $Date: 2002-08-28 07:23:14 $
+ *  last change: $Author: abi $ $Date: 2002-08-29 09:45:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,6 @@
 
 using namespace std;
 using namespace ftp;
-using namespace com::sun::star;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
@@ -79,10 +78,10 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
 
-ResultSetI::ResultSetI(const Reference< lang::XMultiServiceFactory >&  xMSF,
-                       const Reference< XContentProvider >&  xProvider,
+ResultSetI::ResultSetI(const Reference<XMultiServiceFactory>&  xMSF,
+                       const Reference<XContentProvider>&  xProvider,
                        sal_Int32 nOpenMode,
-                       const Sequence< beans::Property >& seqProp,
+                       const Sequence<Property>& seqProp,
                        const Sequence< NumberedSortingInfo >& seqSort,
                        const std::vector<FTPDirentry>&  dirvec)
     : ResultSetBase(xMSF,xProvider,nOpenMode,seqProp,seqSort)
@@ -96,8 +95,8 @@ ResultSetI::ResultSetI(const Reference< lang::XMultiServiceFactory >&  xMSF,
     m_aIdents.resize( m_aPath.size() );
 
     for(unsigned n = 0; n < m_aItems.size(); ++n) {
-        vos::ORef<::ucb::PropertyValueSet> xRow =
-            new ::ucb::PropertyValueSet(xMSF);
+        vos::ORef<ucb::PropertyValueSet> xRow =
+            new ucb::PropertyValueSet(xMSF);
 
         for(i = 0; i < seqProp.getLength(); ++i) {
             const rtl::OUString& Name = seqProp[i].Name;
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index b9e48c0072c7..c9c67b325f61 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ftpurl.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: abi $ $Date: 2002-08-28 07:23:16 $
+ *  last change: $Author: abi $ $Date: 2002-08-29 09:45:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,6 +171,13 @@ rtl::OUString FTPURL::ident() const
 /** Listing of a directory.
  */
 
+namespace ftp {
+
+    enum OS {
+        FTP_DOS,FTP_UNIX,FTP_VMS,FTP_UNKNOWN
+    };
+
+}
 
 std::vector<FTPDirentry> FTPURL::list(
     sal_Int16 nMode
@@ -221,11 +228,7 @@ std::vector<FTPDirentry> FTPURL::list(
     char *p1, *p2;
     p1 = p2 = fwd;
 
-    enum OS {
-        DOS,UNIX,VMS,UNKNOWN
-    };
-
-    OS osKind(UNKNOWN);
+    OS osKind(FTP_UNKNOWN);
     std::vector<FTPDirentry> resvec;
     FTPDirentry aDirEntry;
 
@@ -239,25 +242,25 @@ std::vector<FTPDirentry> FTPURL::list(
             // which returns the operating system type,
             // this is not usable here: There are Windows-server
             // formatting the output like UNIX-ls command.
-            case DOS:
+            case FTP_DOS:
                 FTPDirectoryParser::parseDOS(aDirEntry,p1);
                 break;
-            case UNIX:
+            case FTP_UNIX:
                 FTPDirectoryParser::parseUNIX(aDirEntry,p1);
                 break;
-            case VMS:
+            case FTP_VMS:
                 FTPDirectoryParser::parseVMS(aDirEntry,p1);
                 break;
             default:
                 if(FTPDirectoryParser::parseUNIX(aDirEntry,p1))
-                    osKind = UNIX;
+                    osKind = FTP_UNIX;
                 else if(FTPDirectoryParser::parseDOS(aDirEntry,p1))
-                    osKind = DOS;
+                    osKind = FTP_DOS;
                 else if(FTPDirectoryParser::parseVMS(aDirEntry,p1))
-                    osKind = VMS;
+                    osKind = FTP_VMS;
         }
         aDirEntry.m_aName = aDirEntry.m_aName.trim();
-        if(osKind != int(UNKNOWN) &&
+        if(osKind != int(FTP_UNKNOWN) &&
            !aDirEntry.m_aName.equalsAscii("..") &&
            !aDirEntry.m_aName.equalsAscii(".")) {
             if(1 + url.lastIndexOf(sal_Unicode('/')) ==
@@ -294,7 +297,7 @@ std::vector<FTPDirentry> FTPURL::list(
         p1 = p2 + 1;
     }
 
-    if(osKind == int(UNKNOWN))
+    if(osKind == int(FTP_UNKNOWN))
         throw no_such_directory_exception(FTPCouldNotDetermineSystem);
 
     return resvec;
diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk
index 4009059a5dd3..5bcc15bddcdb 100644
--- a/ucb/source/ucp/ftp/makefile.mk
+++ b/ucb/source/ucp/ftp/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: abi $ $Date: 2002-08-28 07:23:17 $
+#   last change: $Author: abi $ $Date: 2002-08-29 09:45:04 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,6 +70,8 @@ NO_BSYMBOLIC=TRUE
 # Version
 UCPFTP_MAJOR=1
 
+CURLLIB = -lcurl
+
 # --- Settings ---------------------------------------------------------
 
 .INCLUDE: settings.mk
@@ -109,13 +111,12 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)  \
     $(VOSLIB)  \
-    $(UCBHELPERLIB)
+    $(UCBHELPERLIB) \
+    $(CURLLIB)
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS= \
-    $(LIB1TARGET)  \
-    $(SOLARLIBDIR)$/libcurl.lib
-
+    $(LIB1TARGET)
 
 APP1TARGET=ftptest
 APP1OBJS=\
@@ -153,7 +154,7 @@ APP1STDLIBS=\
     $(VOSLIB) \
     $(COMPHELPERLIB) \
     $(UCBHELPERLIB) \
-    $(SOLARLIBDIR)$/libcurl.lib
+    $(CURLLIB)
 
 APP1DEF=	$(MISC)\$(APP1TARGET).def
 
diff --git a/ucb/source/ucp/ftp/test_activedatasink.hxx b/ucb/source/ucp/ftp/test_activedatasink.hxx
index 7f98b1e9bcc7..a9bdf58bf4c8 100644
--- a/ucb/source/ucp/ftp/test_activedatasink.hxx
+++ b/ucb/source/ucp/ftp/test_activedatasink.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: test_activedatasink.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: abi $ $Date: 2002-08-28 07:29:51 $
+ *  last change: $Author: abi $ $Date: 2002-08-29 09:45:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,15 +67,10 @@
 #ifndef _TEST_ACTIVEDATASINK_HXX_
 #define _TEST_ACTIVEDATASINK_HXX_
 
-#ifndef _CPPUHELPER_WEAK_HXX_
 #include <cppuhelper/weak.hxx>
-#endif
-#ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
 #include <cppuhelper/queryinterface.hxx>
-#endif
-#ifndef _COM_SUN_STAR_IO_XACTIVEDATASINK_HPP_
 #include <com/sun/star/io/XActiveDataSink.hpp>
-#endif
+#include <com/sun/star/io/XInputStream.hpp>
 
 namespace test_ftp {
 
@@ -101,8 +96,8 @@ namespace test_ftp {
         // XActiveDataSink
 
         virtual void SAL_CALL
-        setInputStream(const ::com::sun::star::uno::Reference<::com::sun::star::io::XInputStream>& aStream )
-            throw(::com::sun::star::uno::RuntimeException)
+        setInputStream(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& aStream )
+            throw(com::sun::star::uno::RuntimeException)
         {
             m_xInputStream = aStream;
         }