From dbcad280a8db68d2a05e625571177c642b3db271 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Thu, 7 Mar 2013 01:40:12 -0500
Subject: Renamed the method to something more appropriate...

Change-Id: I4a0a6ab0998f41ce238d0570fba2133b79c8f19e
---
 filter/source/config/cache/typedetection.cxx |  4 ++--
 filter/source/config/cache/typedetection.hxx | 29 +++++-----------------------
 2 files changed, 7 insertions(+), 26 deletions(-)

(limited to 'filter/source/config/cache')

diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 367797ecbe2e..3e4c224b2a11 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -400,7 +400,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types)
     }
 
     FlatDetection lFlatTypes;
-    impl_getPreselection(aURL, stlDescriptor, lFlatTypes);
+    impl_getAllFormatTypes(aURL, stlDescriptor, lFlatTypes);
 
     aLock.clear();
     // <- SAFE ----------------------------------
@@ -790,7 +790,7 @@ OUString TypeDetection::impl_getTypeFromFilter(const OUString& rFilterName)
     return aType;
 }
 
-void TypeDetection::impl_getPreselection(
+void TypeDetection::impl_getAllFormatTypes(
     const util::URL& aParsedURL, comphelper::MediaDescriptor& rDescriptor, FlatDetection& rFlatTypes)
 {
     rFlatTypes.clear();
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index 3650842c35dc..f1dc34886fc8 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -73,31 +73,12 @@ private:
 
     OUString impl_getTypeFromFilter(const OUString& rFilterName);
 
-    /** @short      check if a filter or a type was preselected inside the given
-                    MediaDescriptor and validate this information.
-
-        @descr      Only in case the preselected filter exists and its type registration
-                    seems to be usefully, it would be used realy as valid type detection
-                    result. This method doesnt make any deep detection here. It checks only
-                    if the preselection match to the URL by an URLPattern.
-                    This information has to be added to the given rFlatTypes list too.
-                    The outside code can use it to supress a deep detection then in general.
-                    Because pattern are defined as non detectable at all!
-
-        @param      pDescriptor
-                    provides any easy-to-use stl interface to the MediaDescriptor.
-                    Note : Its content will be adapted to returned result of this method.
-                    Means: The type/filter entries of it will be actualized or removed.
-
-        @param      rFlatTypes
-                    the preselected type (or the registered type of a preselected filter)
-                    will be added here as first(!) element. Further we have to provide the
-                    information, if this type match to the given URL by its URLPattern
-                    registration.
+    /**
+     * Get all format types that we handle.
      */
-    void impl_getPreselection(const css::util::URL&                aParsedURL ,
-                                    ::comphelper::MediaDescriptor& rDescriptor,
-                                    FlatDetection&                 rFlatTypes );
+    void impl_getAllFormatTypes(
+        const com::sun::star::util::URL& aParsedURL, comphelper::MediaDescriptor& rDescriptor,
+        FlatDetection& rFlatTypes);
 
     //---------------------------------------
 
-- 
cgit