summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 11:45:31 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 11:45:31 +0000
commitd6082f4668a8e011ca1389cf01c21ec78689903f (patch)
tree2d41eb5ca35270cede1b080afbbdfedab5702b61 /forms
parent849bac2292abe2626007357a7394bf72942f57e3 (diff)
INTEGRATION: CWS dba09 (1.27.122); FILE MERGED
2004/04/27 06:12:04 fs 1.27.122.2: RESYNC: (1.27-1.29); FILE MERGED 2004/03/17 11:51:05 fs 1.27.122.1: #92831# at runtime, don't use 'stardiv.one.form.control.*' service names - translate when writing old (binary) format
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/Grid.cxx15
1 files changed, 10 insertions, 5 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 66ed31d43426..376a37199725 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Grid.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: rt $ $Date: 2004-05-07 16:07:29 $
+ * last change: $Author: hr $ $Date: 2004-05-10 12:45:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -182,7 +182,7 @@ OGridControlModel::OGridControlModel(const Reference<XMultiServiceFactory>& _rxF
,OErrorBroadcaster( OComponentHelper::rBHelper )
,m_aSelectListeners(m_aMutex)
,m_aResetListeners(m_aMutex)
- ,m_aDefaultControl(FRM_CONTROL_GRID) // use the old control name for compytibility reasons
+ ,m_aDefaultControl( FRM_SUN_CONTROL_GRIDCONTROL )
,m_bEnable(sal_True)
,m_bNavigation(sal_True)
,m_nBorder(1)
@@ -751,7 +751,7 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
switch (nHandle)
{
case PROPERTY_ID_DEFAULTCONTROL:
- aReturn <<= ::rtl::OUString( FRM_CONTROL_GRID );
+ aReturn <<= ::rtl::OUString( STARDIV_ONE_FORM_CONTROL_GRID );
break;
case PROPERTY_ID_PRINTABLE:
@@ -1043,7 +1043,12 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream
_rxOutStream->writeShort( aFont.Pitch );
}
- _rxOutStream << m_aDefaultControl;
+ 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);
_rxOutStream->writeBoolean(m_bEnable);