diff options
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/topfrm.cxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 972ac57ce6..d2c73fe3bc 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2596,6 +2596,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) // is a new medium "from scratch", so no version should be stored into it SfxItemSet* pSet = new SfxAllItemSet(*pRetrMedium->GetItemSet()); pSet->ClearItem( SID_VERSION ); + pSet->ClearItem( SID_DOC_BASEURL ); // create a medium as a copy; this medium is only for writingm, because it uses the same name as the original one // writing is done through a copy, that will be transferred to the target ( of course after calling HandsOff ) @@ -2882,6 +2883,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl pMergedParams->ClearItem( SID_STREAM ); pMergedParams->ClearItem( SID_CONTENT ); pMergedParams->ClearItem( SID_DOC_READONLY ); + pMergedParams->ClearItem( SID_DOC_BASEURL ); pMergedParams->ClearItem( SID_REPAIRPACKAGE ); diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index bf88a5775d..358af31565 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -847,7 +847,10 @@ sal_Bool SfxTopFrame::InsertDocument( SfxObjectShell* pDoc ) if ( GetCurrentDocument() != pDoc ) // something went wrong during insertion return sal_False; - pDoc->OwnerLock( sal_False ); + + if( !pImp->bHidden ) + pDoc->OwnerLock( sal_False ); + return sal_True; } |