summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-09-06 12:25:40 +0000
committerKurt Zenker <kz@openoffice.org>2007-09-06 12:25:40 +0000
commit0b0f89c67573848ff38b787b50dc517953bbbbc3 (patch)
tree719955035516bc785dc05d4c0698f2f24716d06f
parentf013e5f0df707b29749bea986dfc66881a894b36 (diff)
INTEGRATION: CWS mingwport06 (1.48.98); FILE MERGED
2007/08/24 13:22:11 vg 1.48.98.1: #i75499# pragma is for MSVC
-rw-r--r--svx/source/items/frmitems.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 0d078caeca02..3abcbd0f50d6 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: frmitems.cxx,v $
*
- * $Revision: 1.48 $
+ * $Revision: 1.49 $
*
- * last change: $Author: hr $ $Date: 2007-06-27 18:27:47 $
+ * last change: $Author: kz $ $Date: 2007-09-06 13:25:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -3469,7 +3469,7 @@ void SvxLineItem::SetLine( const SvxBorderLine* pNew )
pLine = pNew ? new SvxBorderLine( *pNew ) : 0;
}
-#ifdef WNT
+#ifdef _MSC_VER
#pragma optimize ( "", off )
#endif
@@ -4440,7 +4440,7 @@ CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const
return pItem;
}
-#ifdef WNT
+#ifdef _MSC_VER
#pragma optimize ( "", on )
#endif
/* -----------------------------16.08.2002 09:18------------------------------