diff options
Diffstat (limited to 'xmloff/source/transform')
-rw-r--r-- | xmloff/source/transform/DlgOASISTContext.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/transform/EventOASISTContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/EventOOoTContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/OOo2Oasis.cxx | 9 | ||||
-rw-r--r-- | xmloff/source/transform/Oasis2OOo.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/transform/PersAttrListTContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOASISTContext.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOOoTContext.cxx | 12 |
8 files changed, 24 insertions, 31 deletions
diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index af17e79a2ae0..0397c3746cb7 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -77,11 +77,9 @@ void XMLDlgOASISTransformerContext::StartElement( { case XML_ATACTION_DLG_BORDER: { - OUString aAttrValue( rAttrValue ); - - if ( !aAttrValue.equals( GetXMLToken( XML_NONE ) ) && - !aAttrValue.equals( GetXMLToken( XML_SIMPLE ) ) && - !aAttrValue.equals( GetXMLToken( XML_3D ) ) ) + if ( !rAttrValue.equals( GetXMLToken( XML_NONE ) ) && + !rAttrValue.equals( GetXMLToken( XML_SIMPLE ) ) && + !rAttrValue.equals( GetXMLToken( XML_3D ) ) ) { pMutableAttrList->SetValueByIndex( i, GetXMLToken( XML_NONE ) ); diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index cb529c34f6da..7781631123e6 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -138,7 +138,7 @@ bool ParseURL( if ( xUrl.is() ) { - OUString aLanguageKey = GetXMLToken( XML_LANGUAGE ); + const OUString& aLanguageKey = GetXMLToken( XML_LANGUAGE ); if ( xUrl.is() && xUrl->hasParameter( aLanguageKey ) ) { OUString aLanguage = xUrl->getParameter( aLanguageKey ); @@ -150,7 +150,7 @@ bool ParseURL( OUString tmp = xUrl->getParameter( GetXMLToken( XML_LOCATION ) ); - OUString doc = GetXMLToken( XML_DOCUMENT ); + const OUString& doc = GetXMLToken( XML_DOCUMENT ); if ( tmp.equalsIgnoreAsciiCase( doc ) ) { diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index 7abb9977a369..cc7b17365247 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -116,7 +116,7 @@ sal_uInt16 XMLEventOOoTransformerContext::GetEventName( OUString& rNewName, XMLTransformerOOoEventMap_Impl& rMap ) { - XMLTransformerOOoEventMap_Impl::key_type aKey( rName ); + const XMLTransformerOOoEventMap_Impl::key_type& aKey( rName ); XMLTransformerOOoEventMap_Impl::const_iterator aIter = rMap.find( aKey ); if( aIter == rMap.end() ) { diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index d444f3c938e3..ed4ff6db9cc9 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1416,11 +1416,10 @@ XMLTrackedChangesOOoTContext_Impl::~XMLTrackedChangesOOoTContext_Impl() void XMLTrackedChangesOOoTContext_Impl::StartElement( const Reference< XAttributeList >& rAttrList ) { - Reference< XAttributeList > xAttrList( rAttrList ); - sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; + sal_Int16 nAttrCount = rAttrList.is() ? rAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const OUString& rAttrName = xAttrList->getNameByIndex( i ); + const OUString& rAttrName = rAttrList->getNameByIndex( i ); OUString aLocalName; sal_uInt16 nPrefix = GetTransformer().GetNamespaceMap().GetKeyByAttrName( rAttrName, @@ -1441,7 +1440,7 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( { Sequence < sal_Int8 > aKey; ::sax::Converter::decodeBase64( aKey, - xAttrList->getValueByIndex( i ) ); + rAttrList->getValueByIndex( i ) ); rPropSet->setPropertyValue( aPropName, makeAny( aKey ) ); } else @@ -1452,7 +1451,7 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( break; } } - XMLTransformerContext::StartElement( xAttrList ); + XMLTransformerContext::StartElement( rAttrList ); } class XMLTableOOoTransformerContext_Impl : public XMLTransformerContext diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index e23b5e128228..03b99f35f704 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1459,12 +1459,10 @@ XMLConfigItemTContext_Impl::~XMLConfigItemTContext_Impl() void XMLConfigItemTContext_Impl::StartElement( const Reference< XAttributeList >& rAttrList ) { - Reference< XAttributeList > xAttrList( rAttrList ); - - sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; + sal_Int16 nAttrCount = rAttrList.is() ? rAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const OUString& rAttrName = xAttrList->getNameByIndex( i ); + const OUString& rAttrName = rAttrList->getNameByIndex( i ); OUString aLocalName; sal_uInt16 nPrefix = GetTransformer().GetNamespaceMap().GetKeyByAttrName( rAttrName, @@ -1473,7 +1471,7 @@ void XMLConfigItemTContext_Impl::StartElement( { if ( IsXMLToken( aLocalName, XML_NAME ) ) { - const OUString& rValue = xAttrList->getValueByIndex( i ); + const OUString& rValue = rAttrList->getValueByIndex( i ); if( rValue == "RedlineProtectionKey" ) m_bIsRedlineProtectionKey = true; else if( rValue == "CursorPositionX" ) @@ -1486,7 +1484,7 @@ void XMLConfigItemTContext_Impl::StartElement( } } - XMLTransformerContext::StartElement( xAttrList ); + XMLTransformerContext::StartElement( rAttrList ); } void XMLConfigItemTContext_Impl::Characters( const OUString& rChars ) diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx index 3f708fd482ae..21bd235c3a30 100644 --- a/xmloff/source/transform/PersAttrListTContext.cxx +++ b/xmloff/source/transform/PersAttrListTContext.cxx @@ -34,7 +34,7 @@ void XMLPersAttrListTContext::AddAttribute( ::xmloff::token::XMLTokenEnum eAToken, ::xmloff::token::XMLTokenEnum eVToken ) { - OUString aAttrValue( ::xmloff::token::GetXMLToken( eVToken ) ); + const OUString& aAttrValue( ::xmloff::token::GetXMLToken( eVToken ) ); AddAttribute( nAPrefix, eAToken, aAttrValue ); } @@ -45,7 +45,7 @@ void XMLPersAttrListTContext::AddAttribute( { OUString aAttrQName( GetTransformer().GetNamespaceMap().GetQNameByKey( nAPrefix, ::xmloff::token::GetXMLToken( eAToken ) ) ); - OUString aAttrValue( rValue ); + const OUString& aAttrValue( rValue ); XMLMutableAttributeList *pMutableAttrList; if( m_xAttrList.is() ) diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 060336798936..65f72b3562a2 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -263,7 +263,7 @@ void XMLPropertiesTContext_Impl::StartElement( } else { - OUString aAttrValue( GetXMLToken( bWordMode + const OUString& aAttrValue( GetXMLToken( bWordMode ? XML_FALSE : XML_TRUE ) ); pAttrList->AddAttribute( aAttrQName, aAttrValue ); @@ -272,7 +272,7 @@ void XMLPropertiesTContext_Impl::StartElement( break; case XML_OPTACTION_KEEP_WITH_NEXT: { - OUString aAttrValue( GetXMLToken( + const OUString& aAttrValue( GetXMLToken( IsXMLToken( rAttrValue, XML_ALWAYS ) ? XML_TRUE : XML_FALSE) ); @@ -517,7 +517,7 @@ void XMLPropertiesTContext_Impl::StartElement( pAttrList->AddAttribute( rAttrName, aNewAttrValue ); // create old draw:mirror for drawing graphic objects - OUString aAttrValue( GetXMLToken( IsXMLToken( rAttrValue, XML_HORIZONTAL ) ? XML_TRUE : XML_FALSE ) ); + const OUString& aAttrValue( GetXMLToken( IsXMLToken( rAttrValue, XML_HORIZONTAL ) ? XML_TRUE : XML_FALSE ) ); pAttrList->AddAttribute( GetTransformer().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken( XML_MIRROR )), aAttrValue ); diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 4f30727767d6..a7321722ee96 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -392,8 +392,6 @@ rtl::Reference<XMLTransformerContext> XMLPropertiesOOoTContext_Impl::CreateChild void XMLPropertiesOOoTContext_Impl::StartElement( const Reference< XAttributeList >& rAttrList ) { - Reference< XAttributeList > xAttrList( rAttrList ); - XMLTypedPropertiesOOoTContext_Impl * pIntervalMinorDivisorContext = nullptr; double fIntervalMajor = 0.0; double fIntervalMinor = 0.0; @@ -412,11 +410,11 @@ void XMLPropertiesOOoTContext_Impl::StartElement( OUString aDrawMirrorAttrValue; XMLTypedPropertiesOOoTContext_Impl* pMirrorContext( nullptr ); - sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; + sal_Int16 nAttrCount = rAttrList.is() ? rAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const OUString sAttrName = xAttrList->getNameByIndex( i ); - const OUString sAttrValue = xAttrList->getValueByIndex( i ); + const OUString sAttrName = rAttrList->getNameByIndex( i ); + const OUString sAttrValue = rAttrList->getValueByIndex( i ); OUString aLocalName; sal_uInt16 nPrefix = GetTransformer().GetNamespaceMap().GetKeyByAttrName( sAttrName, @@ -506,7 +504,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( break; case XML_PTACTION_LINE_MODE: { - OUString aAttrValue( GetXMLToken( + const OUString& aAttrValue( GetXMLToken( IsXMLToken( sAttrValue, XML_TRUE ) ? XML_CONTINUOUS : XML_SKIP_WHITE_SPACE) ); @@ -525,7 +523,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( break; case XML_PTACTION_KEEP_WITH_NEXT: { - OUString aAttrValue( GetXMLToken( + const OUString& aAttrValue( GetXMLToken( IsXMLToken( sAttrValue, XML_TRUE ) ? XML_ALWAYS : XML_AUTO) ); |