resyncing to master

29 files changed, 112 insertions, 193 deletions

diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst
index 149f4bf4121c..db5b2903041d 100644
--- a/ucb/prj/d.lst
+++ b/ucb/prj/d.lst
@@ -24,7 +24,9 @@
 ..\%__SRC%\misc\ucp*.map %_DEST%\bin\ucp*.map
 ..\%__SRC%\misc\ucp*.sym %_DEST%\bin\ucp*.sym
 
-..\%__SRC%\slb\odma_lib.lib %_DEST%\lib\odma_lib.lib
+..\%__SRC%\lib\odma_lib.lib %_DEST%\lib\odma_lib.lib
+..\%__SRC%\lib\libodma_lib.a %_DEST%\lib\libodma_lib.a
+
 ..\source\ucp\odma\odma.h %_DEST%\inc\odma.h
 ..\source\ucp\odma\odma_lib.hxx %_DEST%\inc\odma_lib.hxx
 
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index f927c658d426..c6005bb3b32c 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -112,10 +112,10 @@ if ( m_bLastCachedReadWasNull && rValue.hasValue() )    \
                     const Type * >( 0 ) ) );            \
             m_bLastCachedReadWasNull = !( aConvAny >>= aRet ); \
         }                                               \
-        catch ( IllegalArgumentException )              \
+        catch (const IllegalArgumentException&)         \
         {                                               \
         }                                               \
-        catch ( CannotConvertException )                \
+        catch (const CannotConvertException&)           \
         {                                               \
         }                                               \
     }                                                   \
@@ -327,7 +327,7 @@ const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache
         return (* reinterpret_cast< const OUString * >
                 (getRowAny( nRow ).getValue() ));
     }
-    catch( SQLException )
+    catch(const SQLException&)
     {
         throw RuntimeException();
     }
@@ -350,7 +350,7 @@ const Reference< XContentIdentifier >& SAL_CALL CachedContentResultSet::CCRS_Cac
         return (* reinterpret_cast< const Reference< XContentIdentifier > * >
                 (getRowAny( nRow ).getValue() ));
     }
-    catch( SQLException )
+    catch(const SQLException&)
     {
         throw RuntimeException();
     }
@@ -373,7 +373,7 @@ const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache
         return (* reinterpret_cast< const Reference< XContent > * >
                 (getRowAny( nRow ).getValue() ));
     }
-    catch( SQLException )
+    catch (const SQLException&)
     {
         throw RuntimeException();
     }
@@ -792,7 +792,7 @@ sal_Bool SAL_CALL CachedContentResultSet
                 return bValid;
             }
         }
-        catch( SQLException& rEx )
+        catch (const SQLException& rEx)
         {
             if( !bAfterLastApplied && !bAfterLast && nRow > nLastAppliedPos && impl_isForwardOnly() )
             {
@@ -1452,7 +1452,7 @@ sal_Bool SAL_CALL CachedContentResultSet
         {
             bValid = m_xResultSetOrigin->absolute( row );
         }
-        catch (ResultSetException &)
+        catch (const ResultSetException&)
         {
             throw;
         }
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 3a3fad5a9778..840e11de9a8e 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -43,13 +43,6 @@ using namespace com::sun::star::registry;
 using ::rtl::OUString;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/core/exports2.dxp b/ucb/source/core/exports2.dxp
index 8091459f4d84..eb53b560bade 100755
--- a/ucb/source/core/exports2.dxp
+++ b/ucb/source/core/exports2.dxp
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 
 _ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 4124c8c6ec71..6c6946bbe03b 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -204,7 +204,7 @@ bool createContentProviderData(
                         "Error getting item value!" );
         }
     }
-    catch (container::NoSuchElementException &)
+    catch (const container::NoSuchElementException&)
     {
         return false;
     }
