Update from master repository (DEV300_m95).

4 files changed, 6 insertions, 38 deletions

diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index f093dc60cbe7..039a29fd2683 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -936,8 +936,11 @@ BOOL StgDirStrm::Store()
 
 void* StgDirStrm::GetEntry( INT32 n, BOOL bDirty )
 {
+    if( n < 0 )
+        return NULL;
+
     n *= STGENTRY_SIZE;
-    if( n >= nSize )
+    if( n < 0 && n >= nSize )
         return NULL;
     return GetPtr( n, TRUE, bDirty );
 }
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 2c18429b9d64..545a5eba9c74 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -159,6 +159,7 @@ class EasyFat
 public:
     EasyFat( StgIo & rIo, StgStrm *pFatStream, INT32 nPSize );
     ~EasyFat() { delete[] pFat; delete[] pFree; }
+
     INT32 GetPageSize() { return nPageSize; }
     INT32 Count() { return nPages; }
     INT32 operator[]( INT32 nOffset ) { return pFat[ nOffset ]; }
@@ -385,5 +386,3 @@ ULONG StgIo::ValidateFATs()
 //  DBG_ERROR("Validiere nicht (kein FileStorage)");
     return FAT_OK;
 }
-
-
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 07711133bf4b..dd6ba6202bbe 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -41,13 +41,7 @@
 #include "stgdir.hxx"
 #include "stgio.hxx"
 
-#if defined(W31)
-        #include <tools/svwin.h>
-    #define memcpy hmemcpy
-    #define __HUGE _huge
-#else
-    #define __HUGE
-#endif
+#define __HUGE
 
 ///////////////////////////// class StgFAT ///////////////////////////////
 
diff --git a/sot/source/unoolestorage/register.cxx b/sot/source/unoolestorage/register.cxx
index 00326333546d..083a4d585ca1 100644
--- a/sot/source/unoolestorage/register.cxx
+++ b/sot/source/unoolestorage/register.cxx
@@ -69,33 +69,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp
     return pRet;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
-
-            uno::Reference< registry::XRegistryKey >  xNewKey;
-
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                                        OLESimpleStorage::impl_staticGetImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-
-            const uno::Sequence< ::rtl::OUString > &rServices = OLESimpleStorage::impl_staticGetSupportedServiceNames();
-            for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
-                xNewKey->createKey( rServices.getConstArray()[ind] );
-
-            return sal_True;
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-
 } // extern "C"