Tag: cws_src680_dba203c User: oj Date: 06/04/13 06:55:58 Modified: /dba/dbaccess/source/ui/inc/ DExport.hxx, HtmlReader.hxx, RtfReader.hxx, WCopyTable.hxx
Log: #i62797# format regconition corrected File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: DExport.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/DExport.hxx?r1=1.14&r2=1.14.52.1 Delta lines: +14 -5 -------------------- --- DExport.hxx 19 Jan 2006 15:42:16 -0000 1.14 +++ DExport.hxx 13 Apr 2006 13:55:55 -0000 1.14.52.1 @@ -4,9 +4,9 @@ * * $RCSfile: DExport.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.52.1 $ * - * last change: $Author: obo $ $Date: 2006/01/19 15:42:16 $ + * last change: $Author: oj $ $Date: 2006/04/13 13:55:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,6 +85,7 @@ }}}} class Window; +class SvNumberFormatter; namespace dbaui { class OFieldDescription; @@ -118,7 +119,11 @@ ::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; + SvNumberFormatter* m_pFormatter; + String m_sTextToken; // Zellen Inhalt + String m_sNumToken; /// SDNUM value + String m_sValToken; /// SDVAL value TOTypeInfoSP m_pTypeInfo; // contains the default type const TColumnVector* m_pColumnList; const OTypeInfoMap* m_pInfoMap; @@ -142,9 +147,12 @@ virtual OWizTypeSelect* createPage(Window* _pParent) = 0; void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); sal_Int32 CheckString(const String& aToken, sal_Int32 _nOldFormat); + void adjustFormat(); + void eraseTokens(); void insertValueIntoColumn(); sal_Bool createRowSet(); void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); + void ensureFormatter(); /** executeWizard calls a wizard to create/append data @param _sTableName the tablename @@ -169,8 +177,9 @@ const TPositions& _rColumnPositions, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, - const TColumnVector* rList = 0, - const OTypeInfoMap* _pInfoMap = 0); + const TColumnVector* rList, + const OTypeInfoMap* _pInfoMap, + sal_Bool _bAutoIncrementEnabled); void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap); virtual void release() = 0; File [changed]: HtmlReader.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/HtmlReader.hxx?r1=1.10&r2=1.10.52.1 Delta lines: +7 -5 ------------------- --- HtmlReader.hxx 19 Jan 2006 15:42:33 -0000 1.10 +++ HtmlReader.hxx 13 Apr 2006 13:55:55 -0000 1.10.52.1 @@ -4,9 +4,9 @@ * * $RCSfile: HtmlReader.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.52.1 $ * - * last change: $Author: obo $ $Date: 2006/01/19 15:42:33 $ + * last change: $Author: oj $ $Date: 2006/04/13 13:55:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,6 +78,7 @@ sal_Int16 GetWidthPixel( const HTMLOption* pOption ); rtl_TextEncoding GetEncodingByMIME( const String& rMime ); void setTextEncoding(); + void fetchOptions(); ~OHTMLReader(); public: OHTMLReader(SvStream& rIn, @@ -92,8 +93,9 @@ const TPositions &_rColumnPositions, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, - const TColumnVector* rList = 0, - const OTypeInfoMap* _pInfoMap = 0); + const TColumnVector* rList, + const OTypeInfoMap* _pInfoMap, + sal_Bool _bAutoIncrementEnabled); virtual SvParserState CallParser();// Basisklasse virtual void release(); File [changed]: RtfReader.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/RtfReader.hxx?r1=1.8&r2=1.8.104.1 Delta lines: +6 -5 ------------------- --- RtfReader.hxx 23 Sep 2005 12:33:38 -0000 1.8 +++ RtfReader.hxx 13 Apr 2006 13:55:55 -0000 1.8.104.1 @@ -4,9 +4,9 @@ * * $RCSfile: RtfReader.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.8.104.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:33:38 $ + * last change: $Author: oj $ $Date: 2006/04/13 13:55:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,8 +78,9 @@ const TPositions &_rColumnPositions, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, - const TColumnVector* rList = 0, - const OTypeInfoMap* _pInfoMap = 0); + const TColumnVector* rList, + const OTypeInfoMap* _pInfoMap, + sal_Bool _bAutoIncrementEnabled); virtual SvParserState CallParser();// Basisklasse virtual void release(); File [changed]: WCopyTable.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/WCopyTable.hxx?r1=1.19&r2=1.19.52.1 Delta lines: +5 -3 ------------------- --- WCopyTable.hxx 19 Jan 2006 15:42:49 -0000 1.19 +++ WCopyTable.hxx 13 Apr 2006 13:55:55 -0000 1.19.52.1 @@ -4,9 +4,9 @@ * * $RCSfile: WCopyTable.hxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.19.52.1 $ * - * last change: $Author: obo $ $Date: 2006/01/19 15:42:49 $ + * last change: $Author: oj $ $Date: 2006/04/13 13:55:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -320,6 +320,8 @@ // displays a error message that a column type is not supported void showColumnTypeNotSupported(const ::rtl::OUString& _rColumnName); + + void removeColumnNameFromNameMap(const ::rtl::OUString& _sName); }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
