diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-28 11:44:02 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-28 11:44:02 +0100 |
| commit | abb716d15ea02bf3cbedd0dcce4395b7725ef8c5 (patch) | |
| tree | 566c7eef18521702048a4bac05f985e18ff6facb /sw/source/ui/uiview/view2.cxx | |
| parent | 64d0cdabe4e44c928eb170739163926620ca2b83 (diff) | |
| parent | 1379283b49bd1acf89269ee569a2eb3aafd25376 (diff) | |
undoapi: pulled and merged DEV300.m98
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 fd3ac1544b6b..960478c925dd 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2144,14 +2144,15 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion ) 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, 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 ) { |