INTEGRATION: CWS pchfix04 (1.2.46); FILE MERGED

2007/05/03 15:37:02 hjs 1.2.46.1: #i73604# - fix after resync

svx/inc/svx/svdfppt.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svdfppt.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:20:22 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:32:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.

svx/inc/svx/svx3ditems.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svx3ditems.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:29:21 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:32:21 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -43,10 +43,7 @@
 #include <svtools/eitem.hxx>
 #endif
 
-#ifdef ITEMID_COLOR
-#undef ITEMID_COLOR
-#endif
-#define ITEMID_COLOR            (SID_ATTR_3D_LIGHTCOLOR)
+
 #ifndef _SVX_COLRITEM_HXX
 #include <svx/colritem.hxx>
 #endif

svx/inc/svx/tbcontrl.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tbcontrl.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:42:20 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:32:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -243,7 +243,7 @@ friend class SfxStyleControllerItem_Impl;
 //========================================================================
 // class SvxFontNameToolBoxControl ---------------------------------------
 //========================================================================
-#ifdef ITEMID_FONT
+
 
 class SVX_DLLPUBLIC SvxFontNameToolBoxControl : public SfxToolBoxControl
 {
@@ -256,12 +256,12 @@ public:
     virtual Window* CreateItemWindow    ( Window *pParent );
 };
 
-#endif // ITEMID_FONT
+
 
 //========================================================================
 // class SvxFontHeightToolBoxControl -------------------------------------
 //========================================================================
-#ifdef ITEMID_FONTHEIGHT
+
 
 class SvxFontSizeItem;
 class SvxFontItem;
@@ -295,13 +295,13 @@ public:
 //#endif
 };
 
-#endif // ITEMID_FONTHEIGHT
+
 
 //========================================================================
 // class SvxFontColorToolBoxControl --------------------------------------
 //========================================================================
 
-#ifdef ITEMID_COLOR
+
 
 class SvxTbxButtonColorUpdater_Impl;
 
@@ -320,13 +320,13 @@ public:
     virtual SfxPopupWindow*     CreatePopupWindow();
 };
 
-#endif // ITEMID_COLOR
+
 
 //========================================================================
 // class SvxFontColorExtToolBoxControl --------------------------------------
 //========================================================================
 
-#ifdef ITEMID_COLOR
+
 
 class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl
 {
@@ -349,12 +349,12 @@ public:
 
 };
 
-#endif // ITEMID_COLOR
+
 
 //========================================================================
 // class SvxColorToolBoxControl ------------------------------------------
 //========================================================================
-#ifdef ITEMID_BRUSH
+
 
 class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
 {
@@ -370,12 +370,12 @@ public:
     virtual SfxPopupWindow*     CreatePopupWindow();
 };
 
-#endif // ITEMID_BRUSH
+
 
 //========================================================================
 // class SvxFrameToolBoxControl ------------------------------------------
 //========================================================================
-#ifdef ITEMID_BOX
+
 
 class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl
 {
@@ -390,12 +390,12 @@ public:
 
 };
 
-#endif // ITEMID_BOX
+
 
 //========================================================================
 // class SvxLineStyleToolBoxControl --------------------------------------
 //========================================================================
-#ifdef ITEMID_LINE
+
 
 class SVX_DLLPUBLIC SvxFrameLineStyleToolBoxControl : public SfxToolBoxControl
 {
@@ -409,12 +409,12 @@ public:
                                               const SfxPoolItem* pState );
 };
 
-#endif // ITEMID_LINE
+
 
 //========================================================================
 // class SvxFrameLineColorToolBoxControl ---------------------------------
 //========================================================================
-#ifdef ITEMID_BRUSH
+
 
 class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl
 {
@@ -432,7 +432,7 @@ public:
     virtual SfxPopupWindow*     CreatePopupWindow();
 };
 
-#endif // ITEMID_BRUSH
+
 
 class SvxReloadControllerItem_Impl;
 class SvxReloadControllerItem : public SfxToolBoxControl

svx/inc/svx/twolinesitem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: twolinesitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:42:52 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:33:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -61,10 +61,10 @@ class SVX_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
     sal_Bool bOn;
 public:
     TYPEINFO();
-    SvxTwoLinesItem( sal_Bool bOn = TRUE,
-                     sal_Unicode nStartBracket = 0,
-                     sal_Unicode nEndBracket = 0,
-                     sal_uInt16 nId = ITEMID_TWOLINES );
+    SvxTwoLinesItem( sal_Bool bOn /*= TRUE*/,
+                     sal_Unicode nStartBracket /*= 0*/,
+                     sal_Unicode nEndBracket /*= 0*/,
+                     sal_uInt16 nId  );
     SvxTwoLinesItem( const SvxTwoLinesItem& rAttr );
     virtual ~SvxTwoLinesItem();
 

svx/inc/svx/widwitem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: widwitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 16:48:06 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 14:33:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -68,7 +68,7 @@ class SVX_DLLPUBLIC SvxWidowsItem: public SfxByteItem
 public:
     TYPEINFO();
 
-    SvxWidowsItem( const BYTE nL=0, const USHORT nId = ITEMID_WIDOWS );
+    SvxWidowsItem( const BYTE nL /*= 0*/, const USHORT nId  );
 
     // "pure virtual Methoden" vom SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;