CWS-TOOLING: integrate CWS mba30fixes02

2 files changed, 2 insertions, 53 deletions

diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index d0a45bc5fbe8..a7c266db52b6 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: presethandler.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -356,46 +356,6 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                                const css::uno::Reference< css::embed::XStorage >& xDocumentRoot ,
                                const ::comphelper::Locale&                        aLocale       = ::comphelper::Locale(::comphelper::Locale::X_NOTRANSLATE()));
 
-        //---------------------------------------
-        /** @short  return a list of all presets, which are available
-                    in the share layer of the current configuration set.
-
-            @descr  Note: The returned strings are ALIAS names of the presets.
-                    Because there is no special configuration, which map
-                    ALIAS to real PRESET names, we strip the extension
-                    of every file. Further all PRESET and ALIAS names
-                    are used case insensitive!
-
-            @return A list of all current available presets.
-         */
-        css::uno::Sequence< ::rtl::OUString > getAllPresetNames() const;
-
-        //---------------------------------------
-        /** @short  return a list of all targets, which are available
-                    in the user layer of the current configuration set.
-
-            @descr  Note: The returned strings are ALIAS names of the targets.
-                    Because there is no special configuration, which map
-                    ALIAS to real TARGET names, we strip the extension
-                    of every file. Further all TARGET and ALIAS names
-                    are used case insensitive!
-
-            @return A list of all current available targets.
-         */
-        css::uno::Sequence< ::rtl::OUString > getAllTargetNames() const;
-
-        //---------------------------------------
-        /** @short  can be used to know, if a required item exists.
-
-            @descr  Of course this operation can work only, if connectToResource()
-                    was called before.
-
-            @param  sPreset/sTarget
-                    specify the searched item. (ALIAS name!)
-
-            @return TRUE if the requested item exists.
-         */
-        sal_Bool existsPreset(const ::rtl::OUString& sPreset) const;
         sal_Bool existsTarget(const ::rtl::OUString& sTarget) const;
 
         //---------------------------------------
@@ -463,10 +423,6 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                                                                  sal_Bool         bCreateIfMissing);
 
         //---------------------------------------
-        /** TODO */
-        void removeTarget(const ::rtl::OUString& sTarget);
-
-        //---------------------------------------
         /** @short  do anything which is neccessary to flush all changes
                     back to disk.
 
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 285665bbd28e..d8faf0e7eaf0 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: storageholder.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -209,13 +209,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         virtual void operator=(const StorageHolder& rCopy);
 
         //---------------------------------------
-        /** @short  TODO
-         */
-        static css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const ::rtl::OUString&                                        sFolder  ,
-                                                                                          const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR    ,
-                                                                                                sal_Bool                                                bReadOnly);
-
-        //---------------------------------------
         /** @short  opens a sub element of the specified base storage.
 
             @descr  First this method try to open the requested sub element