CWS-TOOLING: integrate CWS mba30fixes02

4 files changed, 4 insertions, 107 deletions

diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index f445125e5a..9b00760d97 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 4f601d9f4e..dce603e7c5 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
diff --git a/framework/source/inc/constant/filter.hxx b/framework/source/inc/constant/filter.hxx
index 1eb58e2906..80696a2279 100644
--- a/framework/source/inc/constant/filter.hxx
+++ b/framework/source/inc/constant/filter.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: filter.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -121,43 +121,6 @@ struct Filter
         //FREE! ... 0x00800000L
         static const sal_Int32       FLAGVALUE_PREFERED;
 
-        //_______________________________________________
-
-        /** @short  checks if the given flag mask is set.
-
-            @param  nField
-                    the flag field, which should be checked.
-
-            @param  nMask
-                    these flags should be checked against the field.
-
-            @return <TRUE/> if mask match to the given flag field.
-         */
-        sal_Bool areFlagsSet(sal_Int32 nField, sal_Int32 nMask);
-
-        //_______________________________________________
-
-        /** @short  set the specified flags on the given field.
-
-            @param  nField
-                    the flag field, which should be changed.
-
-            @param  nMask
-                    this flags field should be set on the field.
-         */
-        void addFlags(sal_Int32& nField, sal_Int32 nFlags);
-
-        //_______________________________________________
-
-        /** @short  remove the specified flags from the given field.
-
-            @param  nField
-                    the flag field, which should be changed.
-
-            @param  nMask
-                    this flags field should be removed from the field.
-         */
-        void removeFlags(sal_Int32& nField, sal_Int32 nFlags);
 };
 
     } // namespace constant
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index 3f24a47b8d..acb2311367 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: targethelper.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.82.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -81,21 +81,6 @@ class TargetHelper
 
         //___________________________________________
 
-        /** @short  it checks, if the given target name is a well known special
-                    one anyway and return a suitable enum value.
-
-            @note   An empty target is similar to "_self"!
-
-            @param  sTarget
-                    the unknown target name, which should be checked.
-
-            @return Returns a suitable enum value, which classify the
-                    given target name.
-         */
-        static ESpecialTarget classifyTarget(const ::rtl::OUString& sTarget);
-
-        //___________________________________________
-
         /** @short  it checks the given unknown target name,
                     if it's the expected special one.