From a20d634b61c023ae4a08b4eb574d4ce4397c6e10 Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Thu, 7 Mar 2013 13:32:32 +0100 Subject: Removed RTL_CONSTASCII_USTRINGPARAM in xmloff(transform) Change-Id: I3b32ef3bad9700f24c898b6b5bf1a8cd6a97f426 --- xmloff/source/transform/DocumentTContext.cxx | 2 +- xmloff/source/transform/OOo2Oasis.cxx | 9 ++++----- xmloff/source/transform/Oasis2OOo.cxx | 7 +++---- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index c64112a9535a..164e83fdea15 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -112,7 +112,7 @@ void XMLDocumentTransformerContext::StartElement( const Reference< XAttributeLis { Reference< XPropertySetInfo > xPropSetInfo( rPropSet->getPropertySetInfo() ); - OUString aPropName(RTL_CONSTASCII_USTRINGPARAM("Class")); + OUString aPropName("Class"); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName( aPropName ) ) { Any aAny = rPropSet->getPropertyValue( aPropName ); diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 22be397163d2..59a558d6ab40 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1159,7 +1159,7 @@ void XMLDocumentTransformerContext_Impl::StartElement( pMutableAttrList = new XMLMutableAttributeList( xAttrList ); xAttrList = pMutableAttrList; - OUString sMime(RTL_CONSTASCII_USTRINGPARAM("application/vnd.oasis.opendocument.") ); + OUString sMime("application/vnd.oasis.opendocument."); sMime += rValue; pMutableAttrList->SetValueByIndex( i, sMime ); OUString aNewAttrQName( GetTransformer().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE, ::xmloff::token::GetXMLToken( XML_MIMETYPE ) ) ); @@ -1461,7 +1461,7 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( if( rPropSet.is() ) { const sal_Char sRedlineProtectionKey[] = "RedlineProtectionKey"; - OUString aPropName(RTL_CONSTASCII_USTRINGPARAM(sRedlineProtectionKey)); + OUString aPropName(sRedlineProtectionKey); Reference< XPropertySetInfo > xPropSetInfo( rPropSet->getPropertySetInfo() ); if( xPropSetInfo.is() && @@ -2077,8 +2077,7 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.OOo2OasisTransformer" ) ); + return OUString( "com.sun.star.comp.OOo2OasisTransformer" ); } Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw() @@ -2098,7 +2097,7 @@ Reference< XInterface > SAL_CALL OOo2OasisTransformer_createInstance( #define OOO_IMPORTER( className, implName, subServiceName ) \ OUString SAL_CALL className##_getImplementationName() throw() \ { \ - return OUString( RTL_CONSTASCII_USTRINGPARAM( implName ) ); \ + return OUString( implName ); \ } \ \ Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw()\ diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index c618bfab579d..f1e2095df340 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1553,7 +1553,7 @@ void XMLConfigItemTContext_Impl::EndElement() if( rPropSet.is() ) { const sal_Char sRedlineProtectionKey[] = "RedlineProtectionKey"; - OUString aPropName(RTL_CONSTASCII_USTRINGPARAM(sRedlineProtectionKey)); + OUString aPropName(sRedlineProtectionKey); Reference< XPropertySetInfo > xPropSetInfo( rPropSet->getPropertySetInfo() ); if( xPropSetInfo.is() && @@ -1614,7 +1614,7 @@ void XMLTrackedChangesOASISTContext_Impl::StartElement( if( rPropSet.is() ) { const sal_Char sRedlineProtectionKey[] = "RedlineProtectionKey"; - OUString aPropName(RTL_CONSTASCII_USTRINGPARAM(sRedlineProtectionKey)); + OUString aPropName(sRedlineProtectionKey); Reference< XPropertySetInfo > xPropSetInfo( rPropSet->getPropertySetInfo() ); if( xPropSetInfo.is() && @@ -2045,8 +2045,7 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer::getSupportedServiceNames( ) OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Oasis2OOoTransformer" ) ); + return OUString( "com.sun.star.comp.Oasis2OOoTransformer" ); } Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() -- cgit