xmloff/source/forms/propertyexport.cxx | 10 +--------- xmloff/source/forms/propertyexport.hxx | 3 --- 2 files changed, 1 insertion(+), 12 deletions(-)
New commits: commit 883e6f7e0d1f70072d38593a466c542c684d43fc Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Apr 6 21:26:58 2017 +0200 No real need for OPropertyExport::AddAttributeASCII Change-Id: Ia8e62909ab484240468708ad1ff99a5e1cdc779c diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 11b40dfc7c0c..46a2550ada7f 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -368,7 +368,7 @@ namespace xmloff else { if (!_bVoidDefault) - AddAttributeASCII(_nNamespaceKey, _pAttributeName, ""); + AddAttribute(_nNamespaceKey, _pAttributeName, OUString()); } // the property does not need to be handled anymore @@ -634,14 +634,6 @@ namespace xmloff m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, _rValue ); } - void OPropertyExport::AddAttributeASCII(sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue) - { - OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), - "OPropertyExport::AddAttributeASCII: already have such an attribute"); - - m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); - } - void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::xmloff::token::GetXMLToken(_eName)).isEmpty(), diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index 779423272c9d..8bdf3bf0fc93 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -358,7 +358,6 @@ namespace xmloff #ifdef DBG_UTIL void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue); void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ); - void AddAttributeASCII( sal_uInt16 nPrefix, const sal_Char *pName, const sal_Char *pValue ); void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue); void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ); #else @@ -367,8 +366,6 @@ namespace xmloff { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } inline void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, _rValue ); } - inline void AddAttributeASCII( sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue ) - { m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); } inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _rValue); } inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits