diff options
| -rw-r--r-- | dbaccess/source/ui/inc/DExport.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/TableCopyHelper.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/TokenWriter.hxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/WCPage.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/TableCopyHelper.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 2 |
6 files changed, 6 insertions, 15 deletions
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 34ff81b93..8a68652e0 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -165,10 +165,8 @@ namespace dbaui ); 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; diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 778739896..bedd9b261 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -81,10 +81,10 @@ namespace dbaui struct DropDescriptor { ::svx::ODataAccessDescriptor aDroppedData; - //dyf add 20070601 + //for transfor the tablename ::rtl::OUString sDefaultTableName; - //dyf add end + String aUrl; SotStorageStreamRef aHtmlRtfStorage; ElementType nType; diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index 9b5aa78eb..5001f73a9 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -84,10 +84,10 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; ::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; bool m_bNeedToReInitialize; @@ -121,10 +121,8 @@ namespace dbaui 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(); // Export virtual BOOL Read(); // Import diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index c683e6b32..10d9ed49b 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -70,9 +70,7 @@ namespace dbaui DECL_LINK( KeyClickHdl, Button* ); sal_Bool checkAppendData(); - //--------dyf add void SetAppendDataRadio(); - //--------add end public: virtual void Reset(); diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index bf7d3855e..15e1e422a 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -266,10 +266,9 @@ sal_Bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc 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 --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index f57061bd9..ed1c3eac5 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -736,9 +736,7 @@ BOOL OHTMLImportExport::Read() ((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; |