mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.7.16); FILE MERGED

Browse Source 
2006/02/20 15:31:46 cd 1.7.16.1: #i55991# Warning free code for Windows C++ compiler
This commit is contained in:
Jens-Heiner Rechtien
2006-06-20 04:41:29 +00:00
parent 92ca9c64a0
commit 4342e22060
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
embedserv/source/embed/servprov.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: servprov.cxx,v $ * $RCSfile: servprov.cxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 18:54:07 $ * last change: $Author: hr $ $Date: 2006-06-20 05:41:29 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -33,6 +33,7 @@
* *
************************************************************************/ ************************************************************************/
#include "stdafx.h"
#include "servprov.hxx" #include "servprov.hxx"
#include "embeddoc.hxx" #include "embeddoc.hxx"
@@ -112,7 +113,7 @@ void o2u_attachCurrentThread()
{ {
static CurThreadData oleThreadData; static CurThreadData oleThreadData;
if ((sal_Bool)oleThreadData.getData() != sal_True) if ( oleThreadData.getData() != 0 )
{ {
HINSTANCE inst= LoadLibrary( _T("ole32.dll")); HINSTANCE inst= LoadLibrary( _T("ole32.dll"));
if( inst ) if( inst )
@@ -297,8 +298,8 @@ STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::Release()
} }
STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter, STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter,
REFIID riid, REFIID riid,
void FAR* FAR* ppv) void FAR* FAR* ppv)
{ {
punkOuter = NULL; punkOuter = NULL;
@@ -307,8 +308,14 @@ STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter,
return pEmbedDocument->QueryInterface( riid, ppv ); return pEmbedDocument->QueryInterface( riid, ppv );
} }
STDMETHODIMP EmbedProviderFactory_Impl::LockServer( int fLock ) STDMETHODIMP EmbedProviderFactory_Impl::LockServer( int /*fLock*/ )
{ {
return NOERROR; return NOERROR;
} }
// 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