diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:16:33 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 02:16:33 +0000 |
| commit | 3dd087243caf1e239f8e7cfd4f60494659513c87 (patch) | |
| tree | e67e8058b870be67d8c6a292d8f485078126a71a | |
| parent | fc73a295e96558b5b3ffc14ecfe15ce12a197480 (diff) | |
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)
| -rw-r--r-- | dbaccess/source/ui/inc/charsets.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 6bafbd246..c4bdcee5a 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -4,9 +4,9 @@ * * $RCSfile: charsets.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:45:14 $ + * last change: $Author: hr $ $Date: 2006-06-20 03:16:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,13 +74,10 @@ namespace dbaui 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 @@ namespace dbaui protected: virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; + + private: + using OCharsetDisplay_Base::find; }; //------------------------------------------------------------------------- |