diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-28 23:23:42 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-28 23:27:27 +0200 |
commit | b9f7225bb7c9cb58f796296fac3e58f84a619303 (patch) | |
tree | 9dcc40f523e3ac79f69150990746ed73f895f7be /sw | |
parent | ef87e804ec80451ff1517482c1b70e7dccb961ce (diff) |
remove RTL_CONSTASCII_(U)STRINGPARAM usage
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 22 | ||||
-rw-r--r-- | sw/source/filter/ww8/writerhelper.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 2 |
3 files changed, 9 insertions, 19 deletions
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index ceec8e2420cb..ab41592d7a43 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -304,21 +304,13 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/) rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount ) { - rtl::OUString aFileName = rtl::OUStringBuffer() - .appendAscii(RTL_CONSTASCII_STRINGPARAM("charts/chart")) - .append(nCount) - .appendAscii(RTL_CONSTASCII_STRINGPARAM(".xml")) - .makeStringAndClear(); + rtl::OUString aFileName = rtl::OUStringBuffer().append("charts/chart").append(nCount).append(".xml").makeStringAndClear(); OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", aFileName ); - aFileName = rtl::OUStringBuffer() - .appendAscii(RTL_CONSTASCII_STRINGPARAM("word/charts/chart")) - .append(nCount) - .appendAscii(RTL_CONSTASCII_STRINGPARAM(".xml")) - .makeStringAndClear(); + aFileName = rtl::OUStringBuffer().append("word/charts/chart").append(nCount).append(".xml").makeStringAndClear(); ::sax_fastparser::FSHelperPtr pChartFS = m_pFilter->openFragmentStreamWithSerializer( aFileName, @@ -575,28 +567,26 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* ::sax_fastparser::FSHelperPtr pFS; if ( bHeader ) { - OUString aName( OUStringBuffer().appendAscii(RTL_CONSTASCII_STRINGPARAM("header")) - .append( ++m_nHeaders ).appendAscii(RTL_CONSTASCII_STRINGPARAM(".xml")) - .makeStringAndClear() ); + OUString aName( OUStringBuffer().append("header").append( ++m_nHeaders ).append(".xml").makeStringAndClear() ); aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header", aName ); - pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii(RTL_CONSTASCII_STRINGPARAM("word/")).append( aName ).makeStringAndClear(), + pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().append("word/").append( aName ).makeStringAndClear(), "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" ); pFS->startElementNS( XML_w, XML_hdr, MainXmlNamespaces( pFS )); } else { - OUString aName( OUStringBuffer().appendAscii(RTL_CONSTASCII_STRINGPARAM("footer")).append( ++m_nFooters ).appendAscii(RTL_CONSTASCII_STRINGPARAM(".xml")).makeStringAndClear() ); + OUString aName( OUStringBuffer().append("footer").append( ++m_nFooters ).append(".xml").makeStringAndClear() ); aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer", aName ); - pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii(RTL_CONSTASCII_STRINGPARAM("word/")).append( aName ).makeStringAndClear(), + pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().append("word/").append( aName ).makeStringAndClear(), "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" ); pFS->startElementNS( XML_w, XML_ftr, MainXmlNamespaces( pFS )); diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index e96dfaafbe6d..a997ee836329 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -633,8 +633,8 @@ namespace sw bool IsStarSymbol(const rtl::OUString &rFontName) { rtl::OUString sFamilyNm(GetFontToken(rFontName, 0)); - return (sFamilyNm.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("starsymbol")) || - sFamilyNm.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("opensymbol"))); + return (sFamilyNm.equalsIgnoreAsciiCase("starsymbol") || + sFamilyNm.equalsIgnoreAsciiCase("opensymbol")); } Size GetSwappedInSize(const SwNoTxtNode& rNd) diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index e74829b92d10..f50f321d542c 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2183,7 +2183,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich, { if ( iRes != 25 ) nChecked = iRes; - sDefault = ( wDef == 0 ) ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("0") ) : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("1") ); + sDefault = ( wDef == 0 ) ? rtl::OUString( "0" ) : rtl::OUString( "1" ); } } // xstzTextFormat |