diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:16:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:16:35 +0000 |
| commit | 2ca37cb5c3b4e5c795b47f6f656bae05322eba21 (patch) | |
| tree | c6ad114a7a718de7c39e175ced0cf17bd4ae324b /xmloff | |
| parent | 34e7b02063088011187cdd2244b6f5a1bfdee262 (diff) | |
INTEGRATION: CWS oasisbf1 (1.44.36); FILE MERGED
2004/10/15 13:56:37 fs 1.44.36.1: #i30706# when reading grid columns, we need to translate a ParaAdjust property to Align
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 91f871a8f374..fbca3168489f 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: elementimport.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: rt $ $Date: 2004-09-08 14:58:49 $ + * last change: $Author: hr $ $Date: 2004-11-09 12:16:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,6 +97,9 @@ #ifndef _XMLOFF_XMLTOKEN_HXX #include "xmltoken.hxx" #endif +#ifndef XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX +#include "gridcolumnproptranslator.hxx" +#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> @@ -345,7 +348,9 @@ namespace xmloff // set the style properties if ( m_pStyleElement && m_xElement.is() ) { - const_cast< XMLTextStyleContext* >( m_pStyleElement )->FillPropertySet( m_xElement ); + Reference< XPropertySet > xPropTranslation = + new OGridColumnPropertyTranslator( Reference< XMultiPropertySet >( m_xElement, UNO_QUERY ) ); + const_cast< XMLTextStyleContext* >( m_pStyleElement )->FillPropertySet( xPropTranslation ); ::rtl::OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( ); if ( sNumberStyleName.getLength() ) @@ -1681,7 +1686,8 @@ namespace xmloff // clone the attributes Reference< XCloneable > xCloneList(_rxAttrList, UNO_QUERY); OSL_ENSURE(xCloneList.is(), "OColumnWrapperImport::StartElement: AttributeList not cloneable!"); - m_xOwnAttributes = Reference< sax::XAttributeList >(xCloneList->createClone(), UNO_QUERY); + if ( xCloneList.is() ) + m_xOwnAttributes = Reference< sax::XAttributeList >(xCloneList->createClone(), UNO_QUERY); OSL_ENSURE(m_xOwnAttributes.is(), "OColumnWrapperImport::StartElement: no cloned list!"); // forward an empty attribute list to the base class @@ -1752,13 +1758,13 @@ namespace xmloff { case OControlElement::COMBOBOX: case OControlElement::LISTBOX: - return new OColumnImport<OListAndComboImport>(m_rFormImport, m_rEventManager, _nPrefix, _rLocalName, m_xParentContainer, _eType, m_xOwnAttributes); + return new OColumnImport<OListAndComboImport>(m_rFormImport, m_rEventManager, _nPrefix, _rLocalName, m_xParentContainer, _eType ); case OControlElement::PASSWORD: - return new OColumnImport<OPasswordImport>(m_rFormImport, m_rEventManager, _nPrefix, _rLocalName, m_xParentContainer, _eType, m_xOwnAttributes); + return new OColumnImport<OPasswordImport>(m_rFormImport, m_rEventManager, _nPrefix, _rLocalName, m_xParentContainer, _eType ); default: - return new OColumnImport<OControlImport>(m_rFormImport, m_rEventManager, _nPrefix, _rLocalName, m_xParentContainer, _eType, m_xOwnAttributes); + return new OColumnImport<OControlImport>(m_rFormImport, m_rEventManager, _nPrefix, _rLocalName, m_xParentContainer, _eType ); } } |