summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells/textsh2.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 15:37:02 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 15:37:02 +0000
commitcbdc21371fa99a4e4dc9848d6fb0397921a5875c (patch)
tree0142196e6577963bb2894bf0a5b904891766a163 /sw/source/ui/shells/textsh2.cxx
parentfc90b64a1e1345d68774fdef8e21933be296be9d (diff)
INTEGRATION: CWS dialogdiet01 (1.18.42); FILE MERGED
2004/03/26 09:12:12 mwu 1.18.42.1: sw model converted. 20040326
Diffstat (limited to 'sw/source/ui/shells/textsh2.cxx')
-rw-r--r--sw/source/ui/shells/textsh2.cxx25
1 files changed, 17 insertions, 8 deletions
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx
index f47365c09e07..cdbf7ce3d056 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.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: hr $ $Date: 2004-02-03 16:55:57 $
+ * last change: $Author: hr $ $Date: 2004-05-10 16:37:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -155,7 +155,9 @@
#include "swevent.hxx"
#include "shells.hrc"
#include "textsh.hxx"
-#include "dbinsdlg.hxx"
+//CHINA001 #include "dbinsdlg.hxx"
+#include "swabstdlg.hxx" //CHINA001
+#include "dbui.hrc" //CHINA001
using namespace rtl;
using namespace svx;
@@ -365,11 +367,18 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct )
if( xColSupp.is() )
{
SwDBData aDBData = pDBStruct->aDBData;
- ::std::auto_ptr<SwInsertDBColAutoPilot> pDlg( new SwInsertDBColAutoPilot(
- pThis->GetView(),
- xSource,
- xColSupp,
- aDBData ) );
+//CHINA001 ::std::auto_ptr<SwInsertDBColAutoPilot> pDlg( new SwInsertDBColAutoPilot(
+//CHINA001 pThis->GetView(),
+//CHINA001 xSource,
+//CHINA001 xColSupp,
+//CHINA001 aDBData ) );
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();//CHINA001
+ DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");//CHINA001
+ ::std::auto_ptr<AbstractSwInsertDBColAutoPilot>pDlg (pFact->CreateSwInsertDBColAutoPilot( pThis->GetView(),
+ xSource,
+ xColSupp,
+ aDBData,
+ ResId( DLG_AP_INSERT_DB_SEL ))); //CHINA001
if( RET_OK == pDlg->Execute() )
{
Reference <XResultSet> xResSet = pDBStruct->xCursor;