strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS cmcfixes34 (1.118.26); FILE MERGED

Browse source 
2007/05/22 09:17:14 cmc 1.118.26.1: #i77485# 0 is an int, and is not promoted to a pointer 0 when the signature is an ellippsed (...) method, set as 0L as most of the code using this does
This commit is contained in:
Ivo Hinkelmann 2007-06-06 10:06:43 +00:00
parent 883d58a979
commit 7da4260634
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sw/source/ui/dbui/dbmgr.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: dbmgr.cxx,v $ * $RCSfile: dbmgr.cxx,v $
* *
* $Revision: 1.118 $ * $Revision: 1.119 $
* *
* last change: $Author: rt $ $Date: 2007-04-26 09:02:02 $ * last change: $Author: ihi $ $Date: 2007-06-06 11:06:43 $
* *
* 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.
@ -3288,7 +3288,7 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
SfxStringItem aURL( SID_FILE_NAME, sSourceDocURL ); SfxStringItem aURL( SID_FILE_NAME, sSourceDocURL );
const SfxPoolItem* pReturnValue = const SfxPoolItem* pReturnValue =
rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON,
&aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0); &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L);
if(pReturnValue) if(pReturnValue)
{ {
SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue; SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue;