Attachment #46998 for issue #18907

View | Details | Raw Unified | Return to issue 18907
Collapse All | Expand All




				{
					TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(getView()));
					ElementType eType = getContainer()->getElementType();

					switch( eType )
					{
						case E_TABLE:
							{
								//dyf add 
								//for get the selected tablename
								::std::vector< ::rtl::OUString> aList;
								getSelectionElementNames(aList);
								::rtl::OUString sTableNameToInsertInto;
								
								if ( !aList.empty() )
								{
									sTableNameToInsertInto = *aList.begin();
									m_aTableCopyHelper.SetDefaultTableName(sTableNameToInsertInto);
									m_aTableCopyHelper.SetIsSelectCopytable(true);
								}
								else
								{
									m_aTableCopyHelper.SetIsSelectCopytable(false);
								}
								//dyf add end  
								m_aTableCopyHelper.pasteTable( aTransferData , getDatabaseName(), ensureConnection());
							}
							break;
							
						case E_QUERY:
                            if ( getViewClipboard().HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) )
							    paste( E_QUERY,ODataAccessObjectTransferable::extractObjectDescriptor(aTransferData) );

Lines 122-128 Link Here

(-)source/ui/inc/DExport.hxx (-1 / +9 lines)
122	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory;	122	::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory;
123		123
124	SvNumberFormatter* m_pFormatter;	124	SvNumberFormatter* m_pFormatter;
125		125	//dyf add 2006/06/01
		126	//for save the selected tablename
		127	::rtl::OUString m_sDefaultTableName;
		128	//dyf add end
126	String m_sTextToken; // Zellen Inhalt	129	String m_sTextToken; // Zellen Inhalt
127	String m_sNumToken; /// SDNUM value	130	String m_sNumToken; /// SDNUM value
128	String m_sValToken; /// SDVAL value	131	String m_sValToken; /// SDVAL value
Lines 184-189 Link Here
184	sal_Bool _bAutoIncrementEnabled);	187	sal_Bool _bAutoIncrementEnabled);
185		188
186	void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap);	189	void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap);
		190
		191	//dyf add 20070601
		192	inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; }
		193	//dyf add end
		194
187	virtual void release() = 0;	195	virtual void release() = 0;
188		196
189	void enableCheckOnly() { m_bCheckOnly = sal_True; }	197	void enableCheckOnly() { m_bCheckOnly = sal_True; }

Lines 95-105 Link Here

(-)source/ui/inc/TableCopyHelper.hxx (+15 lines)
95	class OTableCopyHelper	95	class OTableCopyHelper
96	{	96	{
97	OGenericUnoController* m_pController;	97	OGenericUnoController* m_pController;
		98	private:
		99	::rtl::OUString m_sDefaultTableName;
		100	sal_Bool m_bSelectCopyTable;
98	public:	101	public:
99	// is needed to describe the drop target	102	// is needed to describe the drop target
100	struct DropDescriptor	103	struct DropDescriptor
101	{	104	{
102	::svx::ODataAccessDescriptor aDroppedData;	105	::svx::ODataAccessDescriptor aDroppedData;
		106	//dyf add 20070601
		107	//for transfor the tablename
		108	::rtl::OUString sDefaultTableName;
		109	//dyf add end
103	String aUrl;	110	String aUrl;
104	SotStorageStreamRef aHtmlRtfStorage;	111	SotStorageStreamRef aHtmlRtfStorage;
105	ElementType nType;	112	ElementType nType;
Lines 212-217 Link Here
212		219
213	/// returns <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>.	220	/// returns <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>.
214	sal_Bool isTableFormat(const TransferableDataHelper& _rClipboard) const;	221	sal_Bool isTableFormat(const TransferableDataHelper& _rClipboard) const;
		222
		223	//dyf add 20070601
		224	inline void SetDefaultTableName(const ::rtl::OUString &_sDefaultTableName){ m_sDefaultTableName = _sDefaultTableName ; }
		225	inline ::rtl::OUString GetDefaultTableName() const { return m_sDefaultTableName ;}
		226
		227	inline sal_Bool SetIsSelectCopytable(sal_Bool isSelect){ m_bSelectCopyTable = isSelect;}
		228	sal_Bool GetIsSelectCopytable(){ return m_bSelectCopyTable; }
		229	//dyf add end
215		230
216	};	231	};
217	//........................................................................	232	//........................................................................

Lines 119-124 Link Here

(-)source/ui/inc/TokenWriter.hxx (+9 lines)
119	SharedModel m_aKeepModelAlive;	119	SharedModel m_aKeepModelAlive;
120		120
121	::rtl::OUString m_sName;	121	::rtl::OUString m_sName;
		122	//dyf add 20070601
		123	//for transfor the tablename
		124	::rtl::OUString m_sDefaultTableName;
		125	//dyf add end
122	::rtl::OUString m_sDataSourceName;	126	::rtl::OUString m_sDataSourceName;
123	sal_Int32 m_nCommandType;	127	sal_Int32 m_nCommandType;
124		128
Lines 150-155 Link Here
150	public:	154	public:
151	void setStream(SvStream* _pStream){ m_pStream = _pStream; }	155	void setStream(SvStream* _pStream){ m_pStream = _pStream; }
152		156
		157	//dyf add 20070601
		158	//for set the tablename
		159	void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; }
		160	//dyf add end
		161
153	virtual BOOL Write() = 0; // Export	162	virtual BOOL Write() = 0; // Export
154	virtual BOOL Read() = 0; // Import	163	virtual BOOL Read() = 0; // Import
155		164

Lines 92-97 Link Here

(-)source/ui/inc/WCPage.hxx (-1 / +8 lines)
92	DECL_LINK( KeyClickHdl, Button* );	92	DECL_LINK( KeyClickHdl, Button* );
93		93
94	sal_Bool checkAppendData();	94	sal_Bool checkAppendData();
		95	//--------dyf add
		96	void SetAppendDataRadio();
		97	//--------add end
95		98
96	public:	99	public:
97	virtual void Reset();	100	virtual void Reset();
Lines 99-105 Link Here
99	virtual BOOL LeavePage();	102	virtual BOOL LeavePage();
100	virtual String GetTitle() const ;	103	virtual String GetTitle() const ;
101		104
102	OCopyTable( Window * pParent, EImportMode atWhat, BOOL bIsView, OCopyTableWizard::Wizard_Create_Style nLastAction );	105	OCopyTable( Window * pParent, EImportMode atWhat, BOOL bIsView );//, OCopyTableWizard::Wizard_Create_Style nLastAction );
103	virtual ~OCopyTable();	106	virtual ~OCopyTable();
104		107
105	inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); }	108	inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); }
Lines 107-112 Link Here
107	inline BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); }	110	inline BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); }
108	inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); }	111	inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); }
109	String GetKeyName() const { return m_edKeyName.GetText(); }	112	String GetKeyName() const { return m_edKeyName.GetText(); }
		113
		114	//--------dyf add 2007/7/10
		115	void setCreateStyleAction();//const OCopyTableWizard::Wizard_Create_Style& _eStyle
		116	//--------add end
110	};	117	};
111	}	118	}
112	#endif // DBAUI_WIZARD_CPAGE_HXX	119	#endif // DBAUI_WIZARD_CPAGE_HXX

Lines 327-332 Link Here

(-)source/ui/inc/WCopyTable.hxx (+4 lines)
327	void showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName);	327	void showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName);
328		328
329	void removeColumnNameFromNameMap(const ::rtl::OUString& _sName);	329	void removeColumnNameFromNameMap(const ::rtl::OUString& _sName);
		330
		331	//dyf add
		332	void ResetsName(const ::rtl::OUString & _sName);
		333	//dyf add end
330	};	334	};
331	}	335	}
332		336




sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _sTableName,const Any& _aTextColor,const FontDescriptor& _rFont)
{
	DBG_CHKTHIS(ODatabaseExport,NULL);
	OCopyTableWizard aWizard(NULL,_sTableName,m_aDestColumns,m_vDestVector,m_xConnection,m_xFormatter,m_xFactory);
	
	//--------dyf add 20070601
	//if there is a table was selected,then create with m_sDefaultTableName,otherwise,with _sTableName
	OCopyTableWizard aWizard(NULL,_sTableName,m_aDestColumns,m_vDestVector,m_xConnection,m_xFormatter,m_xFactory);
	if (m_sDefaultTableName.getLength() != 0 )
	{
		aWizard.ResetsName(m_sDefaultTableName);
		aWizard.setCreateStyle(OCopyTableWizard::WIZARD_APPEND_DATA);
	}
	sal_Bool bError = sal_False;
	try
	{
		aWizard.fillTypeInfo();

		OCopyTable*			pPage1;
		pPage1 = new OCopyTable(&aWizard,COPY, sal_False);
		pPage1->setCreateStyleAction();
	//---------dyf add end

		OWizNameMatching*	pPage2 = new OWizNameMatching(&aWizard);
		OWizColumnSelect*	pPage3 = new OWizColumnSelect(&aWizard);		
		OWizTypeSelect*		pPage4 = createPage(&aWizard);

Lines 439-445 Link Here

(-)source/ui/misc/TableCopyHelper.cxx (-2 / +24 lines)
439	}	439	}
440	}	440	}
441	// -----------------------------------------------------------------------------	441	// -----------------------------------------------------------------------------
442	OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler) : m_pController(_pControler)	442	OTableCopyHelper::OTableCopyHelper(OGenericUnoController* _pControler)
		443	:m_pController(_pControler)
		444	,m_bSelectCopyTable(sal_False)
443	{	445	{
444	}	446	}
445	// -----------------------------------------------------------------------------	447	// -----------------------------------------------------------------------------
Lines 468-473 Link Here
468		470
469	aTrans.nType = E_TABLE;	471	aTrans.nType = E_TABLE;
470	aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId \|\| SOT_FORMATSTR_ID_HTML_SIMPLE == _nFormatId;	472	aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId \|\| SOT_FORMATSTR_ID_HTML_SIMPLE == _nFormatId;
		473	///dyf add 20070601
		474	//add for transfor the selected tablename
		475	aTrans.sDefaultTableName = GetDefaultTableName();
		476	//dyf add end
471	if ( !copyTagTable(aTrans,sal_False,_xConnection) )	477	if ( !copyTagTable(aTrans,sal_False,_xConnection) )
472	m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any()));	478	m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any()));
473	}	479	}
Lines 610-618 Link Here
610	_xDestConnection,	616	_xDestConnection,
611	getNumberFormatter(_xDestConnection,m_pController->getORB()),	617	getNumberFormatter(_xDestConnection,m_pController->getORB()),
612	m_pController->getORB());	618	m_pController->getORB());
		619
		620	//--------dyf modify 2006/6/27
613	aWizard.fillTypeInfo();	621	aWizard.fillTypeInfo();
614	aWizard.loadData();	622	aWizard.loadData();
615	OCopyTable* pPage1 = new OCopyTable(&aWizard,COPY, bIsView,OCopyTableWizard::WIZARD_DEF_DATA);	623	if(GetIsSelectCopytable())
		624	{
		625	aWizard.ResetsName( GetDefaultTableName());
		626	aWizard.setCreateStyle(OCopyTableWizard::WIZARD_APPEND_DATA);
		627	}
		628
		629	OCopyTable* pPage1;
		630	pPage1 = new OCopyTable(&aWizard,COPY, bIsView);
		631	pPage1->setCreateStyleAction();
		632
		633	//--------dyf modify end
616	OWizNameMatching* pPage2 = new OWizNameMatching(&aWizard);	634	OWizNameMatching* pPage2 = new OWizNameMatching(&aWizard);
617	OWizColumnSelect* pPage3 = new OWizColumnSelect(&aWizard);	635	OWizColumnSelect* pPage3 = new OWizColumnSelect(&aWizard);
618	OWizNormalExtend* pPage4 = new OWizNormalExtend(&aWizard);	636	OWizNormalExtend* pPage4 = new OWizNormalExtend(&aWizard);
Lines 747-752 Link Here
747	if ( _bCheck )	765	if ( _bCheck )
748	pImport->enableCheckOnly();	766	pImport->enableCheckOnly();
749		767
		768	//dyf add 20070601
		769	//set the selected tablename
		770	pImport->setSTableName(_rDesc.sDefaultTableName);
		771	//dyf add end
750	pImport->setStream(pStream);	772	pImport->setStream(pStream);
751	return pImport->Read();	773	return pImport->Read();
752	}	774	}

Lines 737-742 Link Here

(-)source/ui/misc/TokenWriter.cxx (+3 lines)
737	((OHTMLReader*)m_pReader)->AddRef();	737	((OHTMLReader*)m_pReader)->AddRef();
738	if ( isCheckEnabled() )	738	if ( isCheckEnabled() )
739	m_pReader->enableCheckOnly();	739	m_pReader->enableCheckOnly();
		740	//dyf add 20070601
		741	m_pReader->SetTableName(m_sDefaultTableName);
		742	//dyf add end
740	eState = ((OHTMLReader*)m_pReader)->CallParser();	743	eState = ((OHTMLReader*)m_pReader)->CallParser();
741	m_pReader->release();	744	m_pReader->release();
742	m_pReader = NULL;	745	m_pReader = NULL;




//========================================================================
DBG_NAME(OCopyTable)
//------------------------------------------------------------------------
//--------dyf modify 2007/7/10
OCopyTable::OCopyTable( Window * pParent, EImportMode atWhat, sal_Bool bIsView )//, OCopyTableWizard::Wizard_Create_Style nLastAction )
//--------modify end
	: OWizardPage( pParent, ModuleRes(TAB_WIZ_COPYTABLE) ),
	m_ftTableName(			this, ModuleRes( FT_TABLENAME		) ),
	m_edTableName(			this, ModuleRes( ET_TABLENAME		) ),


		m_aCB_PrimaryColumn.Enable(m_bPKeyAllowed);

		// reselect the last action before
		switch(nLastAction)
		{
			case OCopyTableWizard::WIZARD_DEF_DATA:
				m_aRB_DefData.Check(sal_True);
				break;
			case OCopyTableWizard::WIZARD_DEF:
				m_aRB_Def.Check(sal_True);
				break;
			case OCopyTableWizard::WIZARD_APPEND_DATA:
				m_aRB_AppendData.Check(sal_True);
				m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_False);
				break;
			case OCopyTableWizard::WIZARD_DEF_VIEW:
				if(m_bIsViewAllowed)
				{
					m_aRB_View.Check(sal_True);
					m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_False);
				}
				else
					m_aRB_DefData.Check(sal_True);
		}
		m_aRB_AppendData.SetClickHdl(	LINK( this, OCopyTable, AppendDataClickHdl	) );

		m_aRB_DefData.SetClickHdl(		LINK( this, OCopyTable, RadioChangeHdl		) );

IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ )
{
	DBG_CHKTHIS(OCopyTable,NULL);

	SetAppendDataRadio();
	return 0;
}
//--------dyf ADD
void OCopyTable::SetAppendDataRadio()
{
	m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_True);
	m_aFT_KeyName.Enable(sal_False);
	m_aCB_PrimaryColumn.Enable(sal_False);
	m_edKeyName.Enable(sal_False);
	m_pParent->setCreateStyle(OCopyTableWizard::WIZARD_APPEND_DATA);

	return 0;
}

//--------add end
//------------------------------------------------------------------------
IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
{

	return sal_True;
}
// -----------------------------------------------------------------------------
//---dyf add 2006/7/10
void OCopyTable::setCreateStyleAction()
{
	// reselect the last action before
	switch(m_pParent->getCreateStyle())
	{
		case OCopyTableWizard::WIZARD_DEF_DATA:
			m_aRB_DefData.Check(sal_True);
            RadioChangeHdl(&m_aRB_DefData);
			break;
		case OCopyTableWizard::WIZARD_DEF:
			m_aRB_Def.Check(sal_True);
            RadioChangeHdl(&m_aRB_Def);
			break;
		case OCopyTableWizard::WIZARD_APPEND_DATA:
			m_aRB_AppendData.Check(sal_True);
			SetAppendDataRadio();
			break;
		case OCopyTableWizard::WIZARD_DEF_VIEW:
			if(m_bIsViewAllowed)
			{
				m_aRB_View.Check(sal_True);
                RadioChangeHdl(&m_aRB_View);
			}
			else
            {
				m_aRB_DefData.Check(sal_True);
                RadioChangeHdl(&m_aRB_DefData);
            }
	}
}
//---add end




				m_sSourceName = ::dbtools::composeTableName( m_xConnection->getMetaData(), m_xSourceObject, ::dbtools::eInDataManipulation, false, false, false );
			else
				_xSourceObject->getPropertyValue(PROPERTY_NAME)	>>= m_sSourceName;
            if ( m_xSourceConnection == m_xConnection )
            {
                Reference<XTablesSupplier> xSup(m_xConnection,UNO_QUERY_THROW);
                m_sName = ::dbtools::createUniqueName(xSup->getTables(),m_sSourceName,sal_False);
            }
            else
			    m_sName = m_sSourceName;
		}

		if ( m_xSourceConnection == m_xConnection )
		{
			Reference<XTablesSupplier> xSup(m_xConnection,UNO_QUERY_THROW);
			m_sName = ::dbtools::createUniqueName(xSup->getTables(),m_sSourceName,sal_False);
		}
		else
			m_sName = m_sSourceName;
	}
	catch(const Exception&)
	{
        m_sName = m_sSourceName;
	}

}
// -----------------------------------------------------------------------------
OCopyTableWizard::OCopyTableWizard(Window * pParent,

	aMsg.Execute();
}
// -----------------------------------------------------------------------------
//------dyf add
void OCopyTableWizard::ResetsName(const ::rtl::OUString & _sName)
{
	if ( _sName.getLength() != 0 )
		m_sName = _sName;

}
//------dyf add end
//-------------------------------------------------------------------------------

