13 files changed, 24 insertions, 26 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 1c749aa05cb8..c057b2d0aac0 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sot.hxx"
 
-#include <storinfo.hxx>
+#include <sot/storinfo.hxx>
 #include <osl/file.hxx>
 #include <tools/tempfile.hxx>
 #include <tools/ownlist.hxx>
@@ -42,7 +42,7 @@
 #include <tools/pstm.hxx>
 #include <tools/debug.hxx>
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 88a8187ee9dd..f4461383c0ba 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -41,7 +41,7 @@
 #include <osl/endian.h>
 #include <tools/string.hxx>
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index f093dc60cbe7..8c553d0f8a32 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -30,7 +30,7 @@
 
 #include <string.h>     // memcpy()
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
@@ -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/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 46d7f1803140..b140c7fb27e2 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -32,7 +32,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <unotools/charclass.hxx>
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 7a5b7bc52b26..951d3503adbc 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -35,7 +35,7 @@
 #include <tools/solar.h>
 #endif
 
-#include <stg.hxx>
+#include <sot/stg.hxx>
 
 class StgIo;
 class SvStream;
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 2c18429b9d64..723dea4d4b00 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sot.hxx"
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
@@ -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 ]; }
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 148f1e87585c..0bb5887eed76 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -31,7 +31,7 @@
 #include "rtl/string.h"
 #include "rtl/string.h"
 #include "stgole.hxx"
-#include "storinfo.hxx"     // Read/WriteClipboardFormat()
+#include "sot/storinfo.hxx"     // Read/WriteClipboardFormat()
 
 #include <tools/debug.hxx>
 #if defined(_MSC_VER) && (_MSC_VER>=1400)
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index 346f21035f06..a9eebe1aae68 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -30,7 +30,7 @@
 
 #include <string.h> // memset()
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 
 class StgInternalStream : public SvStream
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 07711133bf4b..840f2cf2bba8 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -34,20 +34,14 @@
 #include <tools/tempfile.hxx>
 #include <tools/debug.hxx>
 
-#include "stg.hxx"
+#include "sot/stg.hxx"
 #include "stgelem.hxx"
 #include "stgcache.hxx"
 #include "stgstrms.hxx"
 #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/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 136abb29a98e..e09c5fc864fc 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -35,8 +35,8 @@
 
 #include <rtl/digest.h>
 #include <osl/file.hxx>
-#include <stg.hxx>
-#include <storinfo.hxx>
+#include <sot/stg.hxx>
+#include <sot/storinfo.hxx>
 #include <sot/storage.hxx>
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index 2aaaadd5a151..f912dc6fc83f 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -28,8 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sot.hxx"
 
-#include <stg.hxx>
-#include <storinfo.hxx>
+#include <sot/stg.hxx>
+#include <sot/storinfo.hxx>
 #include <sot/exchange.hxx>
 
 
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index ea3b656272db..4f265490a05e 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -66,12 +66,12 @@
 #include <cppuhelper/implbase2.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 
-#include "stg.hxx"
-#include "storinfo.hxx"
+#include "sot/stg.hxx"
+#include "sot/storinfo.hxx"
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include "clsids.hxx"
+#include "sot/clsids.hxx"
 
 #include "unostorageholder.hxx"
 
diff --git a/sot/source/sdstor/unostorageholder.cxx b/sot/source/sdstor/unostorageholder.cxx
index 55c205557648..6224925c1820 100644
--- a/sot/source/sdstor/unostorageholder.cxx
+++ b/sot/source/sdstor/unostorageholder.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include "unostorageholder.hxx"
-#include <storinfo.hxx>
+#include <sot/storinfo.hxx>
 
 
 using namespace ::com::sun::star;