diff options
Diffstat (limited to 'ucb/source')
25 files changed, 93 insertions, 123 deletions
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index da1f310f577f..3a3fad5a9778 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -43,14 +43,14 @@ using namespace com::sun::star::registry; using ::rtl::OUString; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk index 6360f82320d2..f13a2cfaff79 100755 --- a/ucb/source/core/makefile.mk +++ b/ucb/source/core/makefile.mk @@ -62,11 +62,7 @@ SHL1LIBS=\ $(SLB)$/regexp.lib SHL1IMPLIB=i$(TARGET) -.IF "$(GUI)" == "OS2" -DEF1EXPORTFILE=exports2.dxp -.ELSE SHL1VERSIONMAP=$(SOLARENV)/src/component.map -.ENDIF DEF1NAME=$(SHL1TARGET) diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index 6fac85a716df..a477fb9e8902 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -42,14 +42,14 @@ using ::rtl::OUString; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index d30cfebf1334..af0089ce70a0 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -38,14 +38,14 @@ using ::rtl::OUString; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 593eead0fbfd..0e8fb96b9ca9 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -268,13 +268,13 @@ static const ::cppu::ImplementationEntry s_entries [] = extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index 07f5f04ad17a..3f22423063fd 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -75,13 +75,13 @@ namespace ucb { namespace ucp { namespace ext extern "C" { //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //------------------------------------------------------------------------------------------------------------------ - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries ); } diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 1f073e81d157..dda322c10fa9 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -94,7 +94,7 @@ namespace { if (osl::DirectoryItem::get(rPhysicalUrl, aItem) == osl::FileBase::E_None) { - osl::FileStatus aStatus( FileStatusMask_Type ); + osl::FileStatus aStatus( osl_FileStatus_Mask_Type ); if (aItem.getFileStatus(aStatus) == osl::FileBase::E_None) switch (aStatus.getFileType()) { @@ -112,7 +112,7 @@ namespace { RTL_CONSTASCII_USTRINGPARAM("volume")); bResourceType = true; osl::VolumeInfo aVolumeInfo( - VolumeInfoMask_Attributes ); + osl_VolumeInfo_Mask_Attributes ); if( osl::Directory::getVolumeInfo( rPhysicalUrl,aVolumeInfo ) == osl::FileBase::E_None ) diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 1299b33284ae..00bb6bc5a02b 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -230,7 +230,7 @@ XInputStream_impl::seek( { if( location < 0 ) throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 ); - if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) ) + if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx index 0986e3a738ab..712372268727 100644 --- a/ucb/source/ucp/file/filrec.cxx +++ b/ucb/source/ucp/file/filrec.cxx @@ -85,7 +85,7 @@ sal_Bool ReconnectingFile::reconnect() { ::osl::FileBase::RC nRes = ::osl::FileBase::E_NETWORK; - if ( uHow == Pos_Absolut && uPos > 0 ) + if ( uHow == osl_Pos_Absolut && uPos > 0 ) { if ( m_bDisconnect ) { diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 6ecf53620377..93cff9c667fd 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -189,7 +189,7 @@ void SAL_CALL XStream_impl::truncate(void) if (osl::FileBase::E_None != m_aFile.setSize(0)) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); - if (osl::FileBase::E_None != m_aFile.setPos(Pos_Absolut,sal_uInt64(0))) + if (osl::FileBase::E_None != m_aFile.setPos(osl_Pos_Absolut,sal_uInt64(0))) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } @@ -351,7 +351,7 @@ XStream_impl::seek( { if( location < 0 ) throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 ); - if( osl::FileBase::E_None != m_aFile.setPos( Pos_Absolut, sal_uInt64( location ) ) ) + if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) ) throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk index 3d97cb23873c..222daf0cdda8 100755 --- a/ucb/source/ucp/file/makefile.mk +++ b/ucb/source/ucp/file/makefile.mk @@ -69,10 +69,6 @@ SHL1STDLIBS=\ SHL1VERSIONMAP=$(SOLARENV)/src/component.map -.IF "$(GUI)" == "OS2" -DEF1EXPORTFILE=exports2.dxp -.ENDIF - DEF1NAME=$(SHL1TARGET) .ENDIF # L10N_framework diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index bb14f176532d..d3392ac5ab18 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -51,14 +51,14 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::container; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; @@ -321,8 +321,8 @@ FileProvider::compareContentIds( if ( error != osl::FileBase::E_None ) return iComp; - osl::FileStatus aStatus1( FileStatusMask_FileURL ); - osl::FileStatus aStatus2( FileStatusMask_FileURL ); + osl::FileStatus aStatus1( osl_FileStatus_Mask_FileURL ); + osl::FileStatus aStatus2( osl_FileStatus_Mask_FileURL ); error = aItem1.getFileStatus( aStatus1 ); if ( error == osl::FileBase::E_None ) error = aItem2.getFileStatus( aStatus2 ); @@ -514,7 +514,7 @@ void SAL_CALL FileProvider::initProperties( void ) #if defined ( UNX ) m_FileSystemNotation = FileSystemNotation::UNIX_NOTATION; -#elif defined( WNT ) || defined( OS2 ) +#elif defined( WNT ) m_FileSystemNotation = FileSystemNotation::DOS_NOTATION; #else m_FileSystemNotation = FileSystemNotation::UNKNOWN_NOTATION; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index c4131cab233b..0c7c0f30953f 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -300,7 +300,7 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF beans::PropertyState_DEFAULT_VALUE, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND -#if defined( WNT ) || defined( OS2 ) +#if defined( WNT ) )); #else | beans::PropertyAttribute::READONLY)); // under unix/linux only readable @@ -941,33 +941,33 @@ shell::setv( const rtl::OUString& aUnqPath, sal_uInt64 nAttributes(0); if(err == osl::FileBase::E_None) { - osl::FileStatus aFileStatus(FileStatusMask_Attributes); + osl::FileStatus aFileStatus(osl_FileStatus_Mask_Attributes); err = aDirItem.getFileStatus(aFileStatus); if(err == osl::FileBase::E_None && - aFileStatus.isValid(FileStatusMask_Attributes)) + aFileStatus.isValid(osl_FileStatus_Mask_Attributes)) nAttributes = aFileStatus.getAttributes(); } // now we have the attributes provided all went well. if(err == osl::FileBase::E_None) { if(values[i].Name == IsReadOnly) { - nAttributes &= ~(Attribute_OwnWrite | - Attribute_GrpWrite | - Attribute_OthWrite | - Attribute_ReadOnly); + nAttributes &= ~(osl_File_Attribute_OwnWrite | + osl_File_Attribute_GrpWrite | + osl_File_Attribute_OthWrite | + osl_File_Attribute_ReadOnly); if(value) - nAttributes |= Attribute_ReadOnly; + nAttributes |= osl_File_Attribute_ReadOnly; else nAttributes |= ( - Attribute_OwnWrite | - Attribute_GrpWrite | - Attribute_OthWrite); + osl_File_Attribute_OwnWrite | + osl_File_Attribute_GrpWrite | + osl_File_Attribute_OthWrite); } else if(values[i].Name == IsHidden) { - nAttributes &= ~(Attribute_Hidden); + nAttributes &= ~(osl_File_Attribute_Hidden); if(value) - nAttributes |= Attribute_Hidden; + nAttributes |= osl_File_Attribute_Hidden; } err = osl::File::setAttributes( aUnqPath,nAttributes); @@ -1138,7 +1138,6 @@ shell::move( sal_Int32 CommandId, // srcUnqPath and dstUnqPathIn are equal if( srcUnqPath == dstUnqPathIn ) return; - // <-- // osl::FileBase::RC nError; rtl::OUString dstUnqPath( dstUnqPathIn ); @@ -1162,13 +1161,13 @@ shell::move( sal_Int32 CommandId, // stat to determine whether we have a symlink rtl::OUString targetPath(dstUnqPath); - osl::FileStatus aStatus(FileStatusMask_Type|FileStatusMask_LinkTargetURL); + osl::FileStatus aStatus(osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL); osl::DirectoryItem aItem; osl::DirectoryItem::get(dstUnqPath,aItem); aItem.getFileStatus(aStatus); - if( aStatus.isValid(FileStatusMask_Type) && - aStatus.isValid(FileStatusMask_LinkTargetURL) && + if( aStatus.isValid(osl_FileStatus_Mask_Type) && + aStatus.isValid(osl_FileStatus_Mask_LinkTargetURL) && aStatus.getFileType() == osl::FileStatus::Link ) targetPath = aStatus.getLinkTargetURL(); @@ -1279,9 +1278,9 @@ shell::move( sal_Int32 CommandId, nError ); return; } - osl::FileStatus aStatus( FileStatusMask_Type ); + osl::FileStatus aStatus( osl_FileStatus_Mask_Type ); nError = aItem.getFileStatus( aStatus ); - if( nError != osl::FileBase::E_None || ! aStatus.isValid( FileStatusMask_Type ) ) + if( nError != osl::FileBase::E_None || ! aStatus.isValid( osl_FileStatus_Mask_Type ) ) { installError( CommandId, TASKHANDLING_TRANSFER_BY_MOVE_SOURCESTAT, @@ -1330,7 +1329,7 @@ bool getType( task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCE, err); return false; } - osl::FileStatus stat(FileStatusMask_Type); + osl::FileStatus stat(osl_FileStatus_Mask_Type); err = item->getFileStatus(stat); if (err != osl::FileBase::E_None) { task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT, err); @@ -1365,7 +1364,7 @@ shell::copy( } rtl::OUString rslvdSrcUnqPath; if (type == osl::FileStatus::Link) { - osl::FileStatus stat(FileStatusMask_LinkTargetURL); + osl::FileStatus stat(osl_FileStatus_Mask_LinkTargetURL); nError = item.getFileStatus(stat); if (nError != osl::FileBase::E_None) { installError( @@ -1525,7 +1524,7 @@ shell::remove( sal_Int32 CommandId, sal_Bool MustExist ) throw() { - sal_Int32 nMask = FileStatusMask_Type | FileStatusMask_FileURL; + sal_Int32 nMask = osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL; osl::DirectoryItem aItem; osl::FileStatus aStatus( nMask ); @@ -2034,7 +2033,7 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, osl::FileBase::RC next = err; if( err == osl::FileBase::E_None ) { - sal_Int32 n_Mask = FileStatusMask_FileURL | FileStatusMask_FileName | FileStatusMask_Type; + sal_Int32 n_Mask = osl_FileStatus_Mask_FileURL | osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_Type; osl::DirectoryItem aDirItem; @@ -2043,19 +2042,19 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath, sal_Bool IsDoc = false; osl::FileStatus aFileStatus( n_Mask ); aDirItem.getFileStatus( aFileStatus ); - if( aFileStatus.isValid( FileStatusMask_Type ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) ) IsDoc = aFileStatus.getFileType() == osl::FileStatus::Regular; // Getting the information for the next recursive copy sal_Int32 newTypeToCopy = IsDoc ? -1 : +1; rtl::OUString newSrcUnqPath; - if( aFileStatus.isValid( FileStatusMask_FileURL ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) newSrcUnqPath = aFileStatus.getFileURL(); rtl::OUString newDstUnqPath = dstUnqPath; rtl::OUString tit; - if( aFileStatus.isValid( FileStatusMask_FileName ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) tit = rtl::Uri::encode( aFileStatus.getFileName(), rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, @@ -2168,9 +2167,9 @@ shell::getMaskFromProperties( n_Mask = 0; for(sal_Int32 j = 0; j < seq.getLength(); ++j) { if(seq[j].Name == Title) - n_Mask |= FileStatusMask_FileName; + n_Mask |= osl_FileStatus_Mask_FileName; else if(seq[j].Name == CasePreservingURL) - n_Mask |= FileStatusMask_FileURL; + n_Mask |= osl_FileStatus_Mask_FileURL; else if(seq[j].Name == IsDocument || seq[j].Name == IsFolder || seq[j].Name == IsVolume || @@ -2179,23 +2178,16 @@ shell::getMaskFromProperties( seq[j].Name == IsCompactDisc || seq[j].Name == IsFloppy || seq[j].Name == ContentType) - n_Mask |= (FileStatusMask_Type | FileStatusMask_LinkTargetURL); + n_Mask |= (osl_FileStatus_Mask_Type | osl_FileStatus_Mask_LinkTargetURL); else if(seq[j].Name == Size) - n_Mask |= (FileStatusMask_FileSize | - FileStatusMask_Type | - FileStatusMask_LinkTargetURL); + n_Mask |= (osl_FileStatus_Mask_FileSize | + osl_FileStatus_Mask_Type | + osl_FileStatus_Mask_LinkTargetURL); else if(seq[j].Name == IsHidden || seq[j].Name == IsReadOnly) - n_Mask |= FileStatusMask_Attributes; + n_Mask |= osl_FileStatus_Mask_Attributes; else if(seq[j].Name == DateModified) - n_Mask |= FileStatusMask_ModifyTime; -// n_Mask = FileStatusMask_FileURL; -// n_Mask |= FileStatusMask_LinkTargetURL; -// n_Mask |= FileStatusMask_FileName; -// n_Mask |= FileStatusMask_Type; -// n_Mask |= FileStatusMask_ModifyTime; -// n_Mask |= FileStatusMask_FileSize; -// n_Mask |= FileStatusMask_Attributes; + n_Mask |= osl_FileStatus_Mask_ModifyTime; } } @@ -2290,7 +2282,7 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( Title ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_FileName ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileName ) ) { aAny <<= aFileStatus.getFileName(); it1->setValue( aAny ); @@ -2300,7 +2292,7 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( CasePreservingURL ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_FileURL ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileURL ) ) { aAny <<= aFileStatus.getFileURL(); it1->setValue( aAny ); @@ -2312,19 +2304,19 @@ shell::commit( const shell::ContentMap::iterator& it, sal_Int64 dirSize = 0; - if( aFileStatus.isValid( FileStatusMask_FileSize ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_FileSize ) ) dirSize = aFileStatus.getFileSize(); - if( aFileStatus.isValid( FileStatusMask_Type ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Type ) ) { if( osl::FileStatus::Link == aFileStatus.getFileType() && - aFileStatus.isValid( FileStatusMask_LinkTargetURL ) ) + aFileStatus.isValid( osl_FileStatus_Mask_LinkTargetURL ) ) { osl::DirectoryItem aDirItem; - osl::FileStatus aFileStatus2( FileStatusMask_Type ); + osl::FileStatus aFileStatus2( osl_FileStatus_Mask_Type ); if( osl::FileBase::E_None == osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(),aDirItem ) && osl::FileBase::E_None == aDirItem.getFileStatus( aFileStatus2 ) && - aFileStatus2.isValid( FileStatusMask_Type ) ) + aFileStatus2.isValid( osl_FileStatus_Mask_Type ) ) { isVolume = osl::FileStatus::Volume == aFileStatus2.getFileType(); isDirectory = @@ -2333,7 +2325,7 @@ shell::commit( const shell::ContentMap::iterator& it, isFile = osl::FileStatus::Regular == aFileStatus2.getFileType(); - if( aFileStatus2.isValid( FileStatusMask_FileSize ) ) + if( aFileStatus2.isValid( osl_FileStatus_Mask_FileSize ) ) dirSize = aFileStatus2.getFileSize(); } else @@ -2371,10 +2363,10 @@ shell::commit( const shell::ContentMap::iterator& it, if( it1 != properties.end() ) it1->setValue( uno::makeAny( isFile ) ); - osl::VolumeInfo aVolumeInfo( VolumeInfoMask_Attributes ); + osl::VolumeInfo aVolumeInfo( osl_VolumeInfo_Mask_Attributes ); if( isVolume && osl::FileBase::E_None == osl::Directory::getVolumeInfo( it->first,aVolumeInfo ) && - aVolumeInfo.isValid( VolumeInfoMask_Attributes ) ) + aVolumeInfo.isValid( osl_VolumeInfo_Mask_Attributes ) ) { // Retrieve the flags; isRemote = aVolumeInfo.getRemoteFlag(); @@ -2431,10 +2423,10 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( IsReadOnly ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_Attributes ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) ) { sal_uInt64 Attr = aFileStatus.getAttributes(); - sal_Bool readonly = ( Attr & Attribute_ReadOnly ) != 0; + sal_Bool readonly = ( Attr & osl_File_Attribute_ReadOnly ) != 0; it1->setValue( uno::makeAny( readonly ) ); } } @@ -2442,10 +2434,10 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( IsHidden ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_Attributes ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_Attributes ) ) { sal_uInt64 Attr = aFileStatus.getAttributes(); - sal_Bool ishidden = ( Attr & Attribute_Hidden ) != 0; + sal_Bool ishidden = ( Attr & osl_File_Attribute_Hidden ) != 0; it1->setValue( uno::makeAny( ishidden ) ); } } @@ -2453,7 +2445,7 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( DateModified ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_ModifyTime ) ) + if( aFileStatus.isValid( osl_FileStatus_Mask_ModifyTime ) ) { TimeValue temp = aFileStatus.getModifyTime(); @@ -2479,7 +2471,7 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( CreatableContentsInfo ) ); if( it1 != properties.end() ) it1->setValue( uno::makeAny( - isDirectory || !aFileStatus.isValid( FileStatusMask_Type ) + isDirectory || !aFileStatus.isValid( osl_FileStatus_Mask_Type ) ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ) ); } @@ -2504,9 +2496,9 @@ shell::getv( // Always retrieve the type and the target URL because item might be a link osl::FileStatus aFileStatus( n_Mask | - FileStatusMask_FileURL | - FileStatusMask_Type | - FileStatusMask_LinkTargetURL ); + osl_FileStatus_Mask_FileURL | + osl_FileStatus_Mask_Type | + osl_FileStatus_Mask_LinkTargetURL ); aDirItem.getFileStatus( aFileStatus ); aUnqPath = aFileStatus.getFileURL(); @@ -2521,7 +2513,7 @@ shell::getv( osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem ); if ( aTargetItem.is() ) { - osl::FileStatus aTargetStatus( FileStatusMask_Type ); + osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type ); if ( osl::FileBase::E_None == ( result = aTargetItem.getFileStatus( aTargetStatus ) ) ) diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index d77659f20e15..e5bed9fc1a42 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -37,14 +37,14 @@ using namespace com::sun::star; using namespace ftp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk index 6f55fed25fed..9440d0cd6205 100755 --- a/ucb/source/ucp/ftp/makefile.mk +++ b/ucb/source/ucp/ftp/makefile.mk @@ -77,10 +77,6 @@ SHL1STDLIBS=\ $(UCBHELPERLIB) \ $(CURLLIB) -.IF "$(GUI)" == "OS2" -SHL1STDLIBS+=ssl.lib crypto.lib libz.lib -.ENDIF - SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1LIBS= \ $(LIB1TARGET) diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 2e56b4f91db1..09596bb65d56 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -103,13 +103,13 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index 38e43444abec..3d6b32ea60c8 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -144,15 +144,13 @@ ContentProvider::queryContent( //============================ shlib entry points ============================================= -extern "C" void SAL_CALL -component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **/*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" void * SAL_CALL -component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, void */*pRegistryKey*/ ) { diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index cb10ea2ec1a8..d82cc23fa1e8 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -37,14 +37,14 @@ using namespace com::sun::star; using namespace hierarchy_ucp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx index a8eb6f83a6bc..15b75ec4bd39 100644 --- a/ucb/source/ucp/odma/odma_main.cxx +++ b/ucb/source/ucp/odma/odma_main.cxx @@ -44,7 +44,7 @@ /** our main program to convert ODMAIDs to ODMA URLs */ -#if (defined UNX) || (defined OS2) +#if (defined UNX) void main( int argc, char * argv[] ) #else void _cdecl main( int argc, char * argv[] ) diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx index e6ca17cea73a..96ea58396310 100644 --- a/ucb/source/ucp/odma/odma_services.cxx +++ b/ucb/source/ucp/odma/odma_services.cxx @@ -42,14 +42,14 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index 102a7ebe5197..4becb1c3e63c 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -36,14 +36,14 @@ using namespace com::sun::star; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index 25b407cd5fd3..4fe7c0baaa7d 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -40,14 +40,14 @@ using namespace com::sun::star; using namespace tdoc_ucp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 0024eb734033..9b02e5c562d6 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -1198,7 +1198,7 @@ sal_Bool DAVResourceAccess::handleException( DAVException & e, int errorCount ) return sal_True; } return sal_False; - // --> tkr #67048# copy & paste images doesn't display. + // #67048# copy & paste images doesn't display. // if we have a bad connection try again. Up to three times. case DAVException::DAV_HTTP_ERROR: // retry up to three times, if not a client-side error. @@ -1208,11 +1208,9 @@ sal_Bool DAVResourceAccess::handleException( DAVException & e, int errorCount ) return sal_True; } return sal_False; - // <-- - // --> tkr: if connection has said retry then retry! + // if connection has said retry then retry! case DAVException::DAV_HTTP_RETRY: return sal_True; - // <-- default: return sal_False; // Abort } diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk index 162d58266406..f91a9717f115 100755..100644 --- a/ucb/source/ucp/webdav/makefile.mk +++ b/ucb/source/ucp/webdav/makefile.mk @@ -126,18 +126,12 @@ SHL1STDLIBS=\ $(LIBXML2LIB) .IF "$(GUI)"=="WNT" -SHL1STDLIBS+= $(WSOCK32LIB) -.IF "$(WINDOWS_VISTA_PSDK)" != "" SHL1STDLIBS+= $(WS2_32LIB) -.ENDIF SHL1STDLIBS+= $(OPENSSLLIB) .ELSE # WNT .IF "$(OS)"=="SOLARIS" SHL1STDLIBS+= -lnsl -lsocket -ldl .ENDIF # SOLARIS -.IF "$(OS)"=="OS2" -SHL1STDLIBS+= pthread.lib libz.lib -.ENDIF # OS2 .IF "$(SYSTEM_OPENSSL)"=="YES" SHL1STDLIBS+= $(OPENSSLLIB) .ELSE diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 54cee2899fca..14dcc4958fea 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -36,14 +36,14 @@ using namespace com::sun::star; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; |