INTEGRATION: CWS mav14 (1.15.32); FILE MERGED

2005/01/05 17:16:27 mav 1.15.32.1: #i39895# ignore the class id provided in the object name

1 files changed, 9 insertions, 12 deletions

diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index b790892189bf..adaeed9632de 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmleohlp.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: rt $
+ *  last change: $Author: kz $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -549,16 +549,13 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject(
     // make object known to the container
     // TODO/LATER: could be done a little bit more efficient!
     ::rtl::OUString aName( rObjName );
-    if( pClassId )
-    {
-        // If a class id is specifies, use it.
-        // TODO/LATER: it seems that passing a ClassID is strange
-        rContainer.CreateEmbeddedObject( pClassId->GetByteSequence(), aName );
-    }
-    else
-    {
-        rContainer.GetEmbeddedObject( aName );
-    }
+
+    // TODO/LATER: The provided pClassId is ignored for now.
+    //             The stream contains OLE storage internally and this storage already has a class id specifying the
+    //             server that was used to create the object. pClassId could be used to specify the server that should
+    //             be used for the next opening, but this information seems to be out of the file format responsibility
+    //             area.
+    rContainer.GetEmbeddedObject( aName );
 
     return sal_True;
 }