diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:24:55 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:24:55 +0000 |
commit | 27b83ea523288e3aab61506966f736134e85e963 (patch) | |
tree | 8ba089617f71ca1d34050d98dcf9847b0ec12d50 /svx | |
parent | d4d8f7b0fd07c8e3c778cc36ea5a994a7f4ca6f4 (diff) |
INTEGRATION: CWS mingwport06 (1.41.90); FILE MERGED
2007/08/24 13:22:11 vg 1.41.90.1: #i75499# pragma is for MSVC
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/cfg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/dialog/cfg.cxx b/svx/source/dialog/cfg.cxx index 6f3ac3240f8b..21c020cd7ffe 100644 --- a/svx/source/dialog/cfg.cxx +++ b/svx/source/dialog/cfg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cfg.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: rt $ $Date: 2007-07-03 14:04:08 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:24:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -171,7 +171,7 @@ static const char __FAR_DATA pSeparatorStr[] = "----------------------------------"; static const char __FAR_DATA pMenuSeparatorStr[] = " | "; -#ifdef MSC +#ifdef _MSC_VER #pragma warning (disable:4355) #endif |