diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:40:40 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:39 +0100 |
commit | 05575c31e1f962636125ff8c42c3e2409a9edb6c (patch) | |
tree | 0fa44d2899f95ae21676ee51a57eb34b38e965e0 /xmloff/source/text | |
parent | fb4fec646d20388539c8d294f3e2bc20d0903a2b (diff) |
xmloff: Use appropriate OUString functions on string constants
Change-Id: I349e0c2575d9a5154ac7002d129a1851a3df7687
Diffstat (limited to 'xmloff/source/text')
-rw-r--r-- | xmloff/source/text/XMLTextListBlockContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextNumRuleInfo.hxx | 6 | ||||
-rw-r--r-- | xmloff/source/text/txtfldi.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/text/txtparae.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/text/txtvfldi.cxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index f396ede30b13..f8f9d37689fd 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -200,7 +200,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( { if ( !rTextListsHelper.IsListProcessed( msContinueListId ) ) { - msContinueListId = ""; + msContinueListId.clear(); } else { diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index bfe02f97d44c..8ca93af9d6f4 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -163,15 +163,15 @@ inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=( inline void XMLTextNumRuleInfo::Reset() { mxNumRules = 0; - msNumRulesName = ""; - msListId = ""; + msNumRulesName.clear(); + msListId.clear(); mnListStartValue = -1; mnListLevel = 0; // Written OpenDocument file format doesn't fit to the created text document (#i69627#) mbIsNumbered = mbIsRestart = mbOutlineStyleAsNormalListStyle = false; mbContinueingPreviousSubTree = false; - msListLabelString = ""; + msListLabelString.clear(); } #endif // INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTNUMRULEINFO_HXX diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 6b7c9ad541a8..90d1be3383a0 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -4088,7 +4088,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext( const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName ) { - sServicePrefix = OUString(sAPI_presentation_prefix ); + sServicePrefix = sAPI_presentation_prefix; bValid = true; } @@ -4112,7 +4112,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext( const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName ) { - sServicePrefix = OUString(sAPI_presentation_prefix ); + sServicePrefix = sAPI_presentation_prefix; bValid = true; } @@ -4137,7 +4137,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext( const OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName ) { - sServicePrefix = OUString(sAPI_presentation_prefix ); + sServicePrefix = sAPI_presentation_prefix; bValid = true; } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index de920891bd22..b2b6772d9293 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2201,12 +2201,12 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( exportTextField( xTxtRange, bAutoStyles, bIsProgress ); bPrevCharIsSpace = false; } - else if ( sType.equals( sAnnotation ) ) + else if ( sType == sAnnotation ) { exportTextField( xTxtRange, bAutoStyles, bIsProgress ); bPrevCharIsSpace = false; } - else if ( sType.equals( sAnnotationEnd ) ) + else if ( sType == sAnnotationEnd ) { Reference<XNamed> xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY); const OUString& rName = xBookmark->getName(); @@ -2268,7 +2268,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { exportRuby(xPropSet, bAutoStyles); } - else if (sType.equals(sMeta)) + else if (sType == sMeta) { exportMeta(xPropSet, bAutoStyles, bIsProgress); } diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 6792facbf6a9..89f4047433a6 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -329,7 +329,7 @@ void XMLSetVarFieldImportContext::EndElement() { // create field/Service Reference<XPropertySet> xPropSet; - if (CreateField(xPropSet, OUString(sAPI_textfield_prefix) + GetServiceName())) + if (CreateField(xPropSet, sAPI_textfield_prefix + GetServiceName())) { Reference<XDependentTextField> xDepTextField(xPropSet, UNO_QUERY); if (xDepTextField.is()) |