diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:10:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:10:21 +0000 |
| commit | a577d84ff581ebfae91fa1a7d59418e40eb94b7b (patch) | |
| tree | 1109cea891c2a00f224d4bd25d90d14412fe76f2 /setup_native/source | |
| parent | 5d5d6895c7c96a873d31a8ce942939a17537ad75 (diff) | |
INTEGRATION: CWS mingwport03 (1.3.22); FILE MERGED
2006/11/08 14:57:10 vg 1.3.22.2: RESYNC: (1.3-1.4); FILE MERGED
2006/09/18 15:19:09 vg 1.3.22.1: #i53572# MinGW port
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx index 9de5e0496c99..966402b76963 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: registrywnt.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2006-09-25 13:06:53 $ + * last change: $Author: vg $ $Date: 2007-03-26 14:10:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -188,7 +188,7 @@ StringListPtr RegistryKeyImplWinNT::GetSubKeyNames() const else if (ERROR_NO_MORE_ITEMS != rc && ERROR_SUCCESS != rc) throw RegistryException(rc); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) return key_names; #else return (StringListPtr) key_names; @@ -229,7 +229,7 @@ StringListPtr RegistryKeyImplWinNT::GetSubValueNames() const else if (ERROR_NO_MORE_ITEMS != rc && ERROR_SUCCESS != rc) throw RegistryException(rc); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) return value_names; #else return (StringListPtr) value_names; @@ -309,7 +309,7 @@ RegistryValue RegistryKeyImplWinNT::GetValue(const std::wstring& Name, const Reg if (ERROR_FILE_NOT_FOUND == rc) { - #if (_MSC_VER < 1300) + #if (_MSC_VER < 1300) && !defined(__MINGW32__) return Default; #else RegistryValue regval_ptr; |