INTEGRATION: CWS mav14 (1.2.88); FILE MERGED

2004/11/23 12:10:46 mav 1.2.88.1: #i37646# allow to use oasis format with ole server

1 files changed, 17 insertions, 20 deletions

diff --git a/embedserv/source/inc/common.h b/embedserv/source/inc/common.h
index 3e7f738bf03f..cdfb2834719e 100755
--- a/embedserv/source/inc/common.h
+++ b/embedserv/source/inc/common.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: common.h,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mav $ $Date: 2003-03-25 08:24:23 $
+ *  last change: $Author: kz $ $Date: 2005-01-18 15:13:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,10 @@
 #include <osl/interlck.h>
 #endif
 
+#ifndef _COMPHELPER_CLASSIDS_HXX
+#include <comphelper/classids.hxx>
+#endif
+
 namespace com { namespace sun { namespace star {
     namespace lang {
         class XMultiServiceFactory;
@@ -91,29 +95,22 @@ namespace com { namespace sun { namespace star {
 
 const sal_Int32 nConstBufferSize = 32000;
 
-#define SUPPORTED_FACTORIES_NUM 5
-
-// {30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}
-DEFINE_GUID(OID_WriterTextServer,   0x30a2652a, 0xddf7, 0x45e7, 0xac, 0xa6, 0x3e, 0xab, 0x26, 0xfc, 0x8a, 0x4e );
-
-// {43FEEA23-228B-4726-AFFE-214598F47289}
-// DEFINE_GUID(OID_WriterWebServer, 0x43feea23, 0x228b, 0x4726, 0xaf, 0xfe, 0x21, 0x45, 0x98, 0xf4, 0x72, 0x89 );
-
-// {1386E9B2-8706-438b-BF51-5CA7864770C5}
-// DEFINE_GUID(OID_WriterGlobalServer,  0x1386e9b2, 0x8706, 0x438b, 0xbf, 0x51, 0x5c, 0xa7, 0x86, 0x47, 0x70, 0xc5 );
+#define SUPPORTED_FACTORIES_NUM 10
 
-// {7B342DC4-139A-4a46-8A93-DB0827CCEE9C}
-DEFINE_GUID(OID_CalcServer,         0x7b342dc4, 0x139a, 0x4a46, 0x8a, 0x93, 0xdb, 0x8, 0x27, 0xcc, 0xee, 0x9c );
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterTextServer = { SO3_SW_OLE_EMBED_CLASSID_60 };
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer = { SO3_SW_OLE_EMBED_CLASSID_8 };
 
-// {41662FC2-0D57-4aff-AB27-AD2E12E7C273}
-DEFINE_GUID(OID_DrawingServer,      0x41662fc2, 0xd57, 0x4aff, 0xab, 0x27, 0xad, 0x2e, 0x12, 0xe7, 0xc2, 0x73 );
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcServer = { SO3_SC_OLE_EMBED_CLASSID_60 };
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_CalcOASISServer = { SO3_SC_OLE_EMBED_CLASSID_8 };
 
-// {E5A0B632-DFBA-4549-9346-E414DA06E6F8}
-DEFINE_GUID(OID_PresentationServer, 0xe5a0b632, 0xdfba, 0x4549, 0x93, 0x46, 0xe4, 0x14, 0xda, 0x6, 0xe6, 0xf8 );
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingServer = { SO3_SDRAW_OLE_EMBED_CLASSID_60 };
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer = { SO3_SDRAW_OLE_EMBED_CLASSID_8 };
 
-// {D0484DE6-AAEE-468a-991F-8D4B0737B57A}
-DEFINE_GUID(OID_MathServer,         0xd0484de6, 0xaaee, 0x468a, 0x99, 0x1f, 0x8d, 0x4b, 0x7, 0x37, 0xb5, 0x7a );
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationServer = { SO3_SIMPRESS_OLE_EMBED_CLASSID_60 };
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer = { SO3_SIMPRESS_OLE_EMBED_CLASSID_8 };
 
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathServer = { SO3_SM_OLE_EMBED_CLASSID_60 };
+EXTERN_C const GUID DECLSPEC_SELECTANY OID_MathOASISServer = { SO3_SM_OLE_EMBED_CLASSID_8 };
 
 #endif