Simplify type detectors

Change-Id: Ic731c1c4c76d8d6779868d7e3e4c02cb3cadc844
Reviewed-on: https://gerrit.libreoffice.org/9222
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>

2 files changed, 59 insertions, 460 deletions

diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 264a45737955..272602378e87 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -19,16 +19,13 @@ $(eval $(call gb_Library_use_external,sdd,boost_headers))
 $(eval $(call gb_Library_use_sdk_api,sdd))
 
 $(eval $(call gb_Library_use_libraries,sdd,\
+    comphelper \
     cppu \
     cppuhelper \
     sal \
     sfx \
     sot \
-    svl \
-    svt \
-    svxcore \
     tl \
-    ucbhelper \
     utl \
     vcl \
 	$(gb_UWINAPI) \
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 706bd8aba0e0..1c15d23d77e8 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -17,83 +17,29 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "sddetect.hxx"
 
-#include <framework/interaction.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/ucb/InteractiveAppException.hpp>
-#include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/packages/zip/ZipIOException.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <ucbhelper/simpleinteractionrequest.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <rtl/ustring.h>
-#include <rtl/logfile.hxx>
-#include <svl/itemset.hxx>
-#include <vcl/window.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <tools/urlobj.hxx>
-#include <osl/mutex.hxx>
-#include <svtools/sfxecode.hxx>
-#include <svtools/ehdl.hxx>
-#include <sot/storinfo.hxx>
-#include <vcl/svapp.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <sfx2/request.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <sfx2/brokenpackageint.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <sot/storage.hxx>
-#include <unotools/moduleoptions.hxx>
-
-#include "strmname.h"
+#include <unotools/mediadescriptor.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::ucb;
-
-namespace {
-
-bool isZipStorageType(const OUString& rTypeName)
-{
-    if (rTypeName == "impress8" || rTypeName == "impress8_template")
-        return true;
-
-    if (rTypeName == "draw8" || rTypeName == "draw8_template")
-        return true;
-
-    if (rTypeName == "impress_StarOffice_XML_Impress" || rTypeName == "impress_StarOffice_XML_Impress_Template")
-        return true;
-
-    if (rTypeName == "draw_StarOffice_XML_Draw" || rTypeName == "draw_StarOffice_XML_Draw_Template")
-        return true;
-
-    return false;
-}
-
-}
+using utl::MediaDescriptor;
 
 SdFilterDetect::SdFilterDetect( const Reference < XMultiServiceFactory >&  )
 {
@@ -105,423 +51,79 @@ SdFilterDetect::~SdFilterDetect()
 
 OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDescriptor ) throw( RuntimeException, std::exception )
 {
-    Reference< XInputStream > xStream;
-    Reference< XContent > xContent;
-    Reference< XInteractionHandler > xInteraction;
-    OUString aURL;
-    OUString sTemp;
-    OUString aTypeName;            // a name describing the type (from MediaDescriptor, usually from flat detection)
-    OUString aPreselectedFilterName;      // a name describing the filter to use (from MediaDescriptor, usually from UI action)
-
-    OUString aDocumentTitle; // interesting only if set in this method
-
-    // opening as template is done when a parameter tells to do so and a template filter can be detected
-    // (otherwise no valid filter would be found) or if the detected filter is a template filter and
-    // there is no parameter that forbids to open as template
-    bool bOpenAsTemplate = false;
-    bool bWasReadOnly = false, bReadOnly = false;
+    MediaDescriptor aMediaDesc( lDescriptor );
+    OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() );
+    uno::Reference< io::XInputStream > xInStream ( aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY );
+    if ( !xInStream.is() )
+        return OUString();
 
-    bool bRepairPackage = false;
-    bool bRepairAllowed = false;
-    bool bDeepDetection = false;
+    SfxMedium aMedium;
+    aMedium.UseInteractionHandler( false );
+    aMedium.setStreamToLoadFrom( xInStream, true );
 
-    // now some parameters that can already be in the array, but may be overwritten or new inserted here
-    // remember their indices in the case new values must be added to the array
-    sal_Int32 nPropertyCount = lDescriptor.getLength();
-    sal_Int32 nIndexOfInputStream = -1;
-    sal_Int32 nIndexOfContent = -1;
-    sal_Int32 nIndexOfReadOnlyFlag = -1;
-    sal_Int32 nIndexOfTemplateFlag = -1;
-    sal_Int32 nIndexOfDocumentTitle = -1;
+    SvStream *pInStrm = aMedium.GetInStream();
+    if ( !pInStrm || pInStrm->GetError() )
+        return OUString();
 
-    for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
+    if ( aTypeName.startsWith( "impress_MS_PowerPoint_97" ) )
     {
-        // extract properties
-        if ( lDescriptor[nProperty].Name == "URL" )
-        {
-            lDescriptor[nProperty].Value >>= sTemp;
-            aURL = sTemp;
-        }
-        else if( aURL.isEmpty() && lDescriptor[nProperty].Name == "FileName" )
-        {
-            lDescriptor[nProperty].Value >>= sTemp;
-            aURL = sTemp;
-        }
-        else if ( lDescriptor[nProperty].Name == "TypeName" )
-        {
-            lDescriptor[nProperty].Value >>= sTemp;
-            aTypeName = sTemp;
-        }
-        else if ( lDescriptor[nProperty].Name == "FilterName" )
-        {
-            lDescriptor[nProperty].Value >>= sTemp;
-            aPreselectedFilterName = sTemp;
-        }
-        else if ( lDescriptor[nProperty].Name == "InputStream" )
-            nIndexOfInputStream = nProperty;
-        else if ( lDescriptor[nProperty].Name == "ReadOnly" )
-            nIndexOfReadOnlyFlag = nProperty;
-        else if ( lDescriptor[nProperty].Name == "UCBContent" )
-            nIndexOfContent = nProperty;
-        else if ( lDescriptor[nProperty].Name == "AsTemplate" )
-        {
-            lDescriptor[nProperty].Value >>= bOpenAsTemplate;
-            nIndexOfTemplateFlag = nProperty;
-        }
-        else if ( lDescriptor[nProperty].Name == "InteractionHandler" )
-            lDescriptor[nProperty].Value >>= xInteraction;
-        else if ( lDescriptor[nProperty].Name == "RepairPackage" )
-            lDescriptor[nProperty].Value >>= bRepairPackage;
-        else if ( lDescriptor[nProperty].Name == "DocumentTitle" )
-            nIndexOfDocumentTitle = nProperty;
-        else if (lDescriptor[nProperty].Name == "DeepDetection")
-            bDeepDetection = lDescriptor[nProperty].Value.get<sal_Bool>();
-    }
-
-    // can't check the type for external filters, so set the "dont" flag accordingly
-    SolarMutexGuard aGuard;
-    //SfxFilterFlags nMust = SFX_FILTER_IMPORT, nDont = SFX_FILTER_NOTINSTALLED;
-
-    SfxApplication* pApp = SFX_APP();
-    SfxAllItemSet *pSet = new SfxAllItemSet( pApp->GetPool() );
-    TransformParameters( SID_OPENDOC, lDescriptor, *pSet );
-    SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, false );
-
-    bWasReadOnly = pItem && pItem->GetValue();
-
-    const SfxFilter* pFilter = 0;
-    OUString aPrefix = "private:factory/";
-    if( aURL.startsWith( aPrefix ) )
-    {
-        if( SvtModuleOptions().IsImpress() )
-        {
-            OUString aPattern( aPrefix );
-            aPattern += "simpress";
-            if ( aURL.startsWith( aPattern ) )
-                pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
-        }
-
-        if( !pFilter && SvtModuleOptions().IsDraw() )
-        {
-            OUString aPattern( aPrefix );
-            aPattern += "sdraw";
-            if ( aURL.startsWith( aPattern ) )
-                pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
-        }
+        // Do not attempt to create an SotStorage on a
+        // 0-length stream as that would create the compound
+        // document header on the stream and effectively write to
+        // disk!
+        pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
+        if ( pInStrm->remainingSize() == 0 )
+            return OUString();
+
+        SotStorageRef aStorage = new SotStorage( pInStrm, false );
+        if ( !aStorage->GetError() && aStorage->IsStream( "PowerPoint Document" ) )
+            return aTypeName;
     }
     else
     {
-        // ctor of SfxMedium uses owner transition of ItemSet
-        SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, NULL, pSet );
-        aMedium.UseInteractionHandler( true );
-        if ( !aPreselectedFilterName.isEmpty() )
-            pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName );
-        else if (!aTypeName.isEmpty())
-        {
-            SfxFilterMatcher aMatch;
-            pFilter = aMatch.GetFilter4EA( aTypeName );
-        }
+        pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
 