@@ -408,7 +408,7 @@ UniversalContentBroker::registerContentProvider(
     {
         aIt = m_aProviders.find(Scheme);
     }
-    catch (IllegalArgumentException const &)
+    catch (const IllegalArgumentException&)
     {
         return 0; //@@@
     }
@@ -422,7 +422,7 @@ UniversalContentBroker::registerContentProvider(
         {
             m_aProviders.add(Scheme, aList, false);
         }
-        catch (IllegalArgumentException const &)
+        catch (const IllegalArgumentException&)
         {
             return 0; //@@@
         }
@@ -454,7 +454,7 @@ void SAL_CALL UniversalContentBroker::deregisterContentProvider(
     {
         aMapIt = m_aProviders.find(Scheme);
     }
-    catch (IllegalArgumentException const &)
+    catch (const IllegalArgumentException&)
     {
         return; //@@@
     }
@@ -905,7 +905,7 @@ bool UniversalContentBroker::getContentProviderData(
 
                     rListToFill.push_back( aInfo );
                 }
-                catch ( container::NoSuchElementException& )
+                catch (const container::NoSuchElementException&)
                 {
                     // getByHierarchicalName
                     OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
@@ -914,12 +914,12 @@ bool UniversalContentBroker::getContentProviderData(
             }
         }
     }
-    catch ( uno::RuntimeException& )
+    catch (const uno::RuntimeException&)
     {
         OSL_FAIL( "UniversalContentBroker::getContentProviderData - caught RuntimeException!" );
         return false;
     }
-    catch ( uno::Exception& )
+    catch (const uno::Exception&)
     {
         // createInstance, createInstanceWithArguments
 
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index a477fb9e8902..461b60ba9b09 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -42,13 +42,6 @@ using ::rtl::OUString;
 
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 90ddde25e9cb..534c7dcea993 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -477,33 +477,33 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
                                                     m_xSMgr, *this, key ) );
                             }
                         }
-                        catch ( IllegalArgumentException& )
+                        catch (const IllegalArgumentException&)
                         {
                             // insertByName
 
                             OSL_FAIL( "PropertySetRegistry::openPropertySet - "
                                         "caught IllegalArgumentException!" );
                         }
-                        catch ( ElementExistException& )
+                        catch (const ElementExistException&)
                         {
                             // insertByName
 
                             OSL_FAIL( "PropertySetRegistry::openPropertySet - "
                                         "caught ElementExistException!" );
                         }
-                        catch ( WrappedTargetException& )
+                        catch (const WrappedTargetException&)
                         {
                             // insertByName, commitChanges
 
                             OSL_FAIL( "PropertySetRegistry::openPropertySet - "
                                         "caught WrappedTargetException!" );
                         }
-                        catch ( RuntimeException& )
+                        catch (const RuntimeException&)
                         {
                             OSL_FAIL( "PropertySetRegistry::openPropertySet - "
                                         "caught RuntimeException!" );
                         }
-                        catch ( Exception& )
+                        catch (const Exception&)
                         {
                             // createInstance
 
@@ -567,7 +567,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key )
                 // Success.
                 return;
             }
-            catch ( NoSuchElementException& )
+            catch (const NoSuchElementException&)
             {
                 // removeByName
 
@@ -575,7 +575,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key )
                             "caught NoSuchElementException!" );
                 return;
             }
-            catch ( WrappedTargetException& )
+            catch (const WrappedTargetException&)
             {
                 // commitChanges
 
@@ -640,11 +640,11 @@ Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName )
         {
             return xNameAccess->getByName( aName );
         }
-        catch ( NoSuchElementException& )
+        catch (const NoSuchElementException&)
         {
             // getByName
         }
-        catch ( WrappedTargetException& )
+        catch (const WrappedTargetException&)
         {
             // getByName
         }
@@ -776,7 +776,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                         xBatch->commitChanges();
                     }
                 }
-                catch ( IllegalArgumentException& )
+                catch (const IllegalArgumentException&)
                 {
                     // insertByName
 
@@ -784,7 +784,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 "caught IllegalArgumentException!" );
                     return;
                 }
-                catch ( ElementExistException& )
+                catch (const ElementExistException&)
                 {
                     // insertByName
 
@@ -792,7 +792,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 "caught ElementExistException!" );
                     return;
                 }
