diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-01-27 13:59:42 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-03-24 22:40:56 +0100 |
| commit | bc477f93a76c1ffeec21e4c59c02f64e5bdd305e (patch) | |
| tree | 3c15c3a2e060c0f913ad135fe41bced0a9093242 /sw/source/uibase/shells | |
| parent | 55654acd1d026491004528371995ce112b33721b (diff) | |
MM: rename MergeNew => Merge
Since all old code from the original Merge function is gone, just
do the rename.
Change-Id: I7cc1b4b58cc73bea83a723b2478a8b4bf59a382f
Diffstat (limited to 'sw/source/uibase/shells')
| -rw-r--r-- | sw/source/uibase/shells/textsh2.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index 6d2ccb2dd468..33f2b87d32dd 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -178,7 +178,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) aDescriptor[daCommandType] <<= nCommandTypeArg; SwMergeDescriptor aMergeDesc( DBMGR_MERGE, *GetShellPtr(), aDescriptor ); - pDBManager->MergeNew(aMergeDesc); + pDBManager->Merge(aMergeDesc); if ( bDisposeResultSet ) ::comphelper::disposeComponent(xCursor); |