From c0a6743c2b39810cd585e6f3fd18f9e0212e2c55 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Thu, 27 Sep 2007 07:04:23 +0000
Subject: INTEGRATION: CWS swwarnings (1.10.566); FILE MERGED 2007/04/03
 12:57:06 tl 1.10.566.2: #i69287# warning-free code 2007/02/27 13:06:34 tl
 1.10.566.1: #i69287# warning-free code

---
 sw/inc/grfatr.hxx | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'sw/inc/grfatr.hxx')

diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 6055f5540229..9e1f00de2c46 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: grfatr.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: obo $ $Date: 2006-01-19 18:15:59 $
+ *  last change: $Author: hr $ $Date: 2007-09-27 08:04:23 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -66,14 +66,14 @@
  *  class SwMirrorGrf
  ******************************************************************************/
 
-enum GRFMIRROR
+enum MirrorGraph
 {
-RES_GRFMIRROR_BEGIN,
-    RES_DONT_MIRROR_GRF = RES_GRFMIRROR_BEGIN,
-    RES_MIRROR_GRF_VERT,
-    RES_MIRROR_GRF_HOR,
-    RES_MIRROR_GRF_BOTH,
-RES_GRFMIRROR_END
+RES_MIRROR_GRAPH_BEGIN,
+    RES_MIRROR_GRAPH_DONT = RES_MIRROR_GRAPH_BEGIN,
+    RES_MIRROR_GRAPH_VERT,
+    RES_MIRROR_GRAPH_HOR,
+    RES_MIRROR_GRAPH_BOTH,
+RES_MIRROR_GRAPH_END
 };
 
 class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem
@@ -81,8 +81,8 @@ class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem
     BOOL bGrfToggle; // auf geraden Seiten Grafiken spiegeln
 
 public:
-    SwMirrorGrf( USHORT nMiro = RES_DONT_MIRROR_GRF )
-        : SfxEnumItem( RES_GRFATR_MIRRORGRF, nMiro ), bGrfToggle( sal_False )
+    SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT )
+        : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< USHORT >(eMiro) ), bGrfToggle( sal_False )
     {}
     SwMirrorGrf( const SwMirrorGrf &rMirrorGrf )
         : SfxEnumItem( RES_GRFATR_MIRRORGRF, rMirrorGrf.GetValue()),
@@ -197,8 +197,8 @@ public:
 class SwChannelGrf : public SfxInt16Item
 {
 protected:
-    SwChannelGrf( sal_Int16 nVal, USHORT nWhich )
-        : SfxInt16Item( nWhich, nVal )
+    SwChannelGrf( sal_Int16 nVal, USHORT nWhichL )
+        : SfxInt16Item( nWhichL, nVal )
     {}
 
 public:
-- 
cgit