User: hr Date: 06/06/19 20:16:36 Modified: /dba/dbaccess/source/ui/inc/ charsets.hxx
Log: INTEGRATION: CWS warnings01 (1.6.50); FILE MERGED 2006/06/01 07:21:16 fs 1.6.50.2: #i10000# renamed the find methods to findFoo, removed using Base::find 2006/03/24 15:36:18 fs 1.6.50.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: charsets.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/charsets.hxx?r1=1.6&r2=1.7 Delta lines: +6 -6 ------------------- --- charsets.hxx 8 Sep 2005 15:45:14 -0000 1.6 +++ charsets.hxx 20 Jun 2006 03:16:33 -0000 1.7 @@ -74,13 +74,10 @@ OCharsetDisplay(); - struct IANA { }; - struct Display { }; - // various find operations - const_iterator find(const rtl_TextEncoding _eEncoding) const; - const_iterator find(const ::rtl::OUString& _rIanaName, const IANA&) const; - const_iterator find(const ::rtl::OUString& _rDisplayName, const Display&) const; + const_iterator findEncoding(const rtl_TextEncoding _eEncoding) const; + const_iterator findIanaName(const ::rtl::OUString& _rIanaName) const; + const_iterator findDisplayName(const ::rtl::OUString& _rDisplayName) const; /// get access to the first element of the charset collection const_iterator begin() const; @@ -91,6 +88,9 @@ protected: virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; + + private: + using OCharsetDisplay_Base::find; }; //------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
