From 25d738a0a97c0c440882cf8e65dc236ce1ca6ca1 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 19 Jun 2006 23:40:22 +0000
Subject: INTEGRATION: CWS warnings01 (1.3.18); FILE MERGED 2005/12/15 16:36:44
ab 1.3.18.1: #i53898# Removed warnings for unxlngi6/unxlngi6.pro
---
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 6 +++---
xmlhelp/source/cxxhelp/provider/services.cxx | 10 ++++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
(limited to 'xmlhelp')
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 502299448445..eafd4e613892 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: resultsetforroot.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 12:21:35 $
+ * last change: $Author: hr $ $Date: 2006-06-20 00:40:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -93,6 +93,6 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< lang::XMultiServiceFac
if( ! ( cmd->execute( aCommand,0,uno::Reference< XCommandEnvironment >( 0 ) ) >>= m_aItems[i] ) )
;
}
- m_nRow = -1;
+ m_nRow = 0xffffffff;
}
}
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index 06986a01476c..6f3e363aca2a 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: services.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 12:21:55 $
+ * last change: $Author: hr $ $Date: 2006-06-20 00:40:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -94,6 +94,8 @@ static sal_Bool writeInfo( void * pRegistryKey,
extern "C" void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
{
+ (void)ppEnv;
+
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -101,6 +103,8 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
extern "C" sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey )
{
+ (void)pServiceManager;
+
return pRegistryKey &&
//////////////////////////////////////////////////////////////////////
@@ -117,6 +121,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
extern "C" void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
+ (void)pRegistryKey;
+
void * pRet = 0;
Reference< XMultiServiceFactory > xSMgr(
--
cgit