Only in dbaccess/inc: AutoControls.hrc
Only in dbaccess: misc
diff -ru dbaccess.bak/source/sdbtools/connection/objectnames.cxx dbaccess/source/sdbtools/connection/objectnames.cxx
--- dbaccess.bak/source/sdbtools/connection/objectnames.cxx 2007-07-23 15:30:28.000000000 +0800
+++ dbaccess/source/sdbtools/connection/objectnames.cxx 2007-05-18 11:12:48.000000000 +0800
@@ -235,8 +235,11 @@
|| ( _rName.indexOf( (sal_Unicode)39 ) >= 0 ) // '
|| ( _rName.indexOf( (sal_Unicode)96 ) >= 0 ) // `
|| ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) // ‘
+
|| ( _rName.indexOf( (sal_Unicode)146 ) >= 0 ) // ’
+
|| ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // ´
+
)
return false;
return true;
diff -ru dbaccess.bak/source/ui/app/AppController.cxx dbaccess/source/ui/app/AppController.cxx
--- dbaccess.bak/source/ui/app/AppController.cxx 2007-07-23 15:30:24.000000000 +0800
+++ dbaccess/source/ui/app/AppController.cxx 2007-07-10 16:44:40.000000000 +0800
@@ -957,11 +957,32 @@
{
TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(getView()));
ElementType eType = getContainer()->getElementType();
+
switch( eType )
{
case E_TABLE:
- m_aTableCopyHelper.pasteTable( aTransferData , getDatabaseName(), ensureConnection() );
+ {
+ //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) );
@@ -981,6 +1002,7 @@
)
sFolderNameToInsertInto = *aList.begin();
}
+
paste( eType,OComponentTransferable::extractComponentDescriptor(aTransferData),sFolderNameToInsertInto );
}
break;
diff -ru dbaccess.bak/source/ui/app/AppDetailView.cxx dbaccess/source/ui/app/AppDetailView.cxx
--- dbaccess.bak/source/ui/app/AppDetailView.cxx 2007-07-23 15:30:24.000000000 +0800
+++ dbaccess/source/ui/app/AppDetailView.cxx 2007-07-10 13:12:10.000000000 +0800
@@ -632,7 +632,7 @@
m_pControlHelper->createTablesPage(_xConnection);
- TResourceStruct aList;
+ TResourceStruct aList;
aList.reserve(4);
aList.push_back( TResourceStruct::value_type(ModuleRes(RID_STR_NEW_TABLE),TResourcePair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")),RID_STR_TABLES_HELP_TEXT_DESIGN)));
aList.push_back( TResourceStruct::value_type(ModuleRes(RID_STR_NEW_TABLE_AUTO),TResourcePair(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTableAutoPilot")),RID_STR_TABLES_HELP_TEXT_WIZARD)));
diff -ru dbaccess.bak/source/ui/app/window_layout.txt dbaccess/source/ui/app/window_layout.txt
--- dbaccess.bak/source/ui/app/window_layout.txt 2007-07-23 15:30:26.000000000 +0800
+++ dbaccess/source/ui/app/window_layout.txt 2006-01-04 00:17:10.000000000 +0800
@@ -1,31 +1,31 @@
-(still unfinished)
-
-OApplicationView
-|
-+-OAppBorderWindow
- |
- +-OTitleWindow "Database"
- | |
- | +-OApplicationSwapWindow
- | |
- | +-OApplicationIconControl
- |
- +-OApplicationDetailView
- |
- +-OTitleWindow "Tasks"
- | |
- | +-OTasksWindow
- | |
- | +-OCreationList
- |
- +-OTitleWindow "Forms" "Tables" "Queries" "Reports"
- |
- +-OAppDetailPageHelper
- |
- +-SvTreeListBox*
- |
- +-FixedLine
- |
- +-Window (Border)
- |
- +-OPreviewWindow
+(still unfinished)
+
+OApplicationView
+|
++-OAppBorderWindow
+ |
+ +-OTitleWindow "Database"
+ | |
+ | +-OApplicationSwapWindow
+ | |
+ | +-OApplicationIconControl
+ |
+ +-OApplicationDetailView
+ |
+ +-OTitleWindow "Tasks"
+ | |
+ | +-OTasksWindow
+ | |
+ | +-OCreationList
+ |
+ +-OTitleWindow "Forms" "Tables" "Queries" "Reports"
+ |
+ +-OAppDetailPageHelper
+ |
+ +-SvTreeListBox*
+ |
+ +-FixedLine
+ |
+ +-Window (Border)
+ |
+ +-OPreviewWindow
diff -ru dbaccess.bak/source/ui/inc/DExport.hxx dbaccess/source/ui/inc/DExport.hxx
--- dbaccess.bak/source/ui/inc/DExport.hxx 2007-07-23 15:30:10.000000000 +0800
+++ dbaccess/source/ui/inc/DExport.hxx 2007-06-21 17:17:02.000000000 +0800
@@ -122,7 +122,10 @@
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory;
SvNumberFormatter* m_pFormatter;
-
+ //dyf add 2006/06/01
+ //for save the selected tablename
+ ::rtl::OUString m_sDefaultTableName;
+ //dyf add end
String m_sTextToken; // Zellen Inhalt
String m_sNumToken; /// SDNUM value
String m_sValToken; /// SDVAL value
@@ -184,6 +187,11 @@
sal_Bool _bAutoIncrementEnabled);
void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap);
+
+ //dyf add 20070601
+ inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; }
+ //dyf add end
+
virtual void release() = 0;
void enableCheckOnly() { m_bCheckOnly = sal_True; }
diff -ru dbaccess.bak/source/ui/inc/TableCopyHelper.hxx dbaccess/source/ui/inc/TableCopyHelper.hxx
--- dbaccess.bak/source/ui/inc/TableCopyHelper.hxx 2007-07-23 15:30:12.000000000 +0800
+++ dbaccess/source/ui/inc/TableCopyHelper.hxx 2007-07-06 16:22:14.000000000 +0800
@@ -69,7 +69,8 @@
{
ElementType eEntryType;
sal_Bool bQueryDrop;
- TAppSupportedSotFunctor(const ElementType& _eEntryType,sal_Bool _bQueryDrop)
+
+ TAppSupportedSotFunctor(const ElementType& _eEntryType,sal_Bool _bQueryDrop)
: eEntryType(_eEntryType)
, bQueryDrop(_bQueryDrop)
{
@@ -95,11 +96,18 @@
class OTableCopyHelper
{
OGenericUnoController* m_pController;
+ private:
+ ::rtl::OUString m_sDefaultTableName;
+ sal_Bool m_bSelectCopyTable;
public:
// is needed to describe the drop target
struct DropDescriptor
{
::svx::ODataAccessDescriptor aDroppedData;
+ //dyf add 20070601
+ //for transfor the tablename
+ ::rtl::OUString sDefaultTableName;
+ //dyf add end
String aUrl;
SotStorageStreamRef aHtmlRtfStorage;
ElementType nType;
@@ -113,6 +121,7 @@
OTableCopyHelper(OGenericUnoController* _pControler);
+
/** pastes a table into the data source
@param _rPasteData
The data helper.
@@ -122,6 +131,7 @@
void pasteTable( const TransferableDataHelper& _rTransData
,const ::rtl::OUString& _sDestDataSourceName
,const SharedConnection& _xConnection);
+ //,const ::rtl::OUString& _sDefaultTableName = ::rtl::OUString());/*dyf add parameter for past the selected tablename*/
/** pastes a table into the data source
@param _nFormatId
@@ -135,6 +145,7 @@
,const TransferableDataHelper& _rTransData
,const ::rtl::OUString& _sDestDataSourceName
,const SharedConnection& _xConnection);
+ //,const ::rtl::OUString& _sDefaultTableName = ::rtl::OUString());/*dyf add parameter for past the selected tablename*/
/** pastes a table into the data source
@param _rPasteData
@@ -145,6 +156,8 @@
void pasteTable( ::svx::ODataAccessDescriptor& _rPasteData
,const ::rtl::OUString& _sDestDataSourceName
,const SharedConnection& _xDestConnection);
+ //,const ::rtl::OUString& _sDefaultTableName = ::rtl::OUString());/*dyf add parameter for past the selected tablename*/
+
/** insert a table into the data source. The source can eihter be a table or a query
@param _nCommandType
@@ -212,6 +225,14 @@
/// returns if the clipboard supports a table format, otherwise .
sal_Bool isTableFormat(const TransferableDataHelper& _rClipboard) const;
+
+ //dyf add 20070601
+ inline void SetDefaultTableName(const ::rtl::OUString &_sDefaultTableName){ m_sDefaultTableName = _sDefaultTableName ; }
+ inline ::rtl::OUString GetDefaultTableName() const { return m_sDefaultTableName ;}
+
+ inline sal_Bool SetIsSelectCopytable(sal_Bool isSelect){ m_bSelectCopyTable = isSelect;}
+ sal_Bool GetIsSelectCopytable(){ return m_bSelectCopyTable; }
+ //dyf add end
};
//........................................................................
diff -ru dbaccess.bak/source/ui/inc/TokenWriter.hxx dbaccess/source/ui/inc/TokenWriter.hxx
--- dbaccess.bak/source/ui/inc/TokenWriter.hxx 2007-07-23 15:30:14.000000000 +0800
+++ dbaccess/source/ui/inc/TokenWriter.hxx 2007-06-21 13:19:26.000000000 +0800
@@ -119,6 +119,10 @@
SharedModel m_aKeepModelAlive;
::rtl::OUString m_sName;
+ //dyf add 20070601
+ //for transfor the tablename
+ ::rtl::OUString m_sDefaultTableName;
+ //dyf add end
::rtl::OUString m_sDataSourceName;
sal_Int32 m_nCommandType;
@@ -150,6 +154,11 @@
public:
void setStream(SvStream* _pStream){ m_pStream = _pStream; }
+ //dyf add 20070601
+ //for set the tablename
+ void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; }
+ //dyf add end
+
virtual BOOL Write() = 0; // Export
virtual BOOL Read() = 0; // Import
diff -ru dbaccess.bak/source/ui/inc/WCPage.hxx dbaccess/source/ui/inc/WCPage.hxx
--- dbaccess.bak/source/ui/inc/WCPage.hxx 2007-07-23 15:30:14.000000000 +0800
+++ dbaccess/source/ui/inc/WCPage.hxx 2007-07-23 16:48:10.000000000 +0800
@@ -92,6 +92,9 @@
DECL_LINK( KeyClickHdl, Button* );
sal_Bool checkAppendData();
+ //--------dyf add
+ void SetAppendDataRadio();
+ //--------add end
public:
virtual void Reset();
@@ -99,7 +102,7 @@
virtual BOOL LeavePage();
virtual String GetTitle() const ;
- OCopyTable( Window * pParent, EImportMode atWhat, BOOL bIsView, OCopyTableWizard::Wizard_Create_Style nLastAction );
+ OCopyTable( Window * pParent, EImportMode atWhat, BOOL bIsView );//, OCopyTableWizard::Wizard_Create_Style nLastAction );
virtual ~OCopyTable();
inline BOOL IsOptionDefData() const { return m_aRB_DefData.IsChecked(); }
@@ -107,6 +110,10 @@
inline BOOL IsOptionAppendData() const { return m_aRB_AppendData.IsChecked(); }
inline BOOL IsOptionView() const { return m_aRB_View.IsChecked(); }
String GetKeyName() const { return m_edKeyName.GetText(); }
+
+ //--------dyf add 2007/7/10
+ void setCreateStyleAction();//const OCopyTableWizard::Wizard_Create_Style& _eStyle
+ //--------add end
};
}
#endif // DBAUI_WIZARD_CPAGE_HXX
diff -ru dbaccess.bak/source/ui/inc/WCopyTable.hxx dbaccess/source/ui/inc/WCopyTable.hxx
--- dbaccess.bak/source/ui/inc/WCopyTable.hxx 2007-07-23 15:30:14.000000000 +0800
+++ dbaccess/source/ui/inc/WCopyTable.hxx 2007-07-11 10:19:02.000000000 +0800
@@ -327,6 +327,10 @@
void showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName);
void removeColumnNameFromNameMap(const ::rtl::OUString& _sName);
+
+ //dyf add
+ void ResetsName(const ::rtl::OUString & _sName);
+ //dyf add end
};
}
diff -ru dbaccess.bak/source/ui/misc/DExport.cxx dbaccess/source/ui/misc/DExport.cxx
--- dbaccess.bak/source/ui/misc/DExport.cxx 2007-07-23 15:30:06.000000000 +0800
+++ dbaccess/source/ui/misc/DExport.cxx 2007-07-23 16:20:24.000000000 +0800
@@ -765,14 +765,25 @@
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 = new OCopyTable(&aWizard,COPY, sal_False,OCopyTableWizard::WIZARD_DEF_DATA);
+ 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);
diff -ru dbaccess.bak/source/ui/misc/HtmlReader.cxx dbaccess/source/ui/misc/HtmlReader.cxx
--- dbaccess.bak/source/ui/misc/HtmlReader.cxx 2007-07-23 15:30:06.000000000 +0800
+++ dbaccess/source/ui/misc/HtmlReader.cxx 2007-06-05 14:02:02.000000000 +0800
@@ -541,6 +541,7 @@
{
DBG_CHKTHIS(OHTMLReader,NULL);
String aTempName(ModuleRes(STR_TBL_TITLE));
+
aTempName = aTempName.GetToken(0,' ');
aTempName = String(::dbtools::createUniqueName(m_xTables,::rtl::OUString(aTempName )));
diff -ru dbaccess.bak/source/ui/misc/TableCopyHelper.cxx dbaccess/source/ui/misc/TableCopyHelper.cxx
--- dbaccess.bak/source/ui/misc/TableCopyHelper.cxx 2007-07-23 15:30:06.000000000 +0800
+++ dbaccess/source/ui/misc/TableCopyHelper.cxx 2007-07-20 12:46:38.000000000 +0800
@@ -443,6 +443,7 @@
{
}
// -----------------------------------------------------------------------------
+
void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId
,const TransferableDataHelper& _rTransData
,const ::rtl::OUString& _sDestDataSourceName
@@ -468,6 +469,10 @@
aTrans.nType = E_TABLE;
aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId || SOT_FORMATSTR_ID_HTML_SIMPLE == _nFormatId;
+ ///dyf add 20070601
+ //add for transfor the selected tablename
+ aTrans.sDefaultTableName = GetDefaultTableName();
+ //dyf add end
if ( !copyTagTable(aTrans,sal_False,_xConnection) )
m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any()));
}
@@ -509,7 +514,7 @@
sSrcDataSourceName = _rPasteData.getDataSource();
_rPasteData[daCommand] >>= sCommand;
- if ( _rPasteData.has(daConnection) )
+ if ( _rPasteData.has(daConnection) )
_rPasteData[daConnection] >>= xSrcConnection;
if ( _rPasteData.has(daSelection) )
_rPasteData[daSelection] >>= aSelection;
@@ -610,9 +615,21 @@
_xDestConnection,
getNumberFormatter(_xDestConnection,m_pController->getORB()),
m_pController->getORB());
+
+ //--------dyf modify 2006/6/27
aWizard.fillTypeInfo();
aWizard.loadData();
- OCopyTable* pPage1 = new OCopyTable(&aWizard,COPY, bIsView,OCopyTableWizard::WIZARD_DEF_DATA);
+ if(GetIsSelectCopytable())
+ {
+ aWizard.ResetsName( GetDefaultTableName());
+ aWizard.setCreateStyle(OCopyTableWizard::WIZARD_APPEND_DATA);
+ }
+
+ OCopyTable* pPage1;
+ pPage1 = new OCopyTable(&aWizard,COPY, bIsView);
+ pPage1->setCreateStyleAction();
+
+ //--------dyf modify end
OWizNameMatching* pPage2 = new OWizNameMatching(&aWizard);
OWizColumnSelect* pPage3 = new OWizColumnSelect(&aWizard);
OWizNormalExtend* pPage4 = new OWizNormalExtend(&aWizard);
@@ -747,6 +764,10 @@
if ( _bCheck )
pImport->enableCheckOnly();
+ //dyf add 20070601
+ //set the selected tablename
+ pImport->setSTableName(_rDesc.sDefaultTableName);
+ //dyf add end
pImport->setStream(pStream);
return pImport->Read();
}
diff -ru dbaccess.bak/source/ui/misc/TokenWriter.cxx dbaccess/source/ui/misc/TokenWriter.cxx
--- dbaccess.bak/source/ui/misc/TokenWriter.cxx 2007-07-23 15:30:06.000000000 +0800
+++ dbaccess/source/ui/misc/TokenWriter.cxx 2007-06-21 13:19:26.000000000 +0800
@@ -740,6 +740,9 @@
((OHTMLReader*)m_pReader)->AddRef();
if ( isCheckEnabled() )
m_pReader->enableCheckOnly();
+ //dyf add 20070601
+ m_pReader->SetTableName(m_sDefaultTableName);
+ //dyf add end
eState = ((OHTMLReader*)m_pReader)->CallParser();
m_pReader->release();
m_pReader = NULL;
diff -ru dbaccess.bak/source/ui/misc/WCPage.cxx dbaccess/source/ui/misc/WCPage.cxx
--- dbaccess.bak/source/ui/misc/WCPage.cxx 2007-07-23 15:30:06.000000000 +0800
+++ dbaccess/source/ui/misc/WCPage.cxx 2007-07-23 16:47:26.000000000 +0800
@@ -102,7 +102,9 @@
//========================================================================
DBG_NAME(OCopyTable)
//------------------------------------------------------------------------
-OCopyTable::OCopyTable( Window * pParent, EImportMode atWhat, sal_Bool bIsView, OCopyTableWizard::Wizard_Create_Style nLastAction )
+//--------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, ResId( FT_TABLENAME ) ),
m_edTableName( this, ResId( ET_TABLENAME ) ),
@@ -170,28 +172,6 @@
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 ) );
@@ -232,14 +212,21 @@
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;
+ //m_pParent->setCreateStyle(OCopyTableWizard::WIZARD_APPEND_DATA);
}
+
+//--------add end
//------------------------------------------------------------------------
IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
{
@@ -260,6 +247,7 @@
return 0;
}
+
//------------------------------------------------------------------------
IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ )
{
@@ -420,3 +408,31 @@
return sal_True;
}
// -----------------------------------------------------------------------------
+//---dyf add 2006/7/10
+void OCopyTable::setCreateStyleAction()//const OCopyTableWizard::Wizard_Create_Style& _eStyle
+{
+ // reselect the last action before
+ switch(m_pParent->getCreateStyle())
+ {
+ 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);
+ SetAppendDataRadio();
+ 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);
+ }
+}
+//---add end
diff -ru dbaccess.bak/source/ui/misc/WCopyTable.cxx dbaccess/source/ui/misc/WCopyTable.cxx
--- dbaccess.bak/source/ui/misc/WCopyTable.cxx 2007-07-23 15:30:06.000000000 +0800
+++ dbaccess/source/ui/misc/WCopyTable.cxx 2007-07-11 10:20:06.000000000 +0800
@@ -173,9 +173,9 @@
{
DBG_CTOR(OCopyTableWizard,NULL);
construct();
- // Tabellennamen extrahieren
try
{
+ // Tabellennamen extrahieren
if ( m_xSourceObject.is() )
{
Reference xColSupp(m_xSourceObject,UNO_QUERY);
@@ -186,19 +186,21 @@
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 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 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,
@@ -1210,4 +1212,12 @@
aMsg.Execute();
}
// -----------------------------------------------------------------------------
+//------dyf add
+void OCopyTableWizard::ResetsName(const ::rtl::OUString & _sName)
+{
+ if ( _sName.getLength() != 0 )
+ m_sName = _sName;
+}
+//------dyf add end
+//-------------------------------------------------------------------------------
Only in dbaccess: wntmsci10.pro
Only in dbaccess: wntmsci10.pro.old
Only in dbaccess: wntmsci10.pro.release