summaryrefslogtreecommitdiff
path: root/embedserv/source/embed
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 04:40:39 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 04:40:39 +0000
commit873edd7f9bbd808fa30bea5fdf70808202938b8c (patch)
tree5ba05f429b595727851dc9f9d052d98d459f5423 /embedserv/source/embed
parentc6225b31c5b38c4e361245ad4596cc6f30796371 (diff)
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
Diffstat (limited to 'embedserv/source/embed')
-rwxr-xr-xembedserv/source/embed/guid.cxx27
1 files changed, 16 insertions, 11 deletions
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index 71c85d2f23f1..3eed087557c7 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.
@@ -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