diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-10 08:11:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-10 08:11:23 +0000 |
| commit | ce3ca2bd0e9215cac676ac80fd0db54a989aae3a (patch) | |
| tree | 030526f46b1b2c584ea1dace377ee5661a9f6718 /sfx2 | |
| parent | 332142a44a2ce33b3ce4270efdab0f0826ccf07c (diff) | |
INTEGRATION: CWS fwk05 (1.86.2); FILE MERGED
2003/06/02 11:57:03 mba 1.86.2.1: #109896#: return value for macro handler
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appuno.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 1c6a858f258b..fa866e8dc47a 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appuno.cxx,v $ * - * $Revision: 1.86 $ + * $Revision: 1.87 $ * - * last change: $Author: vg $ $Date: 2003-05-28 13:24:19 $ + * last change: $Author: vg $ $Date: 2003-06-10 09:11:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1703,9 +1703,15 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star:: SfxObjectShellRef rSh = pSh; // execute function using its Sbx parent, - SbxVariable* pRet = pMethod->GetParent()->Execute( aCall ); + //SbxVariable* pRet = pMethod->GetParent()->Execute( aCall ); //rRetval = sbxToUnoValue( pRet ); + SbxVariable* pRet = pMethod->GetParent()->Execute( aCall ); + USHORT nFlags = pRet->GetFlags(); + pRet->SetFlag( SBX_READWRITE | SBX_NO_BROADCAST ); + rRetval = sbxToUnoValue( pRet ); + pRet->SetFlags( nFlags ); + nErr = SbxBase::GetError(); if ( pCompVar ) // reset "ThisComponent" to prior value |