diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-07 13:43:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-08 23:25:27 +0200 |
| commit | df7ffcdb022b0b30006aa8238ba4070eb4c64bd5 (patch) | |
| tree | 520286d73c703606ce438e4eccd76dd1523e6131 /sw/source/filter/xml/xmlfmt.cxx | |
| parent | 642926b4b582f691ac4bc0d90fb3a73f64b91b4a (diff) | |
sw: convert some SwStyleNameMapper methods to OUString
Change-Id: I151678b2bf155a7561b4c4e4b2d9fd1f05930477
Diffstat (limited to 'sw/source/filter/xml/xmlfmt.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmlfmt.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 452271c6e75f..174bc3a0f4ce 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -400,7 +400,6 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite ) return; sal_uInt16 nCount = pConditions->size(); - String aString; OUString sName; for( sal_uInt16 i = 0; i < nCount; i++ ) { @@ -408,11 +407,10 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite ) OUString aDisplayName( GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_PARAGRAPH, pCond->GetApplyStyle() ) ); - SwStyleNameMapper::FillUIName( aDisplayName, - aString, + SwStyleNameMapper::FillUIName(aDisplayName, + sName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); - sName = aString; SwTxtFmtColl* pCondColl = pDoc->FindTxtFmtCollByName( sName ); OSL_ENSURE( pCondColl, "SwXMLItemSetStyleContext_Impl::ConnectConditions: cond coll missing" ); @@ -638,7 +636,7 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc() SwDoc *pDoc = SwImport::GetDocFromXMLImport( GetSwImport() ); - String sName; + OUString sName; // #i40788# - first determine the display name of the page style, // then map this name to the corresponding user interface name. sName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_MASTER_PAGE, |