INTEGRATION: CWS aw036 (1.5.50); FILE MERGED

2006/10/26 15:57:16 aw 1.5.50.1: #i61284#: BurnInStyleSheetAttributes for text corrected; #i70852#: Set/GetLayer cleanup and implementation for FmFormObj

svx/source/sdr/properties/properties.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: properties.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 05:44:16 $
+ *  last change: $Author: vg $ $Date: 2006-11-21 16:45:48 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -124,7 +124,7 @@ namespace sdr
             // Overload where an ItemSet is implemented.
         }
 
-        void BaseProperties::ForceStyleToHardAttributes(sal_Bool /*bPseudoSheetsOnly*/)
+        void BaseProperties::ForceStyleToHardAttributes()
         {
             // force all attributes which come from styles to hard attributes
             // to be able to live without the style. Default implementation does nothing.