-                catch ( WrappedTargetException& )
+                catch (const WrappedTargetException&)
                 {
                     // insertByName, commitChanges
 
@@ -800,13 +800,13 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 "caught WrappedTargetException!" );
                     return;
                 }
-                catch ( RuntimeException& )
+                catch (const RuntimeException&)
                 {
                     OSL_FAIL( "PropertySetRegistry::renamePropertySet - "
                                 "caught RuntimeException!" );
                     return;
                 }
-                catch ( Exception& )
+                catch (const Exception&)
                 {
                     // createInstance
 
@@ -952,7 +952,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                         }
                     }
                 }
-                catch ( IllegalArgumentException& )
+                catch (const IllegalArgumentException&)
                 {
                     // insertByName, replaceByName
 
@@ -960,7 +960,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 "caught IllegalArgumentException!" );
                     return;
                 }
-                catch ( ElementExistException& )
+                catch (const ElementExistException&)
                 {
                     // insertByName
 
@@ -968,7 +968,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 "caught ElementExistException!" );
                     return;
                 }
-                catch ( WrappedTargetException& )
+                catch (const WrappedTargetException&)
                 {
                     // insertByName, replaceByName, commitChanges
 
@@ -976,7 +976,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 "caught WrappedTargetException!" );
                     return;
                 }
-                catch ( NoSuchElementException& )
+                catch (const NoSuchElementException&)
                 {
                     // getByHierarchicalName, replaceByName
 
@@ -984,13 +984,13 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 "caught NoSuchElementException!" );
                     return;
                 }
-                catch ( RuntimeException& )
+                catch (const RuntimeException&)
                 {
                     OSL_FAIL( "PropertySetRegistry::renamePropertySet - "
                                 "caught RuntimeException!" );
                     return;
                 }
-                catch ( Exception& )
+                catch (const Exception&)
                 {
                     // createInstance
 
@@ -1013,7 +1013,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                     // Success.
                     return;
                 }
-                catch ( NoSuchElementException& )
+                catch (const NoSuchElementException&)
                 {
                     // removeByName
 
@@ -1021,7 +1021,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 "caught NoSuchElementException!" );
                     return;
                 }
-                catch ( WrappedTargetException& )
+                catch (const WrappedTargetException&)
                 {
                     // commitChanges
 
@@ -1072,7 +1072,7 @@ Reference< XMultiServiceFactory > PropertySetRegistry::getConfigProvider()
                                 "No config provider!" );
 
                 }
-                catch ( Exception& )
+                catch (const Exception&)
                 {
                     OSL_FAIL( "PropertySetRegistry::getConfigProvider - "
                                 "caught exception!" );
@@ -1129,11 +1129,11 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess()
         else
             return m_pImpl->m_xRootReadAccess;
     }
-    catch ( RuntimeException& )
+    catch (const RuntimeException&)
     {
         throw;
     }
-    catch ( Exception& )
+    catch (const Exception&)
     {
         // createInstance, createInstanceWithArguments
 
@@ -1216,11 +1216,11 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
                 return m_pImpl->m_xRootWriteAccess;
         }
     }
-    catch ( RuntimeException& )
+    catch (const RuntimeException&)
     {
         throw;
     }
-    catch ( NoSuchElementException& )
+    catch (const NoSuchElementException&)
     {
         // getByHierarchicalName
 
@@ -1228,7 +1228,7 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
             "caught NoSuchElementException!" );
         return Reference< XInterface >();
     }
-    catch ( Exception& )
+    catch (const Exception&)
     {
         // createInstance, createInstanceWithArguments
 
@@ -1539,15 +1539,15 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
                     }
                     return;
                 }
-                catch ( IllegalArgumentException& )
+                catch (const IllegalArgumentException&)
                 {
                     // replaceByName
                 }
-                catch ( NoSuchElementException& )
+                catch (const NoSuchElementException&)
                 {
                     // getByHierarchicalName, replaceByName
                 }
-                catch ( WrappedTargetException& )
+                catch (const WrappedTargetException&)
                 {
                     // replaceByName, commitChanges
                 }
@@ -1583,7 +1583,7 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
         {
             return xNameAccess->getByHierarchicalName( aFullPropName );
         }
