diff options
-rw-r--r-- | sot/inc/sot/sotdata.hxx | 3 | ||||
-rw-r--r-- | sot/source/base/factory.cxx | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sot/inc/sot/sotdata.hxx b/sot/inc/sot/sotdata.hxx index ec8a3563c5c8..22cfb86c116b 100644 --- a/sot/inc/sot/sotdata.hxx +++ b/sot/inc/sot/sotdata.hxx @@ -51,9 +51,6 @@ struct SotData_Impl sal_uInt32 nSvObjCount; std::list<SotObject*> aObjectList; SotFactoryList * pFactoryList; - SotFactory * pSotObjectFactory; - SotFactory * pSotStorageStreamFactory; - SotFactory * pSotStorageFactory; tDataFlavorList* pDataFlavorList; SotData_Impl(); }; diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index ba6132dc37f5..15ac9b97d825 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -48,18 +48,17 @@ SotData_Impl::SotData_Impl() : nSvObjCount( 0 ) , pFactoryList( NULL ) - , pSotObjectFactory( NULL ) - , pSotStorageStreamFactory( NULL ) - , pSotStorageFactory( NULL ) , pDataFlavorList( NULL ) { } + /************************************************************************* |* SOTDATA() |* |* Beschreibung *************************************************************************/ namespace { struct ImplData : public rtl::Static<SotData_Impl, ImplData> {}; } + SotData_Impl * SOTDATA() { return &ImplData::get(); |