Return to issue 18907

Lines 979-989 Link Here

(-)source/ui/app/AppController.cxx (-1 / +22 lines)
979	{	979	{
980	TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(getView()));	980	TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(getView()));
981	ElementType eType = getContainer()->getElementType();	981	ElementType eType = getContainer()->getElementType();
		982
982	switch( eType )	983	switch( eType )
983	{	984	{
984	case E_TABLE:	985	case E_TABLE:
985	m_aTableCopyHelper.pasteTable( aTransferData , getDatabaseName(), ensureConnection() );	986	{
		987	//dyf add
		988	//for get the selected tablename
		989	::std::vector< ::rtl::OUString> aList;
		990	getSelectionElementNames(aList);
		991	::rtl::OUString sTableNameToInsertInto;
		992
		993	if ( !aList.empty() )
		994	{
		995	sTableNameToInsertInto = *aList.begin();
		996	m_aTableCopyHelper.SetDefaultTableName(sTableNameToInsertInto);
		997	m_aTableCopyHelper.SetIsSelectCopytable(true);
		998	}
		999	else
		1000	{
		1001	m_aTableCopyHelper.SetIsSelectCopytable(false);
		1002	}
		1003	//dyf add end
		1004	m_aTableCopyHelper.pasteTable( aTransferData , getDatabaseName(), ensureConnection());
		1005	}
986	break;	1006	break;
		1007
987	case E_QUERY:	1008	case E_QUERY:
988	if ( getViewClipboard().HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) )	1009	if ( getViewClipboard().HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) )
989	paste( E_QUERY,ODataAccessObjectTransferable::extractObjectDescriptor(aTransferData) );	1010	paste( E_QUERY,ODataAccessObjectTransferable::extractObjectDescriptor(aTransferData) );

Lines 765-778 Link Here

(-)source/ui/misc/DExport.cxx (-2 / +13 lines)
765	sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _sTableName,const Any& _aTextColor,const FontDescriptor& _rFont)	765	sal_Bool ODatabaseExport::executeWizard(const ::rtl::OUString& _sTableName,const Any& _aTextColor,const FontDescriptor& _rFont)
766	{	766	{
767	DBG_CHKTHIS(ODatabaseExport,NULL);	767	DBG_CHKTHIS(ODatabaseExport,NULL);
768	OCopyTableWizard aWizard(NULL,_sTableName,m_aDestColumns,m_vDestVector,m_xConnection,m_xFormatter,m_xFactory);
769		768
		769	//--------dyf add 20070601
		770	//if there is a table was selected,then create with m_sDefaultTableName,otherwise,with _sTableName
		771	OCopyTableWizard aWizard(NULL,_sTableName,m_aDestColumns,m_vDestVector,m_xConnection,m_xFormatter,m_xFactory);
		772	if (m_sDefaultTableName.getLength() != 0 )
		773	{
		774	aWizard.ResetsName(m_sDefaultTableName);
		775	aWizard.setCreateStyle(OCopyTableWizard::WIZARD_APPEND_DATA);
		776	}
770	sal_Bool bError = sal_False;	777	sal_Bool bError = sal_False;
771	try	778	try
772	{	779	{
773	aWizard.fillTypeInfo();	780	aWizard.fillTypeInfo();
774		781
775	OCopyTable* pPage1 = new OCopyTable(&aWizard,COPY, sal_False,OCopyTableWizard::WIZARD_DEF_DATA);	782	OCopyTable* pPage1;
		783	pPage1 = new OCopyTable(&aWizard,COPY, sal_False);
		784	pPage1->setCreateStyleAction();
		785	//---------dyf add end
		786
776	OWizNameMatching* pPage2 = new OWizNameMatching(&aWizard);	787	OWizNameMatching* pPage2 = new OWizNameMatching(&aWizard);
777	OWizColumnSelect* pPage3 = new OWizColumnSelect(&aWizard);	788	OWizColumnSelect* pPage3 = new OWizColumnSelect(&aWizard);
778	OWizTypeSelect* pPage4 = createPage(&aWizard);	789	OWizTypeSelect* pPage4 = createPage(&aWizard);

Lines 102-108 Link Here

(-)source/ui/misc/WCPage.cxx (-25 / +44 lines)
102	//========================================================================	102	//========================================================================
103	DBG_NAME(OCopyTable)	103	DBG_NAME(OCopyTable)
104	//------------------------------------------------------------------------	104	//------------------------------------------------------------------------
105	OCopyTable::OCopyTable( Window * pParent, EImportMode atWhat, sal_Bool bIsView, OCopyTableWizard::Wizard_Create_Style nLastAction )	105	//--------dyf modify 2007/7/10
		106	OCopyTable::OCopyTable( Window * pParent, EImportMode atWhat, sal_Bool bIsView )//, OCopyTableWizard::Wizard_Create_Style nLastAction )
		107	//--------modify end
106	: OWizardPage( pParent, ModuleRes(TAB_WIZ_COPYTABLE) ),	108	: OWizardPage( pParent, ModuleRes(TAB_WIZ_COPYTABLE) ),
107	m_ftTableName( this, ModuleRes( FT_TABLENAME ) ),	109	m_ftTableName( this, ModuleRes( FT_TABLENAME ) ),
108	m_edTableName( this, ModuleRes( ET_TABLENAME ) ),	110	m_edTableName( this, ModuleRes( ET_TABLENAME ) ),
Lines 170-197 Link Here
170		172
171	m_aCB_PrimaryColumn.Enable(m_bPKeyAllowed);	173	m_aCB_PrimaryColumn.Enable(m_bPKeyAllowed);
172		174
173	// reselect the last action before
174	switch(nLastAction)
175	{
176	case OCopyTableWizard::WIZARD_DEF_DATA:
177	m_aRB_DefData.Check(sal_True);
178	break;
179	case OCopyTableWizard::WIZARD_DEF:
180	m_aRB_Def.Check(sal_True);
181	break;
182	case OCopyTableWizard::WIZARD_APPEND_DATA:
183	m_aRB_AppendData.Check(sal_True);
184	m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_False);
185	break;
186	case OCopyTableWizard::WIZARD_DEF_VIEW:
187	if(m_bIsViewAllowed)
188	{
189	m_aRB_View.Check(sal_True);
190	m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_False);
191	}
192	else
193	m_aRB_DefData.Check(sal_True);
194	}
195	m_aRB_AppendData.SetClickHdl( LINK( this, OCopyTable, AppendDataClickHdl ) );	175	m_aRB_AppendData.SetClickHdl( LINK( this, OCopyTable, AppendDataClickHdl ) );
196		176
197	m_aRB_DefData.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) );	177	m_aRB_DefData.SetClickHdl( LINK( this, OCopyTable, RadioChangeHdl ) );
Lines 232-245 Link Here
232	IMPL_LINK( OCopyTable, AppendDataClickHdl, Button, /pButton*/ )	212	IMPL_LINK( OCopyTable, AppendDataClickHdl, Button, /pButton*/ )
233	{	213	{
234	DBG_CHKTHIS(OCopyTable,NULL);	214	DBG_CHKTHIS(OCopyTable,NULL);
		215
		216	SetAppendDataRadio();
		217	return 0;
		218	}
		219	//--------dyf ADD
		220	void OCopyTable::SetAppendDataRadio()
		221	{
235	m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_True);	222	m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_True);
236	m_aFT_KeyName.Enable(sal_False);	223	m_aFT_KeyName.Enable(sal_False);
237	m_aCB_PrimaryColumn.Enable(sal_False);	224	m_aCB_PrimaryColumn.Enable(sal_False);
238	m_edKeyName.Enable(sal_False);	225	m_edKeyName.Enable(sal_False);
239	m_pParent->setCreateStyle(OCopyTableWizard::WIZARD_APPEND_DATA);	226	m_pParent->setCreateStyle(OCopyTableWizard::WIZARD_APPEND_DATA);
240
241	return 0;
242	}	227	}
		228
		229	//--------add end
243	//------------------------------------------------------------------------	230	//------------------------------------------------------------------------
244	IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )	231	IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
245	{	232	{
Lines 420-422 Link Here
420	return sal_True;	407	return sal_True;
421	}	408	}
422	// -----------------------------------------------------------------------------	409	// -----------------------------------------------------------------------------
		410	//---dyf add 2006/7/10
		411	void OCopyTable::setCreateStyleAction()
		412	{
		413	// reselect the last action before
		414	switch(m_pParent->getCreateStyle())
		415	{
		416	case OCopyTableWizard::WIZARD_DEF_DATA:
		417	m_aRB_DefData.Check(sal_True);
		418	RadioChangeHdl(&m_aRB_DefData);
		419	break;
		420	case OCopyTableWizard::WIZARD_DEF:
		421	m_aRB_Def.Check(sal_True);
		422	RadioChangeHdl(&m_aRB_Def);
		423	break;
		424	case OCopyTableWizard::WIZARD_APPEND_DATA:
		425	m_aRB_AppendData.Check(sal_True);
		426	SetAppendDataRadio();
		427	break;
		428	case OCopyTableWizard::WIZARD_DEF_VIEW:
		429	if(m_bIsViewAllowed)
		430	{
		431	m_aRB_View.Check(sal_True);
		432	RadioChangeHdl(&m_aRB_View);
		433	}
		434	else
		435	{
		436	m_aRB_DefData.Check(sal_True);
		437	RadioChangeHdl(&m_aRB_DefData);
		438	}
		439	}
		440	}
		441	//---add end

Lines 186-204 Link Here

(-)source/ui/misc/WCopyTable.cxx (-7 / +17 lines)
186	m_sSourceName = ::dbtools::composeTableName( m_xConnection->getMetaData(), m_xSourceObject, ::dbtools::eInDataManipulation, false, false, false );	186	m_sSourceName = ::dbtools::composeTableName( m_xConnection->getMetaData(), m_xSourceObject, ::dbtools::eInDataManipulation, false, false, false );
187	else	187	else
188	_xSourceObject->getPropertyValue(PROPERTY_NAME) >>= m_sSourceName;	188	_xSourceObject->getPropertyValue(PROPERTY_NAME) >>= m_sSourceName;
189	if ( m_xSourceConnection == m_xConnection )
190	{
191	Reference<XTablesSupplier> xSup(m_xConnection,UNO_QUERY_THROW);
192	m_sName = ::dbtools::createUniqueName(xSup->getTables(),m_sSourceName,sal_False);
193	}
194	else
195	m_sName = m_sSourceName;
196	}	189	}
		190
		191	if ( m_xSourceConnection == m_xConnection )
		192	{
		193	Reference<XTablesSupplier> xSup(m_xConnection,UNO_QUERY_THROW);
		194	m_sName = ::dbtools::createUniqueName(xSup->getTables(),m_sSourceName,sal_False);
		195	}
		196	else
		197	m_sName = m_sSourceName;
197	}	198	}
198	catch(const Exception&)	199	catch(const Exception&)
199	{	200	{
200	m_sName = m_sSourceName;	201	m_sName = m_sSourceName;
201	}	202	}
		203
202	}	204	}
203	// -----------------------------------------------------------------------------	205	// -----------------------------------------------------------------------------
204	OCopyTableWizard::OCopyTableWizard(Window * pParent,	206	OCopyTableWizard::OCopyTableWizard(Window * pParent,
Lines 1203-1206 Link Here
1203	aMsg.Execute();	1205	aMsg.Execute();
1204	}	1206	}
1205	// -----------------------------------------------------------------------------	1207	// -----------------------------------------------------------------------------
		1208	//------dyf add
		1209	void OCopyTableWizard::ResetsName(const ::rtl::OUString & _sName)
		1210	{
		1211	if ( _sName.getLength() != 0 )
		1212	m_sName = _sName;
1206		1213
		1214	}
		1215	//------dyf add end
		1216	//-------------------------------------------------------------------------------