diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 16:42:23 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 16:42:23 +0000 |
commit | bee73a5aaf2375ceef422ee26cde1745d0bdd363 (patch) | |
tree | b1c235edb576e3c9da3fc9ae0b8c5de69a53a57e /forms | |
parent | f2be77d2513cf79a1bd884b3994469ea3756acf7 (diff) |
INTEGRATION: CWS dba15 (1.31.34); FILE MERGED
2004/08/12 08:20:37 fs 1.31.34.2: RESYNC: (1.31-1.32); FILE MERGED
2004/07/26 15:20:42 fs 1.31.34.1: #i31138# no need for writing a compatible service name anymore
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Grid.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index da28b85fdf61..a7b165c175f0 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Grid.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: hr $ $Date: 2004-08-02 16:28:41 $ + * last change: $Author: hr $ $Date: 2004-09-08 17:42:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1045,10 +1045,14 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream _rxOutStream->writeShort( aFont.Pitch ); } - if ( m_aDefaultControl == FRM_SUN_CONTROL_GRIDCONTROL ) - // for compatibility, write a sevice name which older versions understand (up to 5.1) - _rxOutStream << STARDIV_ONE_FORM_CONTROL_GRID; - else + // no need to write a compatible service name anymore: Since the binfilter workspace, this + // code here is not used anymore for writing old binary file formats. Thus, there's no need + // to be compatible to anything except ourself. + // 2004-07-26 - #i31138# - fs@openoffice.org +// if ( m_aDefaultControl == FRM_SUN_CONTROL_GRIDCONTROL ) +// // for compatibility, write a sevice name which older versions understand (up to 5.1) +// _rxOutStream << STARDIV_ONE_FORM_CONTROL_GRID; +// else _rxOutStream << m_aDefaultControl; _rxOutStream->writeShort(m_nBorder); |