INTEGRATION: CWS pchfix04 (1.2.44); FILE MERGED

2007/05/03 15:37:01 hjs 1.2.44.1: #i73604# - fix after resync

svx/inc/svx/cntritem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cntritem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 15:41:28 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:24:15 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -60,8 +60,8 @@ class SVX_DLLPUBLIC SvxContourItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxContourItem( const BOOL bContoured = FALSE,
-                    const USHORT nId = ITEMID_CONTOUR );
+    SvxContourItem( const BOOL bContoured /*= FALSE*/,
+                    const USHORT nId );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;

svx/inc/svx/fntctl.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fntctl.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 15:52:23 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:25:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,7 +48,7 @@
 #include "svx/svxdllapi.h"
 #endif
 
-#ifdef ITEMID_FONT
+
 
 class FontNameMenu;
 class SfxBindings;
@@ -81,7 +81,7 @@ public:
     SFX_DECL_MENU_CONTROL();
 };
 
-#endif
+
 
 #endif
 

svx/inc/svx/frmdiritem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: frmdiritem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 15:54:57 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:26:41 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -65,8 +65,9 @@ class SVX_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
 public:
     TYPEINFO();
 
-    SvxFrameDirectionItem( SvxFrameDirection nValue = FRMDIR_HORI_LEFT_TOP,
-                            USHORT nWhich = ITEMID_FRAMEDIR );
+    SvxFrameDirectionItem( USHORT nWhich  );
+    SvxFrameDirectionItem( SvxFrameDirection nValue /*= FRMDIR_HORI_LEFT_TOP*/,
+                            USHORT nWhich  );
     virtual ~SvxFrameDirectionItem();
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;

svx/inc/svx/grfcrop.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: grfcrop.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 15:56:04 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:26:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,10 +51,10 @@ class SVX_DLLPUBLIC SvxGrfCrop : public SfxPoolItem
 {
     sal_Int32   nLeft, nRight, nTop, nBottom;
 public:
-    SvxGrfCrop( USHORT = ITEMID_GRF_CROP );
+    SvxGrfCrop( USHORT  );
     SvxGrfCrop( sal_Int32 nLeft,    sal_Int32 nRight,
                 sal_Int32 nTop,     sal_Int32 nBottom,
-                USHORT = ITEMID_GRF_CROP );
+                USHORT  );
     virtual ~SvxGrfCrop();
 
     // "pure virtual Methoden" vom SfxPoolItem

svx/inc/svx/hngpnctitem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: hngpnctitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 15:57:13 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:27:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -60,8 +60,8 @@ class SVX_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxHangingPunctuationItem( sal_Bool bOn = sal_False,
-                        const sal_uInt16 nId = ITEMID_HANGINGPUNCTUATION );
+    SvxHangingPunctuationItem( sal_Bool bOn /*= sal_False*/,
+                        const sal_uInt16 nId  );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, USHORT) const;

svx/inc/svx/kernitem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: kernitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 15:58:39 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:27:45 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SvxKerningItem : public SfxInt16Item
 public:
     TYPEINFO();
 
-    SvxKerningItem( const short nKern = 0, const USHORT nId = ITEMID_KERNING );
+    SvxKerningItem( const short nKern /*= 0*/, const USHORT nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;

svx/inc/svx/paravertalignitem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: paravertalignitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:04:43 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:29:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -63,8 +63,8 @@ public:
     enum { AUTOMATIC, BASELINE, TOP, CENTER, BOTTOM };
     TYPEINFO();
 
-    SvxParaVertAlignItem( sal_uInt16 nValue = 0,
-                       const sal_uInt16 nId = ITEMID_PARAVERTALIGN );
+    SvxParaVertAlignItem( sal_uInt16 nValue /*= 0*/,
+                       const sal_uInt16 nId  );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, USHORT) const;

svx/inc/svx/pbinitem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pbinitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:05:08 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:30:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -64,7 +64,7 @@ class SVX_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
 public:
     TYPEINFO();
 
-    inline SvxPaperBinItem( const USHORT nId = ITEMID_PAPERBIN,
+    inline SvxPaperBinItem( const USHORT nId ,
                             const BYTE nTray = PAPERBIN_PRINTER_SETTINGS );
     inline SvxPaperBinItem &operator=( const SvxPaperBinItem &rCpy );
 

svx/inc/svx/scriptspaceitem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: scriptspaceitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:07:13 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:31:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -61,8 +61,8 @@ class SVX_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
 public:
     TYPEINFO();
 
-    SvxScriptSpaceItem( sal_Bool bOn = sal_False,
-                        const sal_uInt16 nId = ITEMID_SCRIPTSPACE );
+    SvxScriptSpaceItem( sal_Bool bOn /*= sal_False*/,
+                        const sal_uInt16 nId  );
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxPoolItem*    Create(SvStream &, USHORT) const;

svx/inc/svx/shaditem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: shaditem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:15:38 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:31:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -79,7 +79,7 @@ class SVX_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
 public:
     TYPEINFO();
 
-    SvxShadowItem( const USHORT nId = ITEMID_SHADOW,
+    SvxShadowItem( const USHORT nId ,
                  const Color *pColor = 0, const USHORT nWidth = 100 /*5pt*/,
                  const SvxShadowLocation eLoc = SVX_SHADOW_NONE );