INTEGRATION: CWS obo05 (1.8.10); FILE MERGED

2006/08/28 13:47:49 obo 1.8.10.1: #i53611# diable warnings C4917 and 4555

1 files changed, 19 insertions, 16 deletions

diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 4825a2c72..de6e7e605 100755
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: servprov.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2006-06-20 05:41:29 $
+ *  last change: $Author: vg $ $Date: 2006-09-25 13:31:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -32,6 +32,9 @@
  *    MA  02111-1307  USA
  *
  ************************************************************************/
+#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#pragma warning(disable : 4917 4555)
+#endif
 
 #include "stdafx.h"
 #include "servprov.hxx"
@@ -64,13 +67,13 @@ const GUID* guidList[ SUPPORTED_FACTORIES_NUM ] = {
     &OID_PresentationServer,
     &OID_PresentationOASISServer,
     &OID_MathServer,
-    &OID_MathOASISServer 
+    &OID_MathOASISServer
 };
 
 class CurThreadData
 {
     public:
-        CurThreadData();              
+        CurThreadData();
         virtual ~CurThreadData();
 
         sal_Bool SAL_CALL setData(void *pData);
@@ -105,14 +108,14 @@ void *CurThreadData::getData()
 
 
 // CoInitializeEx *
-typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInitEx)( LPVOID, DWORD); 
+typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInitEx)( LPVOID, DWORD);
 // CoInitialize *
-typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInit)( LPVOID); 
+typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *ptrCoInit)( LPVOID);
 
 void o2u_attachCurrentThread()
 {
     static CurThreadData oleThreadData;
-    
+
     if ( oleThreadData.getData() != 0 )
     {
         HINSTANCE inst=	LoadLibrary( _T("ole32.dll"));
@@ -129,9 +132,9 @@ void o2u_attachCurrentThread()
                     hr= initFunc( NULL);
             }
         }
-        oleThreadData.setData((void*)sal_True);				
+        oleThreadData.setData((void*)sal_True);
     }
-}	
+}
 
 
 //===============================================================================
@@ -145,7 +148,7 @@ EmbedServer_Impl::EmbedServer_Impl( const uno::Reference<lang::XMultiServiceFact
         m_pOLEFactories[nInd] = new EmbedProviderFactory_Impl( m_xFactory, guidList[nInd] );
         m_pOLEFactories[nInd]->registerClass();
     }
-}	
+}
 
 EmbedServer_Impl::~EmbedServer_Impl()
 {
@@ -157,15 +160,15 @@ EmbedServer_Impl::~EmbedServer_Impl()
 }
 
 // XInterface --------------------------------------------------
-uno::Any SAL_CALL 
-EmbedServer_Impl::queryInterface( 
-    const uno::Type& aType ) 
+uno::Any SAL_CALL
+EmbedServer_Impl::queryInterface(
+    const uno::Type& aType )
     throw(
         uno::RuntimeException
     )
 {
-    uno::Any a= 
-        ::cppu::queryInterface( 
+    uno::Any a=
+        ::cppu::queryInterface(
             aType, static_cast<lang::XTypeProvider*>(this));
     if( a == uno::Any())
         return OWeakObject::queryInterface( aType);
@@ -186,7 +189,7 @@ void SAL_CALL EmbedServer_Impl::release(  ) throw (uno::RuntimeException)
 
 // XTypeProvider --------------------------------------------------
 uno::Sequence< uno::Type > SAL_CALL
-EmbedServer_Impl::getTypes( ) 
+EmbedServer_Impl::getTypes( )
     throw(
         uno::RuntimeException
     )