INTEGRATION: CWS swwarnings (1.2.4); FILE MERGED

2007/04/17 08:05:07 tl 1.2.4.1: #i69287# warning-free code

2 files changed, 8 insertions, 23 deletions

diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx
index 71917e0e9af5..4dd169d9ce02 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/svx/inc/svx/numitem.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: numitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:02:40 $
+ *  last change: $Author: hr $ $Date: 2007-09-27 13:01:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -159,7 +159,7 @@ class SVX_DLLPUBLIC SvxNumberFormat : public SvxNumberType
     short               nCharTextDistance;  //Abstand Nummer<->Text
 
     SvxBrushItem*       pGraphicBrush;          //
-    SvxFrameVertOrient  eVertOrient;        // vert. Ausrichtung einer Bitmap
+    sal_Int16           eVertOrient;        // vert. Ausrichtung einer Bitmap
 
     Size                aGraphicSize;       // immer! in 1/100 mm
     Font*               pBulletFont;        // Pointer auf den BulletFont
@@ -206,11 +206,11 @@ public:
     void            SetStart(USHORT nSet) {nStart = nSet;}
     USHORT          GetStart() const {return nStart;}
 
-    virtual void    SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const SvxFrameVertOrient* pOrient = 0);
+    virtual void    SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0);
     const SvxBrushItem*         GetBrush() const {return pGraphicBrush;}
     void            SetGraphic( const String& rName );
-    virtual void                SetVertOrient(SvxFrameVertOrient eSet);
-    virtual SvxFrameVertOrient  GetVertOrient() const;
+    virtual void        SetVertOrient(sal_Int16 eSet);
+    virtual sal_Int16   GetVertOrient() const;
     void            SetGraphicSize(const Size& rSet) {aGraphicSize = rSet;}
     const Size&     GetGraphicSize() const {return aGraphicSize;}
 
diff --git a/svx/inc/svx/svxenum.hxx b/svx/inc/svx/svxenum.hxx
index 03dc7d80e778..def4980ac36f 100644
--- a/svx/inc/svx/svxenum.hxx
+++ b/svx/inc/svx/svxenum.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svxenum.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:30:19 $
+ *  last change: $Author: hr $ $Date: 2007-09-27 13:01:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -250,21 +250,6 @@ enum SvxFrameAnchor
     SVX_FLY_PAGE            //Seitengebundener Rahmen
 };
 
-enum SvxFrameVertOrient
-{
-    // vertikale Rahmenausrichtung - fuer Writer
-    SVX_VERT_NONE,
-    SVX_VERT_TOP,
-    SVX_VERT_CENTER,
-    SVX_VERT_BOTTOM,
-    SVX_VERT_CHAR_TOP,
-    SVX_VERT_CHAR_CENTER,
-    SVX_VERT_CHAR_BOTTOM,
-    SVX_VERT_LINE_TOP,
-    SVX_VERT_LINE_CENTER,
-    SVX_VERT_LINE_BOTTOM
-};
-
 enum SvxExtNumType
 {
     SVX_NUM_CHARS_UPPER_LETTER, // zaehlt von a-z, aa - az, ba - bz, ...