diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-28 14:32:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-28 14:32:35 +0000 |
| commit | f40ec85a1cb31ee26f41f7ad829b20f9e8f0584d (patch) | |
| tree | 5d6cf1bc1d8c2a5400902aecdf5d0177ea46e764 /sw/source/ui/shells/textsh2.cxx | |
| parent | 1bc51599809c80f156f174f5ff87bfefd9e9c5d8 (diff) | |
INTEGRATION: CWS os47 (1.20.240); FILE MERGED
2004/12/23 12:23:37 os 1.20.240.1: #i30916# signature of SwNewDBMgr::MergeNew() changed
Diffstat (limited to 'sw/source/ui/shells/textsh2.cxx')
| -rw-r--r-- | sw/source/ui/shells/textsh2.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index eb87c95dfb6a..150591911e8e 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textsh2.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hr $ $Date: 2004-08-02 14:23:17 $ + * last change: $Author: rt $ $Date: 2005-01-28 15:32:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -281,7 +281,8 @@ void SwTextShell::ExecDB(SfxRequest &rReq) aDescriptor[daSelection] <<= aSelection; aDescriptor[daCommandType] <<= nCommandTypeArg; - pNewDBMgr->MergeNew(DBMGR_MERGE, *GetShellPtr(), aDescriptor); + SwMergeDescriptor aMergeDesc( DBMGR_MERGE, *GetShellPtr(), aDescriptor ); + pNewDBMgr->MergeNew(aMergeDesc); if ( bDisposeResultSet ) ::comphelper::disposeComponent(xCursor); |