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

CWS gnumake: resync to m91; conflicts unresolved

Browse Source
This commit is contained in:
Mathias Bauer
2010-10-28 23:02:10 +02:00
parent e02ccd1ae4 da622616ce
commit 83d7b776fb
1019 changed files with 26162 additions and 16896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
basic/source/uno/scriptcont.cxx
View File

@@ -216,8 +216,7 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement
Any aElement = xLib->getByName( aElementName );
aElement >>= aMod.aCode;
Reference < script::XVBAModuleInfo > xModInfo( xLib, UNO_QUERY );
Reference< script::vba::XVBAModuleInfo > xModInfo( xLib, UNO_QUERY );
if( xModInfo.is() && xModInfo->hasModuleInfo( aElementName ) )
{
script::ModuleInfo aModInfo = xModInfo->getModuleInfo( aElementName );
@@ -312,9 +311,9 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
// aMod.aName ignored
if( aMod.aModuleType.getLength() > 0 )
{
if( !getVBACompatModeOn() )
if( !getVBACompatibilityMode() )
{
setVBACompatModeOn( sal_True );
setVBACompatibilityMode( sal_True );
Any aGlobs;
Sequence< Any > aArgs(1);
@@ -381,8 +380,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
}
}
Reference< script::XVBAModuleInfo > xVBAModuleInfo( xLib,
UNO_QUERY );
Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, UNO_QUERY );
if( xVBAModuleInfo.is() )
{
if( xVBAModuleInfo->hasModuleInfo( aElementName ) )