diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:25:10 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:25:10 +0000 |
| commit | 29fa13a4c234a4fe6266f22160a339eb974cd808 (patch) | |
| tree | 588f352b6f019f66b90c642779e6b13dc85645e4 /svx | |
| parent | 27b83ea523288e3aab61506966f736134e85e963 (diff) | |
INTEGRATION: CWS mingwport06 (1.15.98); FILE MERGED
2007/08/27 14:30:15 vg 1.15.98.1: #i75499# pragma for MSVC
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/swpossizetabpage.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/dialog/swpossizetabpage.cxx b/svx/source/dialog/swpossizetabpage.cxx index 1c639343351b..fad36921c83e 100644 --- a/svx/source/dialog/swpossizetabpage.cxx +++ b/svx/source/dialog/swpossizetabpage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: swpossizetabpage.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2007-06-27 17:43:27 $ + * last change: $Author: kz $ $Date: 2007-09-06 13:25:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -565,7 +565,7 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap, -----------------------------------------------------------------------*/ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ), -#ifdef WNT +#ifdef _MSC_VER #pragma warning (disable : 4355) #endif m_aSizeFL( this, SVX_RES( FL_SIZE ) ), @@ -606,7 +606,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rIn m_aFollowCB( this, SVX_RES( CB_FOLLOW ) ), m_aExampleWN( this, SVX_RES( WN_EXAMPLE ) ), -#ifdef WNT +#ifdef _MSC_VER #pragma warning (default : 4355) #endif m_pVMap( 0 ), |