summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2010-03-23 14:52:26 +0100
committerCarsten Driesner <cd@openoffice.org>2010-03-23 14:52:26 +0100
commitf16413a0d953d0c3bb81b2dce768eaec3402c8f1 (patch)
treeaf0ff47edffdc9aaa699782295800ffbf28e4485
parent418e51b8108cac84fb1efc0516abe3c9bb5fb112 (diff)
parent41aef1fb9539a63aa159e3b6033ba92e43d892e7 (diff)
sw321bf01: Merge changes
-rw-r--r--sfx2/source/doc/objstor.cxx2
-rw-r--r--sfx2/source/view/topfrm.cxx5
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;
}