strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS odbmacros2 (1.23.44); FILE MERGED

Browse source 
2007/12/19 14:51:25 fs 1.23.44.2: #i49133# BasicManager::Insert/set/ResetGlobalUNOConstant superseded by SetGlobalUNOConstant
2007/12/12 14:42:57 fs 1.23.44.1: #i49133# condensed the ThisComponent handling, by using new helpers at the BasicManager
This commit is contained in:
Kurt Zenker 2008-03-06 18:53:06 +00:00
parent b7c3701fed
commit 882baf7bc4
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sfx2/source/control/macrconf.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: macrconf.cxx,v $ * $RCSfile: macrconf.cxx,v $
* *
* $Revision: 1.23 $ * $Revision: 1.24 $
* *
* last change: $Author: kz $ $Date: 2007-10-09 15:31:48 $ * last change: $Author: kz $ $Date: 2008-03-06 19:53:06 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -760,27 +760,9 @@ sal_Bool SfxMacroConfig::ExecuteMacro( SfxObjectShell *pSh, const SvxMacro* pMac
if ( pSh && pMgr && pMgr == pAppMgr ) if ( pSh && pMgr && pMgr == pAppMgr )
{ {
SbxBaseRef xOldVar; ::com::sun::star::uno::Any aOldThisComponent = pAppMgr->SetGlobalUNOConstant( "ThisComponent", makeAny( pSh->GetModel() ) );
SbxVariable *pCompVar = pAppMgr->GetLib(0)->Find( DEFINE_CONST_UNICODE("ThisComponent"), SbxCLASS_PROPERTY );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface ( pSh->GetModel() , ::com::sun::star::uno::UNO_QUERY );
::com::sun::star::uno::Any aAny;
aAny <<= xInterface;
if ( pCompVar )
{
xOldVar = pCompVar->GetObject();
pCompVar->PutObject( GetSbUnoObject( DEFINE_CONST_UNICODE("ThisComponent"), aAny ) );
}
else
{
SbxObjectRef xUnoObj = GetSbUnoObject( DEFINE_CONST_UNICODE("ThisComponent"), aAny );
xUnoObj->SetFlag( SBX_DONTSTORE );
pAppMgr->GetLib(0)->Insert( xUnoObj );
pCompVar = pAppMgr->GetLib(0)->Find( DEFINE_CONST_UNICODE("ThisComponent"), SbxCLASS_PROPERTY );
}
nErr = Call( 0, aCode, pMgr ); nErr = Call( 0, aCode, pMgr );
if ( pCompVar ) pAppMgr->SetGlobalUNOConstant( "ThisComponent", aOldThisComponent );
pCompVar->PutObject( xOldVar );
} }
else if ( pMgr ) else if ( pMgr )
nErr = Call( 0, aCode, pMgr ); nErr = Call( 0, aCode, pMgr );