INTEGRATION: CWS pchfix04 (1.2.34); FILE MERGED

2007/05/03 15:42:18 hjs 1.2.34.1: #i73604# - fix after resync

sfx2/inc/sfx2/controlwrapper.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: controlwrapper.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:17:31 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 17:07:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -524,6 +524,8 @@ public:
     typedef ValueT                          ControlValueType;
     typedef MultiControlWrapper< ValueT >   MultiControlWrapperType;
 
+    MultiControlWrapper() : maDefValue( 0 ){}
+
     /** Returns the default value that can be used in GetControlValue(). */
     inline const ValueT& GetDefaultValue() const { return maDefValue; }
     /** Sets a default value that can be used in GetControlValue(). */

sfx2/inc/sfx2/docfile.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: docfile.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:18:43 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 17:07:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -122,12 +122,12 @@ class SfxPoolCancelManager_Impl;
 
 #define S2BS(s) ByteString( s, RTL_TEXTENCODING_MS_1252 )
 
-//#if 0 // _SOLAR__PRIVATE
-#ifndef STRING_LIST
-#define STRING_LIST
-DECLARE_LIST( StringList, String* )
-#endif
+////#if 0 // _SOLAR__PRIVATE
+//#ifndef STRING_LIST
+//#define STRING_LIST
+//DECLARE_LIST( StringList, String* )
 //#endif
+////#endif
 
 //____________________________________________________________________________________________________________________________________
 //  defines for namespaces

sfx2/inc/sfx2/itemconnect.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: itemconnect.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:22:03 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 17:07:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -67,7 +67,7 @@ const ItemConnFlags ITEMCONN_NONE               = 0x0000;
 /** Connection is inactive - virtual functions will not be called. */
 const ItemConnFlags ITEMCONN_INACTIVE           = 0x0001;
 /** Clone item in FillItemSet() from old item set. */
-const ItemConnFlags ITEMCONN_CLONE_ITEM         = 0x0002;
+//const ItemConnFlags ITEMCONN_CLONE_ITEM         = 0x0002;
 
 /** Enable control(s), if the item is known. */
 const ItemConnFlags ITEMCONN_ENABLE_KNOWN       = 0x0010;
@@ -554,21 +554,11 @@ bool ItemControlConnection< ItemWrpT, ControlWrpT >::FillItemSet(
         if( !pOldItem || !(maItemWrp.GetItemValue( *pOldItem ) == aNewValue) )
         {
             USHORT nWhich = ItemWrapperHelper::GetWhichId( rDestSet, maItemWrp.GetSlotId() );
-            if( GetFlags() & ITEMCONN_CLONE_ITEM )
-            {
-                std::auto_ptr< ItemType > xItem(
-                    static_cast< ItemType* >( maItemWrp.GetDefaultItem( rDestSet ).Clone() ) );
-                xItem->SetWhich( nWhich );
-                maItemWrp.SetItemValue( *xItem, aNewValue );
-                rDestSet.Put( *xItem );
-            }
-            else
-            {
-                ItemType aItem;
-                aItem.SetWhich( nWhich );
-                maItemWrp.SetItemValue( aItem, aNewValue );
-                rDestSet.Put( aItem );
-            }
+            std::auto_ptr< ItemType > xItem(
+                static_cast< ItemType* >( maItemWrp.GetDefaultItem( rDestSet ).Clone() ) );
+            xItem->SetWhich( nWhich );
+            maItemWrp.SetItemValue( *xItem, aNewValue );
+            rDestSet.Put( *xItem );
             bChanged = true;
         }
     }

sfx2/inc/sfx2/srchitem.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: srchitem.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-04-11 21:30:05 $
+ *  last change: $Author: kz $ $Date: 2007-05-10 17:07:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -97,7 +97,7 @@
 
 // class SvxSearchItem ---------------------------------------------------
 
-#ifdef ITEMID_SEARCH
+//#ifdef ITEMID_SEARCH
 
 /*  [Beschreibung]
 
@@ -127,7 +127,7 @@ class SFX2_DLLPUBLIC SvxSearchItem :
 public:
     TYPEINFO();
 
-    SvxSearchItem( const sal_uInt16 nId = ITEMID_SEARCH );
+    SvxSearchItem( const sal_uInt16 nId /*= ITEMID_SEARCH*/ );
     SvxSearchItem( const SvxSearchItem& rItem );
     virtual ~SvxSearchItem();
 
@@ -328,5 +328,5 @@ sal_Bool SvxSearchItem::IsMatchFullHalfWidthForms() const
 
 #endif
 
-#endif
+//#endif