diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:54:56 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:54:56 +0000 |
commit | a6dc88ad8dc4d1f88fddf0c3e1bcb390c1e6d4fe (patch) | |
tree | 0cbeca3bd88bed99cfcadacbd2ea6e3fddb9f454 /sfx2/source/appl/impldde.cxx | |
parent | 58bcb6e2a976b8c44255d029e9a4f731193e4e91 (diff) |
INTEGRATION: CWS asyncdialogs (1.4.40); FILE MERGED
2006/09/20 20:25:00 pb 1.4.40.2: RESYNC: (1.4-1.5); FILE MERGED
2006/07/16 10:39:11 pb 1.4.40.1: fix: #i57125# use new Edit()
Diffstat (limited to 'sfx2/source/appl/impldde.cxx')
-rw-r--r-- | sfx2/source/appl/impldde.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 55a2cac6a03b..ff6c6586c73a 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -4,9 +4,9 @@ * * $RCSfile: impldde.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:18:30 $ + * last change: $Author: vg $ $Date: 2006-11-22 10:54:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -328,15 +328,14 @@ BOOL SvDDEObject::Connect( SvBaseLink * pSvLink ) return TRUE; } -String SvDDEObject::Edit( Window* pParent, SvBaseLink * pBaseLink ) +void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) { - String aRet; - SvDDELinkEditDialog aDlg( pParent, pBaseLink ); - if( RET_OK == aDlg.Execute() ) - aRet = aDlg.GetCmd(); - - return aRet; + if ( RET_OK == aDlg.Execute() && rEndEditHdl.IsSet() ) + { + String sCommand = aDlg.GetCmd(); + rEndEditHdl.Call( &sCommand ); + } } BOOL SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq ) |