diff options
| -rw-r--r-- | xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/text/txtparae.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/text/txtparai.cxx | 3 |
6 files changed, 10 insertions, 13 deletions
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index 355ec819e35a..5403ace544c7 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -133,8 +133,7 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::initialize( // XServiceInfo OUString SAL_CALL XMLEmbeddedObjectExportFilter::getImplementationName() { - OUString aStr; - return aStr; + return OUString(); } sal_Bool SAL_CALL XMLEmbeddedObjectExportFilter::supportsService( const OUString& ServiceName ) diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index bb55ebe0ec9f..947c4d9bb42f 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -2331,8 +2331,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( } else { - OUString aStr; - mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr ); + mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, OUString() ); mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index c658de6d3a04..6f4ba5d86949 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1393,7 +1393,6 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, bDateNoDefault( false ) { LanguageTagODF aLanguageTagODF; - OUString sNatNumAttrScript, sNatNumAttrRfcLanguageTag; css::i18n::NativeNumberXmlAttributes aNatNumAttr; bool bAttrBool(false); @@ -1470,8 +1469,8 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, SvNumberFormatter* pFormatter = pData->GetNumberFormatter(); if ( pFormatter ) { - LanguageTag aLanguageTag( sNatNumAttrRfcLanguageTag, aNatNumAttr.Locale.Language, - sNatNumAttrScript, aNatNumAttr.Locale.Country); + LanguageTag aLanguageTag( OUString(), aNatNumAttr.Locale.Language, + OUString(), aNatNumAttr.Locale.Country); aNatNumAttr.Locale = aLanguageTag.getLocale( false); sal_Int32 nNatNum = pFormatter->GetNatNum()->convertFromXmlAttributes( aNatNumAttr ); diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 4f332d25ab1c..838e80e1864d 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -762,7 +762,6 @@ void XMLTextFrameContext::removeGraphicFromImportContext(const SvXMLImportContex OUString XMLTextFrameContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const { - OUString aRetval; const XMLTextFrameContext_Impl* pXMLTextFrameContext_Impl = dynamic_cast< const XMLTextFrameContext_Impl* >(&rContext); if(pXMLTextFrameContext_Impl) @@ -770,7 +769,7 @@ OUString XMLTextFrameContext::getGraphicURLFromImportContext(const SvXMLImportCo return pXMLTextFrameContext_Impl->GetHRef(); } - return aRetval; + return OUString(); } bool XMLTextFrameContext_Impl::CreateIfNotThere() diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 9829030d9d17..fabf67802046 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -777,8 +777,10 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( aPropStates.erase( aSecondDel ); aPropStates.erase( aFirstDel ); } - OUString sParent; // AutoStyles should not have parents! - sName = GetAutoStylePool().Find( XML_STYLE_FAMILY_TEXT_TEXT, sParent, aPropStates ); + sName = GetAutoStylePool().Find( + XML_STYLE_FAMILY_TEXT_TEXT, + OUString(), // AutoStyles should not have parents! + aPropStates ); rbHasAutoStyle = true; } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 2bad8ab7f422..6f1b920fd7af 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -1215,8 +1215,7 @@ void XMLIndexMarkImportContext_Impl::GetServiceName( default: { SAL_WARN("xmloff.text", "unknown index mark type!"); - OUString sTmp; - sServiceName = sTmp; + sServiceName = OUString(); break; } } |