xmloff: rename one overloaded XMLTextParagraphExport::exportText
... to exportCharacterData. The others all export XTexts.
Change-Id: Ic4b1d6364c15d99d839e2736d4c2966d7aa302d4
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 9f737e6..a93615a 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 6d8707c..4438e99 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 cf4b599..d5a4c89 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 26efde3..ab5baa5 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 6198cc4..51545e1 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 c64d866..c9b6456 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;
