diff options
Diffstat (limited to 'include/sot')
-rw-r--r-- | include/sot/storage.hxx | 6 | ||||
-rw-r--r-- | include/sot/storinfo.hxx | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 3ce2e978fb6a..3c6f46ed8f5a 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -47,7 +47,7 @@ template<> struct typed_flags<StorageMode>: is_typed_flags<StorageMode, 0xC4> } -class SvStorage; +class SotStorage; enum class SotClipboardFormatId : sal_uLong; @@ -106,7 +106,7 @@ class UNOStorageHolder; class SOT_DLLPUBLIC SotStorage : virtual public SotObject { friend class SotStorageStream; -friend class SvStorage; +friend class SotStorage; BaseStorage * m_pOwnStg; // target storage SvStream * m_pStorStm; // only for SDSTORAGES @@ -219,8 +219,6 @@ public: typedef tools::SvRef<SotStorage> SotStorageRef; #endif -#define SvStorage SotStorage - #endif // _SVSTOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx index 4820bfcb2635..1793a68a7239 100644 --- a/include/sot/storinfo.hxx +++ b/include/sot/storinfo.hxx @@ -29,14 +29,14 @@ class StgDirEntry; class SvStorageInfo { -friend class SvStorage; +friend class SotStorage; OUString aName; SvGlobalName aClassName; sal_uLong nSize; bool bStream; bool bStorage; - SvStorageInfo(){}; // Fuer SvStorage + SvStorageInfo(){}; // Fuer SotStorage public: SvStorageInfo( const StgDirEntry& ); SvStorageInfo( const OUString& rName, sal_uLong nSz, bool bIsStorage ) |