diff options
Diffstat (limited to 'sw/source/core/swg/SwXMLTextBlocks.cxx')
| -rw-r--r-- | sw/source/core/swg/SwXMLTextBlocks.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 9a807fd8ff11..4563b4a7056c 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,11 +80,11 @@ SwXMLTextBlocks::SwXMLTextBlocks( const String& rFile ) pDoc = pDocSh->GetDoc(); xDocShellRef = pDocSh; pDoc->SetOle2Link( Link() ); - pDoc->DoUndo( FALSE ); // always FALSE + pDoc->DoUndo( FALSE ); // always FALSE pDoc->acquire(); uno::Reference< embed::XStorage > refStg; if( !aDateModified.GetDate() || !aTimeModified.GetTime() ) - Touch(); // falls neu angelegt -> neuen ZeitStempel besorgen + Touch(); // falls neu angelegt -> neuen ZeitStempel besorgen try { refStg = comphelper::OStorageHelper::GetStorageFromURL( rFile, embed::ElementModes::READWRITE ); @@ -184,7 +184,7 @@ ULONG SwXMLTextBlocks::Delete( USHORT n ) { String aPckName (aNames[ n ]->aPackageName); uno::Reference < container::XNameAccess > xAccess( xBlkRoot, uno::UNO_QUERY ); - if ( xAccess.is() && + if ( xAccess.is() && xAccess->hasByName( aPckName ) && xBlkRoot->isStreamElement( aPckName ) ) { try @@ -375,7 +375,7 @@ ULONG SwXMLTextBlocks::PutBlock( SwPaM& , const String& ) sal_Bool bHasChildren = pDocSh && pDocSh->GetEmbeddedObjectContainer().HasEmbeddedObjects(); if( !nRes && bHasChildren ) { - // we have to write to the temporary storage first, since the used below functions are optimized + // we have to write to the temporary storage first, since the used below functions are optimized // TODO/LATER: it is only a temporary solution, that should be changed soon, the used methods should be // called without optimization @@ -386,7 +386,7 @@ ULONG SwXMLTextBlocks::PutBlock( SwPaM& , const String& ) SfxMedium* pTmpMedium = NULL; try { - uno::Reference< embed::XStorage > xTempStorage = + uno::Reference< embed::XStorage > xTempStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); xRoot->copyToStorage( xTempStorage ); |