Tag: cws_src680_kaddrbook User: ebischoff Date: 05/11/28 05:02:34 Modified: /dba/connectivity/source/drivers/kab/ korder.cxx, korder.hxx
Log: Dixed File Changes: Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: korder.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/korder.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +7 -7 ------------------- --- korder.cxx 28 Nov 2005 10:59:30 -0000 1.1.2.1 +++ korder.cxx 28 Nov 2005 13:02:31 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: korder.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: ebischoff $ $Date: 2005/11/28 10:59:30 $ + * last change: $Author: ebischoff $ $Date: 2005/11/28 13:02:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,11 +92,11 @@ } } // ----------------------------------------------------------------------------- -sal_Int8 KabSimpleOrder::compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const +sal_Int32 KabSimpleOrder::compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const { - sal_Bool result; + sal_Int32 result; - result = value(aAddressee1).compare(value(aAddressee2)); + result = QString::compare(value(aAddressee1), value(aAddressee2)); // Timestamps should be compared differently than with their string value if (!m_bAscending) result = -result; @@ -121,12 +121,12 @@ m_aOrders.push_back(pOrder); } // ----------------------------------------------------------------------------- -sal_Int8 KabComplexOrder::compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const +sal_Int32 KabComplexOrder::compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const { for (sal_uInt32 i = 0; i < m_aOrders.size(); i++) { const KabOrder *pOrder = m_aOrders[i]; - sal_Int8 result = pOrder->compare(aAddressee1, aAddressee2); + sal_Int32 result = pOrder->compare(aAddressee1, aAddressee2); if (result) return result; } File [changed]: korder.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/korder.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -5 ------------------- --- korder.hxx 28 Nov 2005 10:59:30 -0000 1.1.2.1 +++ korder.hxx 28 Nov 2005 13:02:31 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: korder.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: ebischoff $ $Date: 2005/11/28 10:59:30 $ + * last change: $Author: ebischoff $ $Date: 2005/11/28 13:02:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,7 @@ public: virtual ~KabOrder(); - virtual sal_Int8 compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const = 0; + virtual sal_Int32 compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const = 0; }; class KabSimpleOrder : public KabOrder @@ -92,7 +92,7 @@ public: KabSimpleOrder(::rtl::OUString &sColumnName, sal_Bool bAscending); - virtual sal_Int8 compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const; + virtual sal_Int32 compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const; }; class KabComplexOrder : public KabOrder @@ -104,7 +104,7 @@ virtual ~KabComplexOrder(); void addOrder(KabOrder *pOrder); - virtual sal_Int8 compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const; + virtual sal_Int32 compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const; }; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
