From 2c0d112b6259df61b9f3ae51e225f7fc9debab26 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 21 Nov 2006 15:45:48 +0000 Subject: 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svx/source/sdr/properties/properties.cxx') diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index e610edce2cb1..5323201a7d9d 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/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. -- cgit