User: ihi Date: 2006/10/18 06:11:05 Modified: dba/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
Log: INTEGRATION: CWS dba205b (1.14.78); FILE MERGED 2006/08/09 19:52:38 fs 1.14.78.1: refactored the OColumnAlias class, in preparation of fixing #b6248060# File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: MQuery.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx?r1=1.14&r2=1.15 Delta lines: +62 -64 --------------------- --- MQuery.hxx 29 Mar 2006 12:19:19 -0000 1.14 +++ MQuery.hxx 18 Oct 2006 13:11:02 -0000 1.15 @@ -168,7 +168,7 @@ }; - // + class MQuery : public ErrorResourceAccess { /* @@ -223,8 +223,7 @@ sal_Int32 m_nMaxNrOfReturns; sal_Bool m_bQuerySubDirs; MQueryExpression m_aExpr; - ::std::map< ::rtl::OUString, - ::rtl::OUString> m_aColumnAliasMap; + const OColumnAlias& m_rColumnAlias; mutable sal_Bool m_aErrorOccurred; ::com::sun::star::mozilla::MozillaProductType m_Product; ::rtl::OUString m_Profile; @@ -240,60 +239,59 @@ * - Contains accessors to the members of this class. * - executeQuery() initiates a non-blocking query. */ - sal_Int32 executeQuery(OConnection* _pCon); // + sal_Int32 executeQuery(OConnection* _pCon); sal_Int32 executeQueryProxied(OConnection* _pCon); //Used only by MNSMozabProxy sal_Int32 createNewCard(); //return Row count number - sal_Int32 deleteRow(const sal_Int32 rowIndex); // - sal_Int32 commitRow(const sal_Int32 rowIndex); // - sal_Bool resyncRow(sal_Int32 nDBRow); // + sal_Int32 deleteRow(const sal_Int32 rowIndex); + sal_Int32 commitRow(const sal_Int32 rowIndex); + sal_Bool resyncRow(sal_Int32 nDBRow); - sal_Bool isWritable(OConnection* _pCon); // + sal_Bool isWritable(OConnection* _pCon); - sal_uInt32 InsertLoginInfo(OConnection* _pCon); // + sal_uInt32 InsertLoginInfo(OConnection* _pCon); - void setAttributes( ::std::vector< ::rtl::OUString>&); // - const ::std::vector< ::rtl::OUString> &getAttributes(void) const; // + void setAttributes( ::std::vector< ::rtl::OUString>&); + const ::std::vector< ::rtl::OUString> &getAttributes(void) const; - void setAddressbook( ::rtl::OUString&); // - ::rtl::OUString getAddressbook(void) const; // + void setAddressbook( ::rtl::OUString&); + ::rtl::OUString getAddressbook(void) const; - const ::std::map< ::rtl::OUString,::rtl::OUString>& - getColumnAliasMap() const { return m_aColumnAliasMap; } + const OColumnAlias& getColumnAlias() const { return m_rColumnAlias; } void setExpression( MQueryExpression &_expr ); - void setMaxNrOfReturns( const sal_Int32); // - sal_Int32 getMaxNrOfReturns(void) const; // + void setMaxNrOfReturns( const sal_Int32); + sal_Int32 getMaxNrOfReturns(void) const; - void setQuerySubDirs( sal_Bool&); // - sal_Bool getQuerySubDirs(void) const; // + void setQuerySubDirs( sal_Bool&); + sal_Bool getQuerySubDirs(void) const; - sal_Int32 getRowCount( void ); // - sal_uInt32 getRealRowCount( void ); // - sal_Bool queryComplete( void ); // - sal_Bool waitForQueryComplete( void ); // - sal_Bool checkRowAvailable( sal_Int32 nDBRow );// + sal_Int32 getRowCount( void ); + sal_uInt32 getRealRowCount( void ); + sal_Bool queryComplete( void ); + sal_Bool waitForQueryComplete( void ); + sal_Bool checkRowAvailable( sal_Int32 nDBRow ); sal_Bool getRowValue( connectivity::ORowSetValue& rValue, sal_Int32 nDBRow, const rtl::OUString& aDBColumnName, - sal_Int32 nType ) const;// + sal_Int32 nType ) const; sal_Bool setRowValue( connectivity::ORowSetValue& rValue, sal_Int32 nDBRow, const rtl::OUString& aDBColumnName, - sal_Int32 nType ) const;// - sal_Int32 getRowStates(sal_Int32 nDBRow); // - sal_Bool setRowStates(sal_Int32 nDBRow,sal_Int32 aState); // + sal_Int32 nType ) const; + sal_Int32 getRowStates(sal_Int32 nDBRow); + sal_Bool setRowStates(sal_Int32 nDBRow,sal_Int32 aState); - sal_Bool errorOccurred() const // + sal_Bool errorOccurred() const { return m_aErrorOccurred; }; public: - MQuery(); // - MQuery(const ::std::map< ::rtl::OUString, ::rtl::OUString> &); // - virtual ~MQuery(); // - static MNameMapper* CreateNameMapper(); // - static void FreeNameMapper( MNameMapper* _ptr ); // +// MQuery(); + MQuery( const OColumnAlias& _ca ); + virtual ~MQuery(); + static MNameMapper* CreateNameMapper(); + static void FreeNameMapper( MNameMapper* _ptr ); }; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
