diff options
Diffstat (limited to 'sot')
29 files changed, 37 insertions, 47 deletions
diff --git a/sot/inc/absdev.hxx b/sot/inc/sot/absdev.hxx index d882e6fc6b14..d882e6fc6b14 100644 --- a/sot/inc/absdev.hxx +++ b/sot/inc/sot/absdev.hxx diff --git a/sot/inc/agg.hxx b/sot/inc/sot/agg.hxx index cf07f6a8faff..cf07f6a8faff 100644 --- a/sot/inc/agg.hxx +++ b/sot/inc/sot/agg.hxx diff --git a/sot/inc/clsids.hxx b/sot/inc/sot/clsids.hxx index a64df510dd07..a64df510dd07 100644 --- a/sot/inc/clsids.hxx +++ b/sot/inc/sot/clsids.hxx diff --git a/sot/inc/filelist.hxx b/sot/inc/sot/filelist.hxx index fc04e92cb3d7..fc04e92cb3d7 100644 --- a/sot/inc/filelist.hxx +++ b/sot/inc/sot/filelist.hxx diff --git a/sot/inc/stg.hxx b/sot/inc/sot/stg.hxx index b4f13b8d2660..b4f13b8d2660 100644 --- a/sot/inc/stg.hxx +++ b/sot/inc/sot/stg.hxx diff --git a/sot/inc/storinfo.hxx b/sot/inc/sot/storinfo.hxx index 5f225c26d0de..5f225c26d0de 100644 --- a/sot/inc/storinfo.hxx +++ b/sot/inc/sot/storinfo.hxx diff --git a/sot/prj/build.lst b/sot/prj/build.lst index a5ebff311e9c..9d6e785898a5 100644 --- a/sot/prj/build.lst +++ b/sot/prj/build.lst @@ -1,4 +1,4 @@ -to sot : tools ucbhelper unotools NULL +to sot : LIBXSLT:libxslt tools ucbhelper unotools NULL to sot usr1 - all sot_mkout NULL to sot\inc nmake - all sot_inc NULL to sot\prj get - all sot_prj NULL diff --git a/sot/prj/d.lst b/sot/prj/d.lst index 10bed8c9fe5e..ec3166bbea1a 100644 --- a/sot/prj/d.lst +++ b/sot/prj/d.lst @@ -1,20 +1,7 @@ mkdir: %_DEST%\inc%_EXT%\sot -..\inc\clsids.hxx %_DEST%\inc%_EXT%\sot\clsids.hxx -..\inc\sot\object.hxx %_DEST%\inc%_EXT%\sot\object.hxx -..\inc\sot\factory.hxx %_DEST%\inc%_EXT%\sot\factory.hxx -..\inc\sot\sotdata.hxx %_DEST%\inc%_EXT%\sot\sotdata.hxx -..\inc\agg.hxx %_DEST%\inc%_EXT%\sot\agg.hxx -..\inc\sot\storage.hxx %_DEST%\inc%_EXT%\sot\storage.hxx -..\inc\storinfo.hxx %_DEST%\inc%_EXT%\sot\storinfo.hxx -..\inc\sot\sotref.hxx %_DEST%\inc%_EXT%\sot\sotref.hxx -..\inc\sot\exchange.hxx %_DEST%\inc%_EXT%\sot\exchange.hxx -..\inc\sot\formats.hxx %_DEST%\inc%_EXT%\sot\formats.hxx -..\inc\absdev.hxx %_DEST%\inc%_EXT%\sot\absdev.hxx -..\inc\stg.hxx %_DEST%\inc%_EXT%\sot\stg.hxx -..\inc\filelist.hxx %_DEST%\inc%_EXT%\sot\filelist.hxx -..\inc\sot\sotdllapi.h %_DEST%\inc%_EXT%\sot\sotdllapi.h +..\inc\sot/*.hxx %_DEST%\inc%_EXT%\sot\*.hxx +..\inc\sot\*.h %_DEST%\inc%_EXT%\sot\*.h -..\%__SRC%\inc\sdintern.hxx %_DEST%\inc%_EXT%\sot\sdintern.hxx ..\%__SRC%\lib\sot.lib %_DEST%\lib%_EXT%\sot.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 2b51162df3a0..ec45c757c369 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -37,7 +37,7 @@ #include <sot/sotdata.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include <clsids.hxx> +#include <sot/clsids.hxx> #include <rtl/instance.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/datatransfer/DataFlavor.hpp> diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 5c4757188f38..3b71382906ca 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -36,7 +36,7 @@ #include <tools/string.hxx> #include <sot/object.hxx> #include <sot/sotdata.hxx> -#include <clsids.hxx> +#include <sot/clsids.hxx> #include <rtl/instance.hxx> #include <com/sun/star/datatransfer/DataFlavor.hpp> diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 80828e596538..5be0b01e8de6 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -33,7 +33,7 @@ #include<tools/string.hxx> #include<tools/rtti.hxx> #include<sot/exchange.hxx> -#include<filelist.hxx> +#include<sot/filelist.hxx> #include <osl/thread.h> TYPEINIT1_AUTOFACTORY( FileList, SvDataCopyStream ); diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 10b6958ca4ac..81deb8e90112 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -34,8 +34,8 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include "filelist.hxx" -#include "clsids.hxx" +#include "sot/filelist.hxx" +#include "sot/clsids.hxx" #include <tools/globname.hxx> #include <com/sun/star/datatransfer/DataFlavor.hpp> diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index bdd3862d8d52..5ac3f7f45d87 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -33,7 +33,7 @@ #include <tools/debug.hxx> #include <sot/object.hxx> #include <sot/factory.hxx> -#include <agg.hxx> +#include <sot/agg.hxx> /************** class SvAggregateMemberList *****************************/ /************************************************************************/ diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 5adfb735d47b..f1f51f20343b 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 6a0d1117f934..d0f0b0332482 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 0b1cf2582501..080a4aba5268 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 @@ sal_Bool StgDirStrm::Store() void* StgDirStrm::GetEntry( sal_Int32 n, sal_Bool bDirty ) { + if( n < 0 ) + return NULL; + n *= STGENTRY_SIZE; - if( n >= nSize ) + if( n < 0 && n >= nSize ) return NULL; return GetPtr( n, sal_True, bDirty ); } diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 917a4c2adb61..b781e4051c3d 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 8b7d547ca416..9730813bb0ff 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 6e504130be5a..54dbe1d43366 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" diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index e3d02bc597ab..250e0bc4d12b 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 b8c569c81ded..5448bd3b6f9c 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 7310b44676dc..a47695fc14d7 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -34,7 +34,7 @@ #include <tools/tempfile.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/storage.cxx b/sot/source/sdstor/storage.cxx index 9b5d3a95b92f..f912d76cdaf6 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 f326025fd0ac..0958362f64a9 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 ede41ec3aec9..ccdd42bb04bd 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 aa84ed0cf87c..00a905125ff6 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; diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 1780e45c5ed6..45baf9eed4c5 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -39,7 +39,7 @@ #include <cppuhelper/exc_hlp.hxx> -#include <storinfo.hxx> +#include <sot/storinfo.hxx> #include "xolesimplestorage.hxx" diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx index c9f1b5c68b0a..18bd6ee64f9e 100644 --- a/sot/source/unoolestorage/xolesimplestorage.hxx +++ b/sot/source/unoolestorage/xolesimplestorage.hxx @@ -43,7 +43,7 @@ #include <osl/mutex.hxx> -#include <stg.hxx> +#include <sot/stg.hxx> class OLESimpleStorage : public ::cppu::WeakImplHelper3 diff --git a/sot/util/makefile.mk b/sot/util/makefile.mk index 72d17db189be..453dbddc5857 100644 --- a/sot/util/makefile.mk +++ b/sot/util/makefile.mk @@ -57,16 +57,16 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(PRJ)$/inc$/absdev.hxx \ - $(PRJ)$/inc$/agg.hxx \ + $(PRJ)$/inc$/sot/absdev.hxx \ + $(PRJ)$/inc$/sot/agg.hxx \ $(PRJ)$/inc$/sot$/exchange.hxx \ $(PRJ)$/inc$/sot$/factory.hxx \ $(PRJ)$/inc$/sot$/object.hxx \ $(PRJ)$/inc$/sot$/sotdata.hxx \ $(PRJ)$/inc$/sot$/sotref.hxx \ - $(PRJ)$/inc$/stg.hxx \ + $(PRJ)$/inc$/sot/stg.hxx \ $(PRJ)$/inc$/sot$/storage.hxx \ - $(PRJ)$/inc$/storinfo.hxx + $(PRJ)$/inc$/sot/storinfo.hxx DEFLIB1NAME =$(TARGET) DEF1DES =StarObjectsTools |