diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:33 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:33 +0100 |
| commit | 932fb7b958f8e7204275cb709965b30e390c76ad (patch) | |
| tree | 75f695663a97693416f8a84e140fa61805cf5bd2 /sot/source | |
| parent | bb54b94e5f48c4f6dce72f59dc6bc83f17d2c590 (diff) | |
| parent | 78f80b020fe009bc48e9e5f8b7862de51f1f8381 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
dtrans/source/win32/dtobj/XTDataObject.cxx
dtrans/source/win32/dtobj/XTDataObject.hxx
sot/source/sdstor/stgio.cxx
tools/source/debug/debug.cxx
vcl/source/gdi/jobset.cxx
vcl/unx/kde4/KDEData.cxx
vcl/unx/kde4/KDEData.hxx
vcl/unx/kde4/KDESalDisplay.cxx
vcl/unx/kde4/KDESalFrame.cxx
vcl/unx/kde4/KDESalFrame.hxx
vcl/unx/kde4/KDESalGraphics.cxx
vcl/unx/kde4/KDESalGraphics.hxx
vcl/unx/kde4/KDESalInstance.cxx
vcl/unx/kde4/KDESalInstance.hxx
vcl/unx/kde4/KDEXLib.cxx
vcl/unx/kde4/VCLKDEApplication.cxx
vcl/unx/kde4/VCLKDEApplication.hxx
Diffstat (limited to 'sot/source')
| -rw-r--r-- | sot/source/sdstor/stgio.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx index 654f456c5e10..db861fb93911 100644 --- a/sot/source/sdstor/stgio.cxx +++ b/sot/source/sdstor/stgio.cxx @@ -160,6 +160,7 @@ class EasyFat public: EasyFat( StgIo & rIo, StgStrm *pFatStream, sal_Int32 nPSize ); ~EasyFat() { delete[] pFat; delete[] pFree; } + sal_Int32 GetPageSize() { return nPageSize; } sal_Int32 Count() { return nPages; } sal_Int32 operator[]( sal_Int32 nOffset ) { return pFat[ nOffset ]; } @@ -387,5 +388,4 @@ sal_uLong StgIo::ValidateFATs() return FAT_OK; } - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file |