#112923# place ole and ooo objects in separate libraries

4 files changed, 36 insertions, 39 deletions

diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 82457af80872..19c721e985f2 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xcreator.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mav $ $Date: 2003-11-28 17:26:54 $
+ *  last change: $Author: mav $ $Date: 2003-12-01 08:41:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,30 +98,10 @@
 
 using namespace ::com::sun::star;
 
-//-------------------------------------------------------------------------
-::rtl::OUString GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName,
-                                            const uno::Reference< lang::XMultiServiceFactory >& xFactory )
-{
-    ::rtl::OUString aDocServiceName;
-
-    uno::Reference< container::XNameAccess > xFilterFactory(
-            xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
-            uno::UNO_QUERY );
-
-    if ( !xFilterFactory.is() )
-        throw uno::RuntimeException(); // TODO
 
-    uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
-    uno::Sequence< beans::PropertyValue > aFilterData;
-    if ( aFilterAnyData >>= aFilterData )
-    {
-        for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
-            if ( aFilterData[nInd].Name.equalsAscii( "DocumentService" ) )
-                aFilterData[nInd].Value >>= aDocServiceName;
-    }
+::rtl::OUString GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName,
+                                            const uno::Reference< lang::XMultiServiceFactory >& xFactory );
 
-    return ConvertServiceToImplementationName( aDocServiceName );
-}
 
 //-------------------------------------------------------------------------
 uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames()
diff --git a/embeddedobj/source/msole/exports.dxp b/embeddedobj/source/msole/exports.dxp
new file mode 100644
index 000000000000..9630d7e06768
--- /dev/null
+++ b/embeddedobj/source/msole/exports.dxp
@@ -0,0 +1,3 @@
+component_getImplementationEnvironment
+component_writeInfo
+component_getFactory
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 7a68d7914ea2..8b24c8f06e08 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: olecomponent.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mav $ $Date: 2003-11-26 16:44:04 $
+ *  last change: $Author: mav $ $Date: 2003-12-01 08:41:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,7 +102,30 @@ const sal_Int32 n_ConstBufferSize = 32000;
 
 uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
                                                 sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
-                                                sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 );
+                                                sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 )
+{
+    // TODO: must be removed and used from another library
+
+    uno::Sequence< sal_Int8 > aResult( 16 );
+    aResult[0] = n1 >> 24;
+    aResult[1] = ( n1 << 8 ) >> 24;
+    aResult[2] = ( n1 << 16 ) >> 24;
+    aResult[3] = ( n1 << 24 ) >> 24;
+    aResult[4] = n2 >> 8;
+    aResult[5] = ( n2 << 8 ) >> 8;
+    aResult[6] = n3 >> 8;
+    aResult[7] = ( n3 << 8 ) >> 8;
+    aResult[8] = b8;
+    aResult[9] = b9;
+    aResult[10] = b10;
+    aResult[11] = b11;
+    aResult[12] = b12;
+    aResult[13] = b13;
+    aResult[14] = b14;
+    aResult[15] = b15;
+
+    return aResult;
+}
 
 //----------------------------------------------
 STDAPI StarObject_SwitchDisplayAspect(IUnknown *pObj, LPDWORD pdwCurAspect
diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk
index 289752b4c56f..ae11feb6ebe1 100644
--- a/embeddedobj/util/makefile.mk
+++ b/embeddedobj/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: mav $ $Date: 2003-11-28 18:04:05 $
+#   last change: $Author: mav $ $Date: 2003-12-01 08:41:14 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -81,6 +81,7 @@ SHL1OBJS= \
         $(SLO)$/persistence.obj\
         $(SLO)$/embedobj.obj\
         $(SLO)$/visobj.obj\
+        $(SLO)$/xcreator.obj\
         $(SLO)$/xfactory.obj\
         $(SLO)$/register.obj\
         $(SLO)$/convert.obj\
@@ -88,16 +89,6 @@ SHL1OBJS= \
         $(SLO)$/closepreventer.obj\
         $(SLO)$/intercept.obj
 
-SHL1OBJS+= \
-        $(SLO)$/olecomponent.obj\
-        $(SLO)$/olepersist.obj\
-        $(SLO)$/oleembed.obj\
-        $(SLO)$/olevisual.obj\
-        $(SLO)$/olemisc.obj\
-        $(SLO)$/olewrapclient.obj\
-        $(SLO)$/advisesink.obj
-
-
 SHL1STDLIBS=\
     $(SALLIB)\
     $(CPPULIB)\