-        catch ( NoSuchElementException& )
+        catch (const NoSuchElementException&)
         {
             throw UnknownPropertyException();
         }
@@ -1827,7 +1827,7 @@ void SAL_CALL PersistentPropertySet::addProperty(
                 return;
             }
         }
-        catch ( IllegalArgumentException& )
+        catch (const IllegalArgumentException&)
         {
             // insertByName
 
@@ -1835,7 +1835,7 @@ void SAL_CALL PersistentPropertySet::addProperty(
                         "caught IllegalArgumentException!" );
             return;
         }
-        catch ( ElementExistException& )
+        catch (const ElementExistException&)
         {
             // insertByName
 
@@ -1843,7 +1843,7 @@ void SAL_CALL PersistentPropertySet::addProperty(
                         "caught ElementExistException!" );
             return;
         }
-        catch ( WrappedTargetException& )
+        catch (const WrappedTargetException&)
         {
             // replaceByName, insertByName, commitChanges
 
@@ -1851,11 +1851,11 @@ void SAL_CALL PersistentPropertySet::addProperty(
                         "caught WrappedTargetException!" );
             return;
         }
-        catch ( RuntimeException& )
+        catch (const RuntimeException&)
         {
             throw;
         }
-        catch ( Exception& )
+        catch (const Exception&)
         {
             // createInstance
 
@@ -1916,7 +1916,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
                 return;
             }
         }
-        catch ( NoSuchElementException& )
+        catch (const NoSuchElementException&)
         {
             // getByHierarchicalName
 
@@ -1962,7 +1962,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
                             nHandle = -1;
 
                     }
-                    catch ( NoSuchElementException& )
+                    catch (const NoSuchElementException&)
                     {
                         // getByHierarchicalName
 
@@ -1994,7 +1994,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
                 // Success.
                 return;
             }
-            catch ( NoSuchElementException& )
+            catch (const NoSuchElementException&)
             {
                 // removeByName
 
@@ -2002,7 +2002,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
                             "caught NoSuchElementException!" );
                 return;
             }
-            catch ( WrappedTargetException& )
+            catch (const WrappedTargetException&)
             {
                 // commitChanges
 
@@ -2113,7 +2113,7 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
                                     OSL_FAIL( "PersistentPropertySet::getPropertyValues - "
                                       "Error getting property handle!" );
                             }
-                            catch ( NoSuchElementException& )
+                            catch (const NoSuchElementException&)
                             {
                                 // getByHierarchicalName
 
@@ -2134,7 +2134,7 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
                                 //       was called with a default value
                                 //       of type void.
                             }
-                            catch ( NoSuchElementException& )
+                            catch (const NoSuchElementException&)
                             {
                                 // getByHierarchicalName
 
@@ -2158,7 +2158,7 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
                                 else
                                     rValue.State = PropertyState( nState );
                             }
-                            catch ( NoSuchElementException& )
+                            catch (const NoSuchElementException&)
                             {
                                 // getByHierarchicalName
 
@@ -2172,7 +2172,7 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
                 }
             }
         }
-        catch ( NoSuchElementException& )
+        catch (const NoSuchElementException&)
         {
             // getByHierarchicalName
         }
@@ -2271,15 +2271,15 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
                             aEvents.push_back( aEvt );
                         }
                     }
-                    catch ( IllegalArgumentException& )
+                    catch (const IllegalArgumentException&)
                     {
                         // replaceByName
                     }
-                    catch ( NoSuchElementException& )
+                    catch (const NoSuchElementException&)
                     {
                         // getByHierarchicalName, replaceByName
                     }
-                    catch ( WrappedTargetException& )
+                    catch (const WrappedTargetException&)
                     {
                         // replaceByName, commitChanges
                     }
@@ -2516,7 +2516,7 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
                                         OSL_FAIL( "PropertySetInfo_Impl::getProperties - "
                                           "Error getting property handle!" );
                                 }
