diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:16:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:16:34 +0000 |
| commit | b5fa1d509e29d8a6db39f6e4a618a659d4972d0b (patch) | |
| tree | 3fcb86d7d71f5ed817c1a69814b00ad9df4b81a0 /shell/source/backends/localebe | |
| parent | 99c6dd34deef0ccbe8386996576cfdec5174e048 (diff) | |
INTEGRATION: CWS warnings01 (1.5.8); FILE MERGED
2006/03/10 15:10:57 pl 1.5.8.4: #i55991# removed warnings for windows platform
2006/01/25 18:00:52 sb 1.5.8.3: RESYNC: (1.7-1.8); FILE MERGED
2005/11/07 17:03:08 pl 1.5.8.2: RESYNC: (1.5-1.7); FILE MERGED
2005/10/26 15:08:16 pl 1.5.8.1: #i55991# remove warnings for solaris platform
Diffstat (limited to 'shell/source/backends/localebe')
| -rw-r--r-- | shell/source/backends/localebe/localebackend.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 9314de17be42..f0b7b7a5a5fe 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -4,9 +4,9 @@ * * $RCSfile: localebackend.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2005-11-16 10:15:55 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:16:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -210,7 +210,13 @@ namespace /* private */ #endif #define WINVER 0x0501 +#if defined _MSC_VER +#pragma warning(push, 1) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning(pop) +#endif rtl::OUString ImplGetLocale(LCID lcid) { @@ -305,11 +311,12 @@ rtl::OUString LocaleBackend::createTimeStamp() //------------------------------------------------------------------------------ uno::Reference<backend::XLayer> SAL_CALL LocaleBackend::getLayer( - const rtl::OUString& aComponent, const rtl::OUString& aTimestamp) + const rtl::OUString& aComponent, const rtl::OUString& /*aTimestamp*/) throw (backend::BackendAccessException, lang::IllegalArgumentException) { - if( aComponent.equals( getSupportedComponents()[0]) ) + uno::Sequence<rtl::OUString> aComps( getSupportedComponents() ); + if( aComponent.equals( aComps[0]) ) { if( ! m_xSystemLayer.is() ) { @@ -342,7 +349,7 @@ uno::Reference<backend::XLayer> SAL_CALL LocaleBackend::getLayer( //------------------------------------------------------------------------------ uno::Reference<backend::XUpdatableLayer> SAL_CALL -LocaleBackend::getUpdatableLayer(const rtl::OUString& aComponent) +LocaleBackend::getUpdatableLayer(const rtl::OUString& /*aComponent*/) throw (backend::BackendAccessException,lang::NoSupportException, lang::IllegalArgumentException) { @@ -350,8 +357,6 @@ LocaleBackend::getUpdatableLayer(const rtl::OUString& aComponent) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocaleBackend: No Update Operation allowed, Read Only access") ), *this) ; - - return NULL; } //------------------------------------------------------------------------------ |