mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fwk153: Merge changes

Browse Source
This commit is contained in:
Carsten Driesner
2010-08-18 11:00:57 +02:00
parent d40c2239e1 4929c03435
commit 6ff3ba91e9
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sfx2/source/doc/objstor.cxx
View File

@@ -1917,7 +1917,25 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
bResult = SaveCompleted( xTmpStorage ); bResult = SaveCompleted( xTmpStorage );
if ( bResult ) if ( bResult )
{
pImp->pBasicManager->setStorage( xTmpStorage ); pImp->pBasicManager->setStorage( xTmpStorage );
// Get rid of this workaround after issue i113914 is fixed
try
{
uno::Reference< script::XStorageBasedLibraryContainer > xBasicLibraries( pImp->xBasicLibraries, uno::UNO_QUERY_THROW );
xBasicLibraries->setRootStorage( xTmpStorage );
}
catch( uno::Exception& )
{}
try
{
uno::Reference< script::XStorageBasedLibraryContainer > xDialogLibraries( pImp->xDialogLibraries, uno::UNO_QUERY_THROW );
xDialogLibraries->setRootStorage( xTmpStorage );
}
catch( uno::Exception& )
{}
}
} }
catch( uno::Exception& ) catch( uno::Exception& )
{} {}
@@ -2063,6 +2081,22 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
// TODO/LATER: may be this code will be replaced, but not sure // TODO/LATER: may be this code will be replaced, but not sure
// Set storage in document library containers // Set storage in document library containers
pImp->pBasicManager->setStorage( xStorage ); pImp->pBasicManager->setStorage( xStorage );
// Get rid of this workaround after issue i113914 is fixed
try
{
uno::Reference< script::XStorageBasedLibraryContainer > xBasicLibraries( pImp->xBasicLibraries, uno::UNO_QUERY_THROW );
xBasicLibraries->setRootStorage( xStorage );
}
catch( uno::Exception& )
{}
try
{
uno::Reference< script::XStorageBasedLibraryContainer > xDialogLibraries( pImp->xDialogLibraries, uno::UNO_QUERY_THROW );
xDialogLibraries->setRootStorage( xStorage );
}
catch( uno::Exception& )
{}
} }
else else
{ {