-                                catch ( NoSuchElementException& )
+                                catch (const NoSuchElementException&)
                                 {
                                     // getByHierarchicalName
 
@@ -2539,7 +2539,7 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
 
                                     rProp.Type = aKeyValue.getValueType();
                                 }
-                                catch ( NoSuchElementException& )
+                                catch (const NoSuchElementException&)
                                 {
                                     // getByHierarchicalName
 
@@ -2564,7 +2564,7 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
                                         OSL_FAIL( "PropertySetInfo_Impl::getProperties - "
                                           "Error getting property attributes!" );
                                 }
-                                catch ( NoSuchElementException& )
+                                catch (const NoSuchElementException&)
                                 {
                                     // getByHierarchicalName
 
@@ -2580,7 +2580,7 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
                     return *m_pProps;
                 }
             }
-            catch ( NoSuchElementException& )
+            catch (const NoSuchElementException&)
             {
                 // getByHierarchicalName
             }
@@ -2663,7 +2663,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
             // Success.
             return aProp;
         }
-        catch ( NoSuchElementException& )
+        catch (const NoSuchElementException&)
         {
             // getByHierarchicalName
 
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index c1da9c32159c..63e73d61d460 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -344,8 +344,8 @@ SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
     try {
         aRet = pCurSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) );
     }
-    catch ( UnknownPropertyException ) {}
-    catch ( WrappedTargetException ) {}
+    catch (const UnknownPropertyException&) {}
+    catch (const WrappedTargetException&) {}
 
     long nOldCount = pCurSet->GetCount();
     sal_Bool bWasFinal = false;
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index af0089ce70a0..ffa7df8b1253 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -38,13 +38,6 @@ using ::rtl::OUString;
 
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index f68ac8037e20..dba7c7d46bf2 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1461,7 +1461,10 @@ void SortedResultSet::Initialize(
             nIndex++;
         }
     }
-    catch ( SQLException ) { OSL_FAIL( "SortedResultSet::Initialize() : Got unexpected SQLException" ); }
+    catch (const SQLException&)
+    {
+        OSL_FAIL( "SortedResultSet::Initialize() : Got unexpected SQLException" );
+    }
 
     // when we have fetched all the elements, we can create the
     // original to sorted mapping list from the s2o list
@@ -1516,8 +1519,8 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
             }
         }
     }
-    catch ( UnknownPropertyException ) {}
-    catch ( WrappedTargetException ) {}
+    catch (const UnknownPropertyException&) {}
+    catch (const WrappedTargetException&) {}
 }
 
 //-------------------------------------------------------------------------
@@ -1816,7 +1819,10 @@ void SortedResultSet::ResortModified( EventList* pList )
             }
         }
     }
-    catch ( SQLException ) { OSL_FAIL( "SortedResultSet::ResortModified() : Got unexpected SQLException" ); }
+    catch (const SQLException&)
+    {
+        OSL_FAIL( "SortedResultSet::ResortModified() : Got unexpected SQLException" );
+    }
 
     maModList.Clear();
 }
@@ -1849,7 +1855,10 @@ void SortedResultSet::ResortNew( EventList* pList )
             pList->AddEvent( ListActionType::INSERTED, nNewPos, 1 );
         }
     }