-        if ( aMedium.GetErrorCode() == ERRCODE_NONE )
+        const OUString aFileName( aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() ) );
+        GraphicDescriptor aDesc( *pInStrm, &aFileName );
+        if( !aDesc.Detect( false ) )
         {
-            // remember input stream and content and put them into the descriptor later
-            // should be done here since later the medium can switch to a version
-            xStream = aMedium.GetInputStream();
-            xContent = aMedium.GetContent();
-            bReadOnly = aMedium.IsReadOnly();
-            bool bIsZipStorage = aMedium.IsStorage();
-
-            if (aMedium.GetError() == SVSTREAM_OK)
+            INetURLObject aCheckURL( aFileName );
+            if( aCheckURL.getExtension().equalsIgnoreAsciiCase("cgm") )
             {
-                if (bIsZipStorage)
-                {
-                    // PowerPoint needs to be detected via StreamName, all other storage based formats are our own and can
-                    // be detected by the ClipboardId, so except for the PPT filter all filters must have a ClipboardId set
-                    Reference < embed::XStorage > xStorage = aMedium.GetStorage( false );
-
-                    //TODO/LATER: move error handling to central place! (maybe even complete own filters)
-                    if ( aMedium.GetLastStorageCreationState() != ERRCODE_NONE )
-                    {
-                        // error during storage creation means _here_ that the medium
-                        // is broken, but we can not handle it in medium since unpossibility
-                        // to create a storage does not _always_ means that the medium is broken
-                        aMedium.SetError( aMedium.GetLastStorageCreationState(),  OSL_LOG_PREFIX  );
-                        if ( xInteraction.is() )
-                        {
-                            OUString empty;
-                            try
-                            {
-                                InteractiveAppException xException( empty,
-                                                                Reference< XInterface >(),
-                                                                InteractionClassification_ERROR,
-                                                                aMedium.GetError() );
-
-                                Reference< XInteractionRequest > xRequest(
-                                    new ucbhelper::SimpleInteractionRequest( makeAny( xException ),
-                                                                          ucbhelper::CONTINUATION_APPROVE ) );
-                                xInteraction->handle( xRequest );
-                            }
-                            catch ( Exception & ) {};
-                        }
-                    }
-                    else
-                    {
-                        if ( pFilter && !pFilter->GetFormat() )
-                            // preselected Filter has no ClipboardId -> doesn't match (see comment above)
-                            pFilter = 0;
-
-                        // the storage must be checked even if filter is already found, since it is deep type detection
-                        // the storage can be corrupted and it will be detected here
-                        try
-                        {
-                            OUString sFilterName;
-                            if ( pFilter )
-                                sFilterName = pFilter->GetName();
-                            aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter && pFilter->IsOwnTemplateFormat(), &sFilterName );
-                        }
-                        catch( const WrappedTargetException& aWrap )
-                        {
-                            if (!bDeepDetection)
-                                // Bail out early unless it's a deep detection.
-                                return OUString();
-
-                            packages::zip::ZipIOException aZipException;
-                            if ((aWrap.TargetException >>= aZipException) && !aTypeName.isEmpty())
-                            {
-                                if ( xInteraction.is() )
-                                {
-                                    // the package is broken one
-                                       aDocumentTitle = aMedium.GetURLObject().getName(
-                                                                INetURLObject::LAST_SEGMENT,
-                                                                true,
-                                                                INetURLObject::DECODE_WITH_CHARSET );
-
-                                    if ( !bRepairPackage )
-                                    {
-                                        // ask the user whether he wants to try to repair
-                                        RequestPackageReparation aRequest( aDocumentTitle );
-                                        xInteraction->handle( aRequest.GetRequest() );
-                                        bRepairAllowed = aRequest.isApproved();
-                                    }
-
-                                    if ( !bRepairAllowed )
-                                    {
-                                        // repair either not allowed or not successful
-                                        NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
-                                        xInteraction->handle( aNotifyRequest.GetRequest() );
-                                    }
-                                }
-
-                                if ( !bRepairAllowed )
-                                {
-                                    aTypeName = "";
-                                    pFilter = 0;
-                                }
-                            }
-                        }
-                        catch( RuntimeException& )
-                        {
-                            throw;
-                        }
-                        catch( Exception& )
-                        {
-                            aTypeName = "";
-                            pFilter = 0;
-                        }
-
-                        if (!pFilter && !aTypeName.isEmpty())
-                        {
-                            //TODO/LATER: using this method impress is always preferred if no flat detecion has been made
-                            // this should been discussed!
-                            if ( SvtModuleOptions().IsImpress() )
-                                pFilter = SfxFilterMatcher( OUString("simpress") ).GetFilter4EA( aTypeName );
-                            else if ( SvtModuleOptions().IsDraw() )
-                                pFilter = SfxFilterMatcher( OUString("sdraw") ).GetFilter4EA( aTypeName );
-                        }
-                    }
-                }
-                else
-                {
-                    if (isZipStorageType(aTypeName))
-                        // This stream is a not zip archive, but a zip archive type is specified.
-                        pFilter = NULL;
-
-                    SvStream* pStm = NULL;
-                    if (pFilter)
-                    {
-                        pStm = aMedium.GetInStream();
-                        if (!pStm)
-                            pFilter = NULL;
-                        else
-                        {
-                            pStm->Seek(STREAM_SEEK_TO_END);
-                            const sal_Size nSize = pStm->Tell();
-                            pStm->Seek(STREAM_SEEK_TO_BEGIN);
-
-                            // Do not attempt to create an SotStorage on a
-                            // 0-length stream as that would create the compound
-                            // document header on the stream and effectively write to
-                            // disk!
-                            if (!nSize)
-                                pFilter = NULL;
-                        }
-                    }
-
-                    if (pFilter && pStm)
-                    {
-                        SotStorageRef aStorage = new SotStorage ( pStm, false );
-                        if ( !aStorage->GetError() )
-                        {
-                            OUString aStreamName("PowerPoint Document");
-                            if ( aStorage->IsStream( aStreamName ) && SvtModuleOptions().IsImpress() )
-                            {
-                                OUString aFileName(aMedium.GetName());
-                                aFileName = aFileName.toAsciiUpperCase();
-
-                                if( aFileName.indexOf( ".POT" ) != -1 )
-                                    pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97Template );
-                                else if( aFileName.indexOf( ".PPS" ) != -1 )
-                                    pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97AutoPlay );
-                                else
-                                    pFilter = SfxFilter::GetFilterByName( pFilterPowerPoint97);
-                            }
-                            else
-                            {
-                                pFilter = 0;
-                            }
-                        }
-                        else
-                        {
-                            // vector graphic?
-                            pStm->Seek( STREAM_SEEK_TO_BEGIN );
-
-                            const OUString      aFileName( aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
-                            GraphicDescriptor   aDesc( *pStm, &aFileName );
-                            if( !aDesc.Detect( false ) )
-                            {
-                                pFilter = 0;
-                                if( SvtModuleOptions().IsImpress() )
-                                {
-                                    INetURLObject aCheckURL( aFileName );
-                                    if( aCheckURL.getExtension().equalsIgnoreAsciiCase("cgm") )
-                                    {
-                                        sal_uInt8 n8;
-                                        pStm->Seek( STREAM_SEEK_TO_BEGIN );
-                                        pStm->ReadUChar( n8 );
-                                        if ( ( n8 & 0xf0 ) == 0 )       // we are supporting binary cgm format only, so
-                                        {                               // this is a small test to exclude cgm text
-                                            SfxFilterMatcher aMatch(OUString("simpress"));
-                                            pFilter = aMatch.GetFilter4FilterName(OUString("CGM - Computer Graphics Metafile"));
-                                        }
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                OUString aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) );
-                                GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter();
-                                const OUString aName( rGrfFilter.GetImportFormatTypeName( rGrfFilter.GetImportFormatNumberForShortName( aShortName ) ) );
-
-                                if ( pFilter && aShortName.equalsIgnoreAsciiCase( "PCD" ) )    // there is a multiple pcd selection possible
-                                {
-                                    sal_Int32 nBase = 2;    // default Base0
-                                    OUString aFilterTypeName( pFilter->GetRealTypeName() );
-                                    if ( aFilterTypeName == "pcd_Photo_CD_Base4" )
-                                        nBase = 1;
-                                    else if ( aFilterTypeName == "pcd_Photo_CD_Base16" )
-                                        nBase = 0;
-                                    FilterConfigItem aFilterConfigItem( "Office.Common/Filter/Graphic/Import/PCD" );
-                                    aFilterConfigItem.WriteInt32( "Resolution" , nBase );
-                                }
-
-                                SfxFilterMatcher aMatch(OUString("sdraw"));
-                                pFilter = aMatch.GetFilter4FilterName( aName );
-                            }
-                        }
-                    }
-                }
+                sal_uInt8 n8;
+                pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
+                pInStrm->ReadUChar( n8 );
+                if ( ( n8 & 0xf0 ) == 0 )
+                    // we are supporting binary cgm format only, so
+                    // this is a small test to exclude cgm text
+                    return OUString("impress_CGM_Computer_Graphics_Metafile");
             }
-            else
-            {
-                pFilter = 0;
-            }
-        }
-    }
-
-    if ( nIndexOfInputStream == -1 && xStream.is() )
-    {
-        // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opened twice
-        lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = "InputStream";
-        lDescriptor[nPropertyCount].Value <<= xStream;
-        nPropertyCount++;
-    }
-
-    if ( nIndexOfContent == -1 && xContent.is() )
-    {
-        // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opened twice
-        lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = "UCBContent";
-        lDescriptor[nPropertyCount].Value <<= xContent;
-        nPropertyCount++;
-    }
-
-    if ( bReadOnly != bWasReadOnly )
-    {
-        if ( nIndexOfReadOnlyFlag == -1 )
-        {
-            lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = "ReadOnly";
-            lDescriptor[nPropertyCount].Value <<= bReadOnly;
-            nPropertyCount++;
         }
         else
-            lDescriptor[nIndexOfReadOnlyFlag].Value <<= bReadOnly;
-    }
-
-    if ( !bRepairPackage && bRepairAllowed )
-    {
-        lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = "RepairPackage";
-        lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
-        nPropertyCount++;
-
-        bOpenAsTemplate = true;
-
-        // TODO/LATER: set progress bar that should be used
-    }
-
-    if ( bOpenAsTemplate )
-    {
-        if ( nIndexOfTemplateFlag == -1 )
         {
-            lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = "AsTemplate";
-            lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate;
-            nPropertyCount++;
-        }
-        else
-            lDescriptor[nIndexOfTemplateFlag].Value <<= bOpenAsTemplate;
-    }
+            OUString aShortName( aDesc.GetImportFormatShortName( aDesc.GetFileFormat() ) );
+            GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter();
+            const OUString aName( rGrfFilter.GetImportFormatTypeName( rGrfFilter.GetImportFormatNumberForShortName( aShortName ) ) );
 
-    if ( !aDocumentTitle.isEmpty() )
-    {
-        // the title was set here
-        if ( nIndexOfDocumentTitle == -1 )
-        {
-            lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = "DocumentTitle";
-            lDescriptor[nPropertyCount].Value <<= aDocumentTitle;
-            nPropertyCount++;
+            if ( aShortName.equalsIgnoreAsciiCase( "PCD" ) )    // there is a multiple pcd selection possible
+            {
+                sal_Int32 nBase = 2;    // default Base0
+                if ( aTypeName == "pcd_Photo_CD_Base4" )
+                    nBase = 1;
+                else if ( aTypeName == "pcd_Photo_CD_Base16" )
+                    nBase = 0;
+                FilterConfigItem aFilterConfigItem( "Office.Common/Filter/Graphic/Import/PCD" );
+                aFilterConfigItem.WriteInt32( "Resolution" , nBase );
+            }
+
+            SfxFilterMatcher aMatch("sdraw");
+            const SfxFilter* pFilter = aMatch.GetFilter4FilterName( aName );
+            if ( pFilter )
+                return pFilter->GetRealTypeName();
         }
-        else
-            lDescriptor[nIndexOfDocumentTitle].Value <<= aDocumentTitle;
     }
 
-    if (!pFilter)
-        aTypeName = "";
-
-    return aTypeName;
+    return OUString();
 }
 
 // XServiceInfo
@@ -529,7 +131,7 @@ OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeExceptio
 {
     return impl_getStaticImplementationName();
 }
-                                                                                                                                \
+
 // XServiceInfo
 sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
 {