INTEGRATION: CWS filtercfg (1.2.18); FILE MERGED

2003/11/14 08:22:07 as 1.2.18.1: #111770# dont register for generic document services

1 files changed, 7 insertions, 37 deletions

diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 26428a5104da..87028a2d400a 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sddetect.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2003-09-19 08:18:18 $
+ *  last change: $Author: kz $ $Date: 2004-01-28 13:03:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -453,41 +453,6 @@ SdFilterDetect::~SdFilterDetect()
         }
     }
 
-    if ( pFilter )
-    {
-        aTypeName = pFilter->GetTypeName();
-        aFilterName = pFilter->GetName();
-    }
-
-    if ( aFilterName.Len() )
-    {
-        // successful detection, get the filter name (without prefix)
-        if ( nIndexOfFilterName != -1 )
-            // convert to format with factory ( makes load more easy to implement )
-            lDescriptor[nIndexOfFilterName].Value <<= ::rtl::OUString( aFilterName );
-        else
-        {
-            lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("FilterName");
-            lDescriptor[nPropertyCount].Value <<= ::rtl::OUString( aFilterName );
-            nPropertyCount++;
-        }
-/*
-        if ( pFilter->IsOwnTemplateFormat() && nIndexOfTemplateFlag == -1 )
-        {
-            lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate");
-            lDescriptor[nPropertyCount].Value <<= sal_True;
-            nPropertyCount++;
-        }
-*/
-    }
-    else
-    {
-        aFilterName.Erase();
-        aTypeName.Erase();
-    }
-
     if ( nIndexOfInputStream == -1 && xStream.is() )
     {
         // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
@@ -519,6 +484,11 @@ SdFilterDetect::~SdFilterDetect()
             lDescriptor[nIndexOfReadOnlyFlag].Value <<= bReadOnly;
     }
 
+    if ( pFilter )
+        aTypeName = pFilter->GetTypeName();
+    else
+        aTypeName.Erase();
+
     return aTypeName;
 }