-    catch ( SQLException ) { OSL_FAIL( "SortedResultSet::ResortNew() : Got unexpected SQLException" ); }
+    catch (const SQLException&)
+    {
+        OSL_FAIL( "SortedResultSet::ResortNew() : Got unexpected SQLException" );
+    }
 }
 
 //-------------------------------------------------------------------------
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 0e8fb96b9ca9..53f789728aa0 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -268,12 +268,6 @@ static const ::cppu::ImplementationEntry s_entries [] =
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 3f22423063fd..b54864b857e2 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -75,12 +75,6 @@ namespace ucb { namespace ucp { namespace ext
 extern "C"
 {
     //------------------------------------------------------------------------------------------------------------------
-    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
-    {
-        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
     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/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 8242276ad604..c6d1191c525d 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -549,7 +549,7 @@ BaseContent::getContentType()
                     OSL_FAIL( "BaseContent::getContentType - Property value was null!" );
                 }
             }
-            catch ( sdbc::SQLException const & )
+            catch (const sdbc::SQLException&)
             {
                 OSL_FAIL( "BaseContent::getContentType - Caught SQLException!" );
             }
@@ -681,7 +681,7 @@ BaseContent::createNewContent(
 //              return Reference< XContent >();
         }
     }
-    catch ( sdbc::SQLException const & )
+    catch (const sdbc::SQLException&)
     {
         OSL_FAIL( "BaseContent::createNewContent - Caught SQLException!" );
         return Reference< XContent >();
@@ -757,7 +757,7 @@ BaseContent::getParent(
         Reference< XContent > content = m_pMyShell->m_pProvider->queryContent( Identifier );
         return Reference<XInterface>(content,UNO_QUERY);
     }
-    catch( IllegalIdentifierException )
+    catch (const IllegalIdentifierException&)
     {
         return Reference< XInterface >();
     }
@@ -979,7 +979,7 @@ BaseContent::setPropertyValues(
             {
                 endTask( nMyCommandIdentifier );
             }
-            catch( const Exception& e )
+            catch(const Exception& e)
             {
                 ret[i] <<= e;
             }
@@ -1209,7 +1209,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
             contentTypeSet = false;
 
     }
-    catch ( sdbc::SQLException const & )
+    catch (const sdbc::SQLException&)
     {
         OSL_FAIL( "BaseContent::insert - Caught SQLException!" );
         contentTypeSet = false;
diff --git a/ucb/source/ucp/file/exports2.dxp b/ucb/source/ucp/file/exports2.dxp
index 4804c8d0ae57..803f1cc74ef9 100755
--- a/ucb/source/ucp/file/exports2.dxp
+++ b/ucb/source/ucp/file/exports2.dxp
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 
 _ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index 5a49ed16dd0d..7dbdcf863f87 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -68,11 +68,11 @@ sal_Bool convert( shell* pShell,
             else
                 no_success = sal_True;
         }
-        catch ( lang::IllegalArgumentException )
+        catch (const lang::IllegalArgumentException&)
         {
             no_success = sal_True;
         }
-        catch ( script::CannotConvertException )
+        catch (const script::CannotConvertException&)
         {
             no_success = sal_True;
         }
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 93cff9c667fd..c9157d13f2af 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -134,11 +134,11 @@ XStream_impl::~XStream_impl()
     {
         closeStream();
     }
-    catch (io::IOException const &)
+    catch (const io::IOException&)
     {
         OSL_FAIL("unexpected situation");
     }
-    catch (uno::RuntimeException const &)
+    catch (const uno::RuntimeException&)
     {
         OSL_FAIL("unexpected situation");
     }
@@ -216,7 +216,7 @@ XStream_impl::readBytes(
     {
         buffer = new sal_Int8[nBytesToRead];
     }
-    catch( std::bad_alloc )
+    catch (const std::bad_alloc&)
     {
         if( m_nIsOpen ) m_aFile.close();
         throw io::BufferSizeExceededException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index d3392ac5ab18..e6f1541e872a 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -51,13 +51,6 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::container;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 0c7c0f30953f..3531740ed850 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -619,19 +619,19 @@ void SAL_CALL shell::page( sal_Int32 CommandId,
             {
                 xOutputStream->writeBytes( seq );
             }
-            catch( io::NotConnectedException )
+            catch (const io::NotConnectedException&)
             {
                 installError( CommandId,
                               TASKHANDLING_NOTCONNECTED_FOR_PAGING );
                 break;
             }
-            catch( io::BufferSizeExceededException )
+            catch (const io::BufferSizeExceededException&)
             {
                 installError( CommandId,
                               TASKHANDLING_BUFFERSIZEEXCEEDED_FOR_PAGING );
                 break;
             }
-            catch( io::IOException )
+            catch (const io::IOException&)
             {
                 installError( CommandId,
                               TASKHANDLING_IOEXCEPTION_FOR_PAGING );
@@ -655,13 +655,13 @@ void SAL_CALL shell::page( sal_Int32 CommandId,
     {
         xOutputStream->closeOutput();
     }
-    catch( io::NotConnectedException )
+    catch (const io::NotConnectedException&)
     {
     }
-    catch( io::BufferSizeExceededException )
+    catch (const io::BufferSizeExceededException&)
     {
     }
-    catch( io::IOException )
+    catch (const io::IOException&)
     {
     }
 }
@@ -888,7 +888,7 @@ shell::setv( const rtl::OUString& aUnqPath,
             {
                 it->second.xS->setPropertyValue( values[i].Name,values[i].Value );
             }
-            catch( const uno::Exception& e )
+            catch (const uno::Exception&e)
             {
                 --propChanged; // unsuccessful setting
                 ret[i] <<= e;
diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index e5bed9fc1a42..2d7bb517b857 100644
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -37,13 +37,6 @@ using namespace com::sun::star;
 using namespace ftp;
 
 //=========================================================================
-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" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk
index 9440d0cd6205..8c30a59807d9 100755
--- a/ucb/source/ucp/ftp/makefile.mk
+++ b/ucb/source/ucp/ftp/makefile.mk
@@ -75,7 +75,8 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)  \
     $(UCBHELPERLIB) \
-    $(CURLLIB)
+    $(CURLLIB) \
+    $(ZLIB3RDLIB)
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS= \
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 09596bb65d56..7093a3572a9a 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -103,12 +103,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char  **ppEnvTypeName, uno_Environment **)
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName,
     void *pServiceManager, void * )
 {
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index 3d6b32ea60c8..caa30ac9a6a1 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -144,12 +144,6 @@ ContentProvider::queryContent(
 
 //============================ shlib entry points =============================================
 
-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" 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 d82cc23fa1e8..8326e597f396 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -37,13 +37,6 @@ using namespace com::sun::star;
 using namespace hierarchy_ucp;
 
 //=========================================================================
-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" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/odma/makefile.mk b/ucb/source/ucp/odma/makefile.mk
index 4af8c7649ae5..302cf19bc9ee 100644
--- a/ucb/source/ucp/odma/makefile.mk
+++ b/ucb/source/ucp/odma/makefile.mk
@@ -93,10 +93,9 @@ DEF2DES=UCB ODMA URL converter
 
 # --- odma_lib library -----------------------------------------------
 
-SLO3FILES=$(SLO)$/odma_lib.obj
-
-LIB3TARGET=$(SLB)$/odma_lib.lib
-LIB3OBJFILES=$(SLO3FILES)
+LIB3TARGET=$(LB)/odma_lib.lib
+LIB3ARCHIV=$(LB)/libodma_lib.a
+LIB3OBJFILES=$(OBJ)$/odma_lib.obj
 
 # --- Targets ----------------------------------------------------------
 
diff --git a/ucb/source/ucp/odma/odma_main.cxx b/ucb/source/ucp/odma/odma_main.cxx
index 15b75ec4bd39..700814377a6f 100644
--- a/ucb/source/ucp/odma/odma_main.cxx
+++ b/ucb/source/ucp/odma/odma_main.cxx
@@ -47,8 +47,12 @@
 #if (defined UNX)
 void main( int argc, char * argv[] )
 #else
+#if (defined GCC)
+int _cdecl main( int argc, char * argv[] )
+#else
 void _cdecl main( int argc, char * argv[] )
 #endif
+#endif
 {
     static ::rtl::OUString sProcess(RTL_CONSTASCII_USTRINGPARAM(SOFFICE));
     if(argc > 1)
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index 96ea58396310..055c4e6e2b49 100644
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -42,13 +42,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
 //=========================================================================
-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" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 4becb1c3e63c..becde42e08f1 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -36,13 +36,6 @@
 using namespace com::sun::star;
 
 //=========================================================================
-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" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index 4fe7c0baaa7d..bb6a69ca24ea 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -40,13 +40,6 @@ using namespace com::sun::star;
 using namespace tdoc_ucp;
 
 //=========================================================================
-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" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index 14dcc4958fea..b2017e12ccbc 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -36,13 +36,6 @@
 using namespace com::sun::star;
 
 //=========================================================================
-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" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {