diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
| commit | 6ef1b591fcb2b6787497310a43a59061eb52abdb (patch) | |
| tree | 9edccfd0cc9cae1b7390aff37941b412ba1cb670 /sw/source/ui/uiview/view2.cxx | |
| parent | ad25e1071ddbde4ff88dc68b1da36bad53497fe9 (diff) | |
| parent | 1379283b49bd1acf89269ee569a2eb3aafd25376 (diff) | |
removetooltypes01: Rebase to DEV300m98
Diffstat (limited to 'sw/source/ui/uiview/view2.cxx')
| -rw-r--r-- | sw/source/ui/uiview/view2.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 640a27532949..cd79109f5723 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2142,14 +2142,15 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe else { SfxObjectShellRef xDocSh; + SfxObjectShellLock xLockRef; -extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh, +extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh, SfxObjectShellLock& xLockRef, const String& rFileName, const String& rPasswd, String& rFilter, sal_Int16 nVersion, SwDocShell* pDestSh ); String sFltNm; - int nRet = lcl_FindDocShell( xDocSh, pMedium->GetName(), aEmptyStr, + int nRet = lcl_FindDocShell( xDocSh, xLockRef, pMedium->GetName(), aEmptyStr, sFltNm, nVersion, pDocSh ); if( nRet ) { |