From eb7290860093a58aa9a289d2fec3cb05a11b6255 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 20 Jun 2006 04:40:15 +0000 Subject: INTEGRATION: CWS warnings01 (1.15.4); FILE MERGED 2006/05/24 01:12:35 sb 1.15.4.3: RESYNC: (1.16-1.18); FILE MERGED 2006/04/07 21:30:01 sb 1.15.4.2: RESYNC: (1.15-1.16); FILE MERGED 2006/02/20 15:31:44 cd 1.15.4.1: #i55991# Warning free code for Windows C++ compiler --- embedserv/source/embed/ed_ipersiststr.cxx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'embedserv/source') diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index 31e98d25611a..cdfd91719544 100755 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ed_ipersiststr.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2006-05-08 15:01:04 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:40:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -231,7 +231,7 @@ EmbedDocument_Impl::~EmbedDocument_Impl() m_pDocHolder->release(); } -uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Impl( uno::Reference< io::XInputStream > xStream, DWORD nStreamMode, LPCOLESTR pFilePath ) +uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Impl( uno::Reference< io::XInputStream > xStream, DWORD /*nStreamMode*/, LPCOLESTR pFilePath ) { uno::Sequence< beans::PropertyValue > aArgs( 4 ); @@ -455,7 +455,7 @@ STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg ) if ( hr == S_OK ) { ::rtl::OUString aCurType = getStorageTypeFromGUID_Impl( &m_guid ); // ??? - CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); + CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( pStg, cf, // ??? ( sal_Unicode* )aCurType.getStr() ); @@ -768,7 +768,7 @@ STDMETHODIMP EmbedDocument_Impl::HandsOffStorage() //------------------------------------------------------------------------------- // IPersistFile -STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode ) +STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ ) { if ( m_pDocHolder->GetDocument().is() ) return CO_E_ALREADYINITIALIZED; @@ -785,7 +785,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode ) if ( FAILED( hr ) || !m_pMasterStorage ) return E_FAIL; ::rtl::OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? - CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); + CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? ( sal_Unicode* )aCurType.getStr() ); @@ -837,7 +837,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode ) if ( hr == S_OK ) { ::rtl::OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? - CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); + CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? ( sal_Unicode* )aCurType.getStr() ); @@ -940,7 +940,6 @@ STDMETHODIMP EmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName ) return m_aFileName.getLength() ? S_OK : S_FALSE; } - // =============================================== LockedEmbedDocument_Impl EmbeddedDocumentInstanceAccess_Impl::GetEmbedDocument() @@ -960,3 +959,9 @@ void EmbeddedDocumentInstanceAccess_Impl::ClearEmbedDocument() m_pEmbedDocument = NULL; } +// 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 -- cgit v1.2.3