diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
| -rw-r--r-- | dbaccess/source/ui/inc/TableCopyHelper.hxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/TokenWriter.hxx | 17 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dsmeta.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/sqlmessage.hxx | 14 |
4 files changed, 23 insertions, 13 deletions
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index bf60736df901..c0b5e77cc403 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -76,7 +76,6 @@ namespace dbaui { case SOT_FORMAT_RTF: // RTF data descriptions case SOT_FORMATSTR_ID_HTML: // HTML data descriptions - case SOT_FORMATSTR_ID_HTML_SIMPLE: // HTML data descriptions case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor return (E_TABLE == eEntryType); case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index c373cc835b40..2eb162a05020 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -93,15 +93,9 @@ namespace dbaui class ODatabaseImportExport : public ODatabaseImportExport_BASE { private: - void disposing(); void impl_initializeRowMember_throw(); protected: - typedef ::utl::SharedUNOComponent < ::com::sun::star::frame::XModel - , ::utl::CloseableComponent - > SharedModel; - - protected: ::com::sun::star::lang::Locale m_aLocale; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSelection; SvStream* m_pStream; @@ -114,7 +108,6 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xRowSetColumns; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory; - SharedModel m_aKeepModelAlive; ::rtl::OUString m_sName; //dyf add 20070601 @@ -123,6 +116,7 @@ namespace dbaui //dyf add end ::rtl::OUString m_sDataSourceName; sal_Int32 m_nCommandType; + bool m_bNeedToReInitialize; #if defined UNX static const char __FAR_DATA sNewLine; @@ -158,17 +152,18 @@ namespace dbaui void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; } //dyf add end - virtual BOOL Write() = 0; // Export - virtual BOOL Read() = 0; // Import + virtual BOOL Write(); // Export + virtual BOOL Read(); // Import void initialize(const ::svx::ODataAccessDescriptor& _aDataDescriptor); - - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + void dispose(); void enableCheckOnly() { m_bCheckOnly = sal_True; } sal_Bool isCheckEnabled() const { return m_bCheckOnly; } + private: + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); void impl_initFromDescriptor( const ::svx::ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit ); }; diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 174d42803086..88053668a4ed 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -109,6 +109,8 @@ namespace dbaui bool bFormsCheckRequiredFields; bool bIgnoreCurrency; bool bAutoIncrementIsPrimaryKey; + bool bEscapeDateTime; + // Note: If you extend this list, you need to adjust the ctor (of course) // and (maybe) the implementation of supportsAnySpecialSetting @@ -129,6 +131,7 @@ namespace dbaui ,bFormsCheckRequiredFields ( true ) ,bIgnoreCurrency ( false ) ,bAutoIncrementIsPrimaryKey ( false ) + ,bEscapeDateTime ( false ) { } @@ -156,6 +159,7 @@ namespace dbaui || ( bFormsCheckRequiredFields == true ) || ( bIgnoreCurrency == true ) || ( bAutoIncrementIsPrimaryKey == true ) + || ( bEscapeDateTime == true ) ; } diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 190cbbfe1d67..088ea8a1ac42 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -100,7 +100,7 @@ public: ); /** display a database related error message - <p/> + @param rTitle the title to display @param rMessage the detailed message to display @param _eType determines the image to use. AUTO is disallowed in this constructor version @@ -126,6 +126,18 @@ private: void impl_addDetailsButton(); }; +//================================================================== +// OSQLWarningBox +//================================================================== +class OSQLWarningBox : public OSQLMessageBox +{ +public: + OSQLWarningBox( Window* _pParent, + const UniString& _rMessage, + WinBits _nStyle = WB_OK | WB_DEF_OK, + const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); +}; + //......................................................................... } // namespace dbaui //......................................................................... |