diff options
-rw-r--r-- | include/xmloff/txtparae.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLStylesExportHelper.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtparae.cxx | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 9f737e665b1b..a93615ad83d5 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -492,7 +492,7 @@ public: // This method exports the given OUString - void exportText( + void exportCharacterData( const OUString& rText, bool& rPrevCharWasSpace); diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 6d8707c336a0..4438e99028a2 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1423,7 +1423,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor sToken = sToken.copy(1,sToken.getLength()-2); bool bPrevCharIsSpace = false; - GetTextParagraphExport()->exportText(sToken,bPrevCharIsSpace); + GetTextParagraphExport()->exportCharacterData(sToken, bPrevCharIsSpace); } } } @@ -1435,7 +1435,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor { OUString sExpr = xFT->getLabel(); bool bPrevCharIsSpace = false; - GetTextParagraphExport()->exportText(sExpr,bPrevCharIsSpace); + GetTextParagraphExport()->exportCharacterData(sExpr, bPrevCharIsSpace); } } diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index cf4b599caff8..d5a4c899e70a 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -122,7 +122,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction { SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); bool bPrevCharWasSpace(true); - rExport.GetTextParagraphExport()->exportText(sComment, bPrevCharWasSpace); + rExport.GetTextParagraphExport()->exportCharacterData(sComment, bPrevCharWasSpace); } } @@ -278,7 +278,7 @@ void ScChangeTrackingExportHelper::WriteStringCell(const ScCellValue& rCell) { SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); bool bPrevCharWasSpace(true); - rExport.GetTextParagraphExport()->exportText(rCell.mpString->getString(), bPrevCharWasSpace); + rExport.GetTextParagraphExport()->exportCharacterData(rCell.mpString->getString(), bPrevCharWasSpace); } } @@ -356,7 +356,7 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScCellValue& rCell, co { SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); bool bPrevCharWasSpace(true); - rExport.GetTextParagraphExport()->exportText(sCellValue, bPrevCharWasSpace); + rExport.GetTextParagraphExport()->exportCharacterData(sCellValue, bPrevCharWasSpace); } } } diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 26efde39f0d4..ab5baa55facb 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -318,7 +318,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, if( sText[i] == '\n') { SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); - rExport.GetTextParagraphExport()->exportText(sTemp.makeStringAndClear(), bPrevCharWasSpace); + rExport.GetTextParagraphExport()->exportCharacterData(sTemp.makeStringAndClear(), bPrevCharWasSpace); } else sTemp.append(sText[i]); @@ -327,7 +327,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, if (!sTemp.isEmpty()) { SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); - rExport.GetTextParagraphExport()->exportText(sTemp.makeStringAndClear(), bPrevCharWasSpace); + rExport.GetTextParagraphExport()->exportCharacterData(sTemp.makeStringAndClear(), bPrevCharWasSpace); } } delete pMessage; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 6198cc4a037c..51545e1e25fe 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3293,7 +3293,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount) ScCellFormat::GetOutputString(*pDoc, aCell.maCellAddress, aCell.maBaseCell); bool bPrevCharWasSpace = true; - GetTextParagraphExport()->exportText(aParaStr, bPrevCharWasSpace); + GetTextParagraphExport()->exportCharacterData(aParaStr, bPrevCharWasSpace); } } WriteShapes(aCell); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index c64d8662794a..c9b64568d4fe 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -3329,7 +3329,7 @@ void XMLTextParagraphExport::exportTextRangeSpan( SvXMLElementExport aElem2( GetExport(), TEXT == openFieldMark, XML_NAMESPACE_TEXT, XML_TEXT_INPUT, false, false ); - exportText( aText, rPrevCharIsSpace ); + exportCharacterData(aText, rPrevCharIsSpace); openFieldMark = NONE; } } @@ -3384,7 +3384,7 @@ void XMLTextParagraphExport::exportTextRange( } } -void XMLTextParagraphExport::exportText( const OUString& rText, +void XMLTextParagraphExport::exportCharacterData(const OUString& rText, bool& rPrevCharIsSpace ) { sal_Int32 nExpStartPos = 0; |