INTEGRATION: CWS warnings01 (1.6.16); FILE MERGED

2006/02/20 15:31:45 cd 1.6.16.1: #i55991# Warning free code for Windows C++ compiler

1 files changed, 52 insertions, 47 deletions

diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index da2ea111a..59ed5662a 100755
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: guid.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 18:52:52 $
+ *  last change: $Author: hr $ $Date: 2006-06-20 05:40:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -46,34 +46,34 @@
 {
     if ( *guid == OID_WriterTextServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarWriterDocument.6" ) );
-
+    
     if ( *guid == OID_WriterOASISTextServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "opendocument.WriterDocument.1" ) );
 
     if ( *guid == OID_CalcServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarCalcDocument.6" ) );
-
+    
     if ( *guid == OID_CalcOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "opendocument.CalcDocument.1" ) );
-
+    
     if ( *guid == OID_DrawingServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarDrawDocument.6" ) );
-
+    
     if ( *guid == OID_DrawingOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "opendocument.DrawDocument.1" ) );
-
+    
     if ( *guid == OID_PresentationServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarImpressDocument.6" ) );
-
+    
     if ( *guid == OID_PresentationOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "opendocument.ImpressDocument.1" ) );
-
+    
     if ( *guid == OID_MathServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "soffice.StarMathDocument.6" ) );
-
+    
     if ( *guid == OID_MathOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "opendocument.MathDocument.1" ) );
-
+    
     return ::rtl::OUString();
 }
 
@@ -81,31 +81,31 @@
 {
     if ( *guid == OID_WriterTextServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) );
-
+    
     if ( *guid == OID_WriterOASISTextServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.TextDocument" ) );
-
+    
     if ( *guid == OID_CalcServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Calc.SpreadsheetDocument" ) );
-
+    
     if ( *guid == OID_CalcOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Calc.SpreadsheetDocument" ) );
-
+    
     if ( *guid == OID_DrawingServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.DrawingDocument" ) );
-
+    
     if ( *guid == OID_DrawingOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.DrawingDocument" ) );
 
     if ( *guid == OID_PresentationServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.PresentationDocument" ) );
-
+    
     if ( *guid == OID_PresentationOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.PresentationDocument" ) );
 
     if ( *guid == OID_MathServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Math.FormulaDocument" ) );
-
+    
     if ( *guid == OID_MathOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Math.FormulaDocument" ) );
 
@@ -116,34 +116,34 @@
 {
     if ( *guid == OID_WriterTextServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) );
-
+    
     if ( *guid == OID_WriterOASISTextServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer8" ) );
-
+    
     if ( *guid == OID_CalcServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) );
-
+    
     if ( *guid == OID_CalcOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "calc8" ) );
-
+    
     if ( *guid == OID_DrawingServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) );
-
+    
     if ( *guid == OID_DrawingOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw8" ) );
-
+    
     if ( *guid == OID_PresentationServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) );
-
+    
     if ( *guid == OID_PresentationOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "impress8" ) );
-
+    
     if ( *guid == OID_MathServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) );
-
+    
     if ( *guid == OID_MathOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "math8" ) );
-
+    
     return ::rtl::OUString();
 }
 
@@ -151,34 +151,34 @@
 {
     if ( *guid == OID_WriterTextServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxw" ) );
-
+    
     if ( *guid == OID_WriterOASISTextServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odt" ) );
-
+    
     if ( *guid == OID_CalcServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxc" ) );
-
+    
     if ( *guid == OID_CalcOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.ods" ) );
-
+    
     if ( *guid == OID_DrawingServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxd" ) );
-
+    
     if ( *guid == OID_DrawingOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odg" ) );
-
+    
     if ( *guid == OID_PresentationServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxi" ) );
-
+    
     if ( *guid == OID_PresentationOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odp" ) );
-
+    
     if ( *guid == OID_MathServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.sxm" ) );
-
+    
     if ( *guid == OID_MathOASISServer )
         return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "file:///d:/OLE_TEST/test.odf" ) );
-
+    
     return ::rtl::OUString();
 }
 
@@ -189,8 +189,8 @@
 
     const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.document.FilterFactory" ) );
     uno::Reference < container::XNameAccess > xFilters = uno::Reference < io::XOutputStream > ( 
-                                                            xFactory->createInstance ( aServiceName ),
-                                                            uno::UNO_QUERY );
+    xFactory->createInstance ( aServiceName ),
+    uno::UNO_QUERY );
     
     if ( xFilters.is() )
     {
@@ -202,17 +202,22 @@
             if ( aAnyProp >>= aProperties ) )
             {
                 for ( sal_Int32 nInd = 0; nInd < aProperties.getLength; nInd++ )
-                    if ( aProperties[nInd].Name.equalsAscii( "UIName" )
-                    {
-                        aProperties[nInd].Value >>= aResult;
-                        break;
-                    }
+                if ( aProperties[nInd].Name.equalsAscii( "UIName" )
+                {
+                    aProperties[nInd].Value >>= aResult;
+                    break;
+                }
             }
-        }
+    }
     }
 
     return aResult;
 }
 */
 
-
+// Fix strange warnings about some 
+// ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
+// warning C4505: 'xxx' : unreferenced local function has been removed
+#if defined(_MSC_VER)
+#pragma warning(disable: 4505)
+#endif