diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-01-04 22:27:23 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2016-01-05 20:41:12 +0100 |
| commit | 3b7150c0ab5ca40f88ab8c3b914d601501cbf4e7 (patch) | |
| tree | 3ecd1d8081ce7cf4600038ad35d68c47493a66a0 /include/sot | |
| parent | 5b22663e373f2137c93adcdd2c31c54da2fba663 (diff) | |
SotFactory is in fact not used: remove + cleanup
Also SotData_Impl is used only in exchange.cxx now. Move there.
Change-Id: I548095c2226d92aea4193bb1a3671e2381996435
Diffstat (limited to 'include/sot')
| -rw-r--r-- | include/sot/object.hxx | 6 | ||||
| -rw-r--r-- | include/sot/storage.hxx | 19 |
2 files changed, 0 insertions, 25 deletions
diff --git a/include/sot/object.hxx b/include/sot/object.hxx index b6328efa681b..277f715f6e68 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -25,11 +25,8 @@ #include <tools/ref.hxx> #include <sot/sotdllapi.h> -class SotFactory; - class SOT_DLLPUBLIC SotObject : virtual public SvRefBase { -friend class SotFactory; sal_uInt16 nOwnerLockCount; bool bOwner; bool bInClose; // TRUE, in DoClose @@ -41,9 +38,6 @@ protected: public: SotObject(); - static SotFactory * ClassFactory(); - virtual void * Cast( const SotFactory * ); - bool Owner() const { return bOwner; } sal_uInt16 GetOwnerLockCount() const { return nOwnerLockCount; } diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index de6e0c7c27e3..3e431a34280b 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -22,8 +22,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> - -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <sot/object.hxx> #include <tools/stream.hxx> @@ -31,13 +29,8 @@ #include <sot/storinfo.hxx> #include <sot/sotdllapi.h> -class SotFactory; -class SotStorage; - enum class SotClipboardFormatId : sal_uLong; -/************************************************************************* -*************************************************************************/ class SotStorage; class BaseStorageStream; class SOT_DLLPUBLIC SotStorageStream : virtual public SotObject, public SvStream @@ -56,9 +49,6 @@ public: SotStorageStream( BaseStorageStream *pStm ); SotStorageStream(); - static SotFactory * ClassFactory(); - virtual void * Cast( const SotFactory * ) override; - virtual void ResetError() override; virtual void SetSize( sal_uInt64 nNewSize ) override; @@ -69,13 +59,7 @@ public: virtual sal_uInt64 remainingSize() override; }; -namespace ucbhelper -{ - class Content; -} - class BaseStorage; -class UNOStorageHolder; class SOT_DLLPUBLIC SotStorage : virtual public SotObject { friend class SotStorageStream; @@ -104,9 +88,6 @@ public: SotStorage( SvStream * pStm, bool bDelete ); SotStorage(); - static SotFactory * ClassFactory(); - virtual void * Cast( const SotFactory * ) override; - SvMemoryStream * CreateMemoryStream(); static bool IsStorageFile( const OUString & rFileName ); |