diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-15 10:31:10 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-15 10:31:10 +0100 |
| commit | a994502c9b461c8fd2f5114d9296ee00cb6ae694 (patch) | |
| tree | 9e3fb4a01e1db12e5143401b3b4091c716f0dd1c /xmloff/source/forms | |
| parent | 4b33dd0038695c3db0e8b3c8e6e6569b3d341004 (diff) | |
| parent | 0115de354333f0607c1db021447b4393772684db (diff) | |
dba34d: pulled and merged CWS dba34c, thus implicitly rebasing to m100
Diffstat (limited to 'xmloff/source/forms')
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/forms/formsimp.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/forms/officeforms.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/forms/officeforms.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 80ef4629a580..0172a185acd4 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -1342,7 +1342,7 @@ namespace xmloff // we don't want say form url targets to be resolved // using ResolveGraphicObjectURL if ( 0 == _rLocalName.compareToAscii( s_pImageDataAttributeName ) ) - sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, FALSE ); + sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, sal_False ); else sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue ); return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue ); @@ -1518,7 +1518,7 @@ namespace xmloff } } - // additionally, we need to set the "RichText" property of our element to TRUE + // additionally, we need to set the "RichText" property of our element to sal_True // (the presence of the text:p is used as indicator for the value of the RichText property) sal_Bool bHasRichTextProperty = sal_False; if ( m_xInfo.is() ) diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx index bc0baaba551e..3028cd507890 100644 --- a/xmloff/source/forms/formsimp.cxx +++ b/xmloff/source/forms/formsimp.cxx @@ -51,7 +51,7 @@ XMLFormsContext::~XMLFormsContext() { } -SvXMLImportContext * XMLFormsContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, +SvXMLImportContext * XMLFormsContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { return GetImport().GetFormImport()->createContext( nPrefix, rLocalName, xAttrList ); diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 0de7b04b70d3..fcb6a79de597 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -65,7 +65,7 @@ namespace xmloff } //------------------------------------------------------------------------- - SvXMLImportContext* OFormsRootImport::CreateChildContext( USHORT _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, const Reference< sax::XAttributeList>& xAttrList ) { return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList ); diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index 2ca90197adb5..f58e33d73080 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -54,7 +54,7 @@ namespace xmloff virtual ~OFormsRootImport(); // SvXMLImportContext overriabled - virtual SvXMLImportContext * CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ); virtual void EndElement(); |