#i38373#, #i38471#, #i38386# forget storages on reload

3 files changed, 43 insertions, 6 deletions

diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
index 4e8fafc2d8..8ad2590e4a 100644
--- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: documentacceleratorconfiguration.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-20 10:07:15 $
+ *  last change: $Author: as $ $Date: 2004-12-07 13:18:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,6 +92,10 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #endif
 
+#ifndef _DRAFTS_COM_SUN_STAR_UI_XUICONFIGURATIONSTORAGE_HPP_
+#include <drafts/com/sun/star/ui/XUIConfigurationStorage.hpp>
+#endif
+
 //__________________________________________
 // other includes
 
@@ -109,6 +113,7 @@ namespace framework
 class DocumentAcceleratorConfiguration : public AcceleratorConfiguration
                                        , public css::lang::XServiceInfo
                                        , public css::lang::XInitialization
+                                       , public dcss::ui::XUIConfigurationStorage
 {
     //______________________________________
     // member
@@ -143,6 +148,13 @@ class DocumentAcceleratorConfiguration : public AcceleratorConfiguration
         virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
             throw(css::uno::Exception       ,
                   css::uno::RuntimeException);
+                  
+        // XUIConfigurationStorage                  
+        virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
+            throw(css::uno::RuntimeException);
+            
+        virtual sal_Bool SAL_CALL hasStorage()
+            throw(css::uno::RuntimeException);
          
     //______________________________________
     // helper
@@ -152,6 +164,11 @@ class DocumentAcceleratorConfiguration : public AcceleratorConfiguration
         //----------------------------------
         /** read all data into the cache. */
         void impl_ts_fillCache();
+        
+        //----------------------------------
+        /** forget all currently cached data AND(!)
+            forget all currently used storages. */
+        void impl_ts_clearCache();
 };
 
 } // namespace framework
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index e6573be39f..d1406a676e 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: presethandler.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-11-16 14:53:27 $
+ *  last change: $Author: as $ $Date: 2004-12-07 13:18:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -313,6 +313,10 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
         virtual ~PresetHandler();
         
         //---------------------------------------
+        /** @short  free all currently cache(!) storages. */
+        void forgetCachedStorages();
+        
+        //---------------------------------------
         /** @short  return access to the internaly used and cached root storage.
         
             @descr  These root storages are the base of all further opened
@@ -570,6 +574,17 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                                                                                                sal_Int32             eMode  ,
                                                                                                sal_Bool              bShare ,
                                                                                          const ::comphelper::Locale& aLocale);
+                                                                                         
+        //---------------------------------------
+        /** @short  returns the names of all sub storages of specified storage.
+        
+            @param  xFolder
+                    the base storage for this operation.
+                    
+            @return [vector< string >]
+                    a list of folder names.
+         */
+        ::std::vector< ::rtl::OUString > impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder);
 };
 
 } // namespace framework
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 7d59132a88..8092aef0e0 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: storageholder.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-20 10:08:14 $
+ *  last change: $Author: as $ $Date: 2004-12-07 13:18:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -179,6 +179,11 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         //---------------------------------------
         /** @short  TODO
          */
+        virtual void forgetCachedStorages();
+        
+        //---------------------------------------
+        /** @short  TODO
+         */
         virtual void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot);
         
         //---------------------------------------