summaryrefslogtreecommitdiff
path: root/xmloff/source/text
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/text')
-rw-r--r--xmloff/source/text/XMLLineNumberingExport.cxx6
-rw-r--r--xmloff/source/text/XMLRedlineExport.cxx6
-rw-r--r--xmloff/source/text/XMLSectionExport.cxx87
-rw-r--r--xmloff/source/text/XMLSectionExport.hxx17
-rw-r--r--xmloff/source/text/txtflde.cxx16
-rw-r--r--xmloff/source/text/txtftne.cxx10
-rw-r--r--xmloff/source/text/txtparae.cxx55
7 files changed, 69 insertions, 128 deletions
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index 69cdde7d75a3..53196e7509ff 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: XMLLineNumberingExport.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: dvo $ $Date: 2001-06-29 21:07:22 $
+ * last change: $Author: dvo $ $Date: 2001-09-24 13:40:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -261,7 +261,7 @@ void XMLLineNumberingExport::Export()
SvXMLElementExport aSeparatorElem(rExport, XML_NAMESPACE_TEXT,
XML_LINENUMBERING_SEPARATOR,
sal_True, sal_False);
- rExport.GetDocHandler()->characters(sSeparator);
+ rExport.Characters(sSeparator);
}
}
// else: no configuration: don't save -> default
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index ed601ac2a3e4..4dc6b8f615f9 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: XMLRedlineExport.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: dvo $ $Date: 2001-06-29 21:07:22 $
+ * last change: $Author: dvo $ $Date: 2001-09-24 13:40:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -567,7 +567,7 @@ void XMLRedlineExport::ExportChangeInfo(
{
SvXMLElementExport aParagraph(
rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
- rExport.GetDocHandler()->characters(aSubString);
+ rExport.Characters(aSubString);
}
}
}
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index 8ed73fde0429..5e294dbea9d3 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: XMLSectionExport.cxx,v $
*
- * $Revision: 1.27 $
+ * $Revision: 1.28 $
*
- * last change: $Author: dvo $ $Date: 2001-08-27 17:18:32 $
+ * last change: $Author: dvo $ $Date: 2001-09-24 13:40:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -230,7 +230,6 @@ XMLSectionExport::XMLSectionExport(
RTL_CONSTASCII_USTRINGPARAM("MainEntryCharacterStyleName")),
sParaStyleHeading(RTL_CONSTASCII_USTRINGPARAM("ParaStyleHeading")),
sParaStyleLevel(RTL_CONSTASCII_USTRINGPARAM("ParaStyleLevel")),
- sSection(GetXMLToken(XML_SECTION)),
sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")),
sName(RTL_CONSTASCII_USTRINGPARAM("Name")),
sUseAlphabeticalSeparators(
@@ -259,15 +258,6 @@ XMLSectionExport::XMLSectionExport(
sDocumentIndex(RTL_CONSTASCII_USTRINGPARAM("DocumentIndex")),
sContentSection(RTL_CONSTASCII_USTRINGPARAM("ContentSection")),
sHeaderSection(RTL_CONSTASCII_USTRINGPARAM("HeaderSection")),
- sTableOfContent(GetXMLToken(XML_TABLE_OF_CONTENT)),
- sIllustrationIndex(GetXMLToken(XML_ILLUSTRATION_INDEX)),
- sAlphabeticalIndex(GetXMLToken(XML_ALPHABETICAL_INDEX)),
- sTableIndex(GetXMLToken(XML_TABLE_INDEX)),
- sObjectIndex(GetXMLToken(XML_OBJECT_INDEX)),
- sBibliography(GetXMLToken(XML_BIBLIOGRAPHY)),
- sUserIndex(GetXMLToken(XML_USER_INDEX)),
- sIndexBody(GetXMLToken(XML_INDEX_BODY)),
- sIndexTitle(GetXMLToken(XML_INDEX_TITLE)),
sTextSection(RTL_CONSTASCII_USTRINGPARAM("TextSection")),
sIsGlobalDocumentSection(RTL_CONSTASCII_USTRINGPARAM("IsGlobalDocumentSection")),
sProtectionKey(RTL_CONSTASCII_USTRINGPARAM("ProtectionKey")),
@@ -392,13 +382,9 @@ void XMLSectionExport::ExportSectionEnd(
if (xIndex.is())
{
// index end: close index body element
- GetExport().GetDocHandler()->ignorableWhitespace(
- GetExport().sWS);
- GetExport().GetDocHandler()->endElement(
- GetExport().GetNamespaceMap().GetQNameByKey(
- XML_NAMESPACE_TEXT, sIndexBody));
- GetExport().GetDocHandler()->ignorableWhitespace(
- GetExport().sWS);
+ GetExport().EndElement( XML_NAMESPACE_TEXT, XML_INDEX_BODY,
+ sal_True );
+ GetExport().IgnorableWhitespace();
switch (MapSectionType(xIndex->getServiceName()))
{
@@ -452,12 +438,8 @@ void XMLSectionExport::ExportSectionEnd(
GetExport().CheckAttrList();
// element surrounded by whitespace
- GetExport().GetDocHandler()->ignorableWhitespace(GetExport().sWS);
- GetExport().GetDocHandler()->endElement(
- GetExport().GetNamespaceMap().GetQNameByKey(
- XML_NAMESPACE_TEXT,
- GetXMLToken(eElement)));
- GetExport().GetDocHandler()->ignorableWhitespace(GetExport().sWS);
+ GetExport().EndElement( XML_NAMESPACE_TEXT, eElement, sal_True);
+ GetExport().IgnorableWhitespace();
}
else
{
@@ -518,13 +500,8 @@ void XMLSectionExport::ExportIndexHeaderStart(
GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xName->getName());
// format already handled -> export only start element
- GetExport().GetDocHandler()->ignorableWhitespace(GetExport().sWS);
- GetExport().GetDocHandler()->startElement(
- GetExport().GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TEXT,
- sIndexTitle),
- GetExport().GetXAttrList() );
- GetExport().GetDocHandler()->ignorableWhitespace(GetExport().sWS);
- GetExport().ClearAttrList();
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_TITLE, sal_True );
+ GetExport().IgnorableWhitespace();
}
@@ -605,13 +582,8 @@ void XMLSectionExport::ExportRegularSectionStart(
}
// export element
- GetExport().GetDocHandler()->ignorableWhitespace( GetExport().sWS );
- GetExport().GetDocHandler()->startElement(
- GetExport().GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TEXT,
- sSection),
- GetExport().GetXAttrList() );
- GetExport().GetDocHandler()->ignorableWhitespace( GetExport().sWS );
- GetExport().ClearAttrList();
+ GetExport().IgnorableWhitespace();
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_SECTION, sal_True );
// data source
// unfortunately, we have to test all relevant strings for non-zero length
@@ -699,7 +671,7 @@ void XMLSectionExport::ExportTableOfContentStart(
const Reference<XPropertySet> & rPropertySet)
{
// export TOC element start
- ExportBaseIndexStart(sTableOfContent, rPropertySet);
+ ExportBaseIndexStart(XML_TABLE_OF_CONTENT, rPropertySet);
// scope for table-of-content-source element
{
@@ -750,7 +722,7 @@ void XMLSectionExport::ExportObjectIndexStart(
const Reference<XPropertySet> & rPropertySet)
{
// export index start
- ExportBaseIndexStart(sObjectIndex, rPropertySet);
+ ExportBaseIndexStart(XML_OBJECT_INDEX, rPropertySet);
// scope for index source element
{
@@ -775,7 +747,7 @@ void XMLSectionExport::ExportIllustrationIndexStart(
const Reference<XPropertySet> & rPropertySet)
{
// export index start
- ExportBaseIndexStart(sIllustrationIndex, rPropertySet);
+ ExportBaseIndexStart(XML_ILLUSTRATION_INDEX, rPropertySet);
// scope for index source element
{
@@ -792,7 +764,7 @@ void XMLSectionExport::ExportTableIndexStart(
const Reference<XPropertySet> & rPropertySet)
{
// export index start
- ExportBaseIndexStart(sTableIndex, rPropertySet);
+ ExportBaseIndexStart(XML_TABLE_INDEX, rPropertySet);
// scope for index source element
{
@@ -809,7 +781,7 @@ void XMLSectionExport::ExportAlphabeticalIndexStart(
const Reference<XPropertySet> & rPropertySet)
{
// export TOC element start
- ExportBaseIndexStart(sAlphabeticalIndex, rPropertySet);
+ ExportBaseIndexStart(XML_ALPHABETICAL_INDEX, rPropertySet);
// scope for table-of-content-source element
{
@@ -873,7 +845,7 @@ void XMLSectionExport::ExportUserIndexStart(
const Reference<XPropertySet> & rPropertySet)
{
// export TOC element start
- ExportBaseIndexStart(sUserIndex, rPropertySet);
+ ExportBaseIndexStart(XML_USER_INDEX, rPropertySet);
// scope for table-of-content-source element
{
@@ -903,7 +875,7 @@ void XMLSectionExport::ExportBibliographyStart(
const Reference<XPropertySet> & rPropertySet)
{
// export TOC element start
- ExportBaseIndexStart(sBibliography, rPropertySet);
+ ExportBaseIndexStart(XML_BIBLIOGRAPHY, rPropertySet);
// scope for table-of-content-source element
{
@@ -917,7 +889,7 @@ void XMLSectionExport::ExportBibliographyStart(
void XMLSectionExport::ExportBaseIndexStart(
- const OUString sElementName,
+ XMLTokenEnum eElement,
const Reference<XPropertySet> & rPropertySet)
{
// protect + protection key
@@ -936,12 +908,8 @@ void XMLSectionExport::ExportBaseIndexStart(
}
// index Element start
- GetExport().GetDocHandler()->ignorableWhitespace( GetExport().sWS );
- GetExport().GetDocHandler()->startElement(
- GetExport().GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TEXT,
- sElementName),
- GetExport().GetXAttrList() );
- GetExport().ClearAttrList();
+ GetExport().IgnorableWhitespace();
+ GetExport().StartElement( XML_NAMESPACE_TEXT, eElement, sal_False );
}
static const sal_Char* aTypeSourceElementNameMap[] =
@@ -1013,7 +981,7 @@ void XMLSectionExport::ExportBaseIndexSource(
aAny = rPropertySet->getPropertyValue(sTitle);
OUString sTitleString;
aAny >>= sTitleString;
- GetExport().GetDocHandler()->characters(sTitleString);
+ GetExport().Characters(sTitleString);
}
// export level templates (all indices)
@@ -1065,13 +1033,8 @@ void XMLSectionExport::ExportBaseIndexBody(
GetExport().CheckAttrList();
// start surrounded by whitespace
- GetExport().GetDocHandler()->ignorableWhitespace(GetExport().sWS);
- GetExport().GetDocHandler()->startElement(
- GetExport().GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TEXT,
- sIndexBody),
- GetExport().GetXAttrList() );
- GetExport().ClearAttrList();
- GetExport().GetDocHandler()->ignorableWhitespace(GetExport().sWS);
+ GetExport().IgnorableWhitespace();
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_BODY, sal_True );
}
void XMLSectionExport::ExportTableAndIllustrationIndexSourceAttributes(
@@ -1580,7 +1543,7 @@ void XMLSectionExport::ExportIndexTemplateElement(
// entry text or span element: write text
if (TOK_TTYPE_TEXT == nTokenType)
{
- GetExport().GetDocHandler()->characters(sText);
+ GetExport().Characters(sText);
}
}
}
diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx
index cb381dadd5a8..81ff968a5750 100644
--- a/xmloff/source/text/XMLSectionExport.hxx
+++ b/xmloff/source/text/XMLSectionExport.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: XMLSectionExport.hxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: dvo $ $Date: 2001-08-27 17:18:32 $
+ * last change: $Author: dvo $ $Date: 2001-09-24 13:40:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -157,7 +157,6 @@ class XMLSectionExport
const ::rtl::OUString sMainEntryCharacterStyleName;
const ::rtl::OUString sParaStyleHeading;
const ::rtl::OUString sParaStyleLevel;
- const ::rtl::OUString sSection;
const ::rtl::OUString sTitle;
const ::rtl::OUString sName;
const ::rtl::OUString sUseAlphabeticalSeparators;
@@ -175,16 +174,6 @@ class XMLSectionExport
const ::rtl::OUString sContentSection;
const ::rtl::OUString sHeaderSection;
- const ::rtl::OUString sTableOfContent;
- const ::rtl::OUString sIllustrationIndex;
- const ::rtl::OUString sTableIndex;
- const ::rtl::OUString sAlphabeticalIndex;
- const ::rtl::OUString sObjectIndex;
- const ::rtl::OUString sBibliography;
- const ::rtl::OUString sUserIndex;
- const ::rtl::OUString sIndexBody;
- const ::rtl::OUString sIndexTitle;
-
const ::rtl::OUString sTextSection;
const ::rtl::OUString sIsGlobalDocumentSection;
const ::rtl::OUString sProtectionKey;
@@ -341,7 +330,7 @@ protected:
* should have been set at GetExport() before calling this method.
*/
void ExportBaseIndexStart(
- const ::rtl::OUString sElementName,
+ ::xmloff::token::XMLTokenEnum eElement,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rSection);
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index f8f84b17633a..823abf44b631 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtflde.cxx,v $
*
- * $Revision: 1.34 $
+ * $Revision: 1.35 $
*
- * last change: $Author: dvo $ $Date: 2001-08-02 18:51:31 $
+ * last change: $Author: dvo $ $Date: 2001-09-24 13:40:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1631,7 +1631,7 @@ void XMLTextFieldExport::ExportFieldHelper(
sal_True, XML_NAMESPACE_OFFICE);
SvXMLElementExport aUrlField(rExport, XML_NAMESPACE_TEXT, XML_A,
sal_False, sal_False);
- GetExport().GetDocHandler()->characters(sPresentation);
+ GetExport().Characters(sPresentation);
break;
}
@@ -1708,7 +1708,7 @@ void XMLTextFieldExport::ExportFieldHelper(
default:
DBG_ERROR("unkown field type encountered!");
// always export content
- GetExport().GetDocHandler()->characters(sPresentation);
+ GetExport().Characters(sPresentation);
}
}
@@ -2080,10 +2080,10 @@ void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName,
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
eElementName, bAddSpace, bAddSpace );
// export content
- GetExport().GetDocHandler()->characters(sContent);
+ GetExport().Characters(sContent);
} else {
// always export content
- GetExport().GetDocHandler()->characters(sContent);
+ GetExport().Characters(sContent);
}
}
@@ -2126,7 +2126,7 @@ void XMLTextFieldExport::ExportMacro(
GetExport().GetEventExport().ExportSingleEvent( aSeq, sOnClick, sal_False );
// and finally, the field presentation
- GetExport().GetDocHandler()->characters(rContent);
+ GetExport().Characters(rContent);
}
/// export all data-style related attributes
@@ -2311,7 +2311,7 @@ void XMLTextFieldExport::ProcessParagraphSequence(
{
SvXMLElementExport aParagraph(
GetExport(), XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
- GetExport().GetDocHandler()->characters(aSubString);
+ GetExport().Characters(aSubString);
}
}
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 20bd61632eb9..ad8904be92f8 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtftne.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: dvo $ $Date: 2001-06-29 21:07:22 $
+ * last change: $Author: dvo $ $Date: 2001-09-24 13:40:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -240,7 +240,7 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
(bIsEndnote ? XML_ENDNOTE_CITATION :
XML_FOOTNOTE_CITATION),
sal_False, sal_False);
- GetExport().GetDocHandler()->characters(sText);
+ GetExport().Characters(sText);
}
{
@@ -398,7 +398,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_TEXT,
XML_FOOTNOTE_CONTINUATION_NOTICE_FORWARD,
sal_True, sal_False);
- GetExport().GetDocHandler()->characters(sTmp);
+ GetExport().Characters(sTmp);
}
// begin notice / ergo sum
@@ -410,7 +410,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_TEXT,
XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD,
sal_True, sal_False);
- GetExport().GetDocHandler()->characters(sTmp);
+ GetExport().Characters(sTmp);
}
}
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 13f8bc94553c..2970cbc0812c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtparae.cxx,v $
*
- * $Revision: 1.93 $
+ * $Revision: 1.94 $
*
- * last change: $Author: mib $ $Date: 2001-09-20 14:18:38 $
+ * last change: $Author: dvo $ $Date: 2001-09-24 13:40:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -651,9 +651,7 @@ void XMLTextParagraphExport::exportListChange(
OUString *pElem = (*pListElements)[pListElements->Count()-1];
pListElements->Remove( pListElements->Count()-1 );
- GetExport().GetDocHandler()->ignorableWhitespace(
- GetExport().sWS );
- GetExport().GetDocHandler()->endElement( *pElem );
+ GetExport().EndElement( *pElem, sal_True );
delete pElem;
}
@@ -727,11 +725,8 @@ void XMLTextParagraphExport::exportListChange(
GetExport().GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_TEXT,
GetXMLToken(eLName) ) );
- GetExport().GetDocHandler()->ignorableWhitespace(
- GetExport().sWS );
- GetExport().GetDocHandler()->startElement(
- *pElem, GetExport().GetXAttrList() );
- GetExport().ClearAttrList();
+ GetExport().IgnorableWhitespace();
+ GetExport().StartElement( *pElem, sal_False );
if( !pListElements )
pListElements = new OUStrings_Impl;
@@ -752,10 +747,8 @@ void XMLTextParagraphExport::exportListChange(
pElem = new OUString( GetExport().GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_TEXT,
GetXMLToken(eLName) ) );
- GetExport().GetDocHandler()->ignorableWhitespace( GetExport().sWS );
- GetExport().GetDocHandler()->startElement(
- *pElem, GetExport().GetXAttrList() );
- GetExport().ClearAttrList();
+ GetExport().IgnorableWhitespace();
+ GetExport().StartElement( *pElem, sal_False );
pListElements->Insert( pElem, pListElements->Count() );
}
@@ -771,8 +764,7 @@ void XMLTextParagraphExport::exportListChange(
"SwXMLExport::ExportListChange: list elements missing" );
OUString *pElem = (*pListElements)[pListElements->Count()-1];
- GetExport().GetDocHandler()->ignorableWhitespace( GetExport().sWS );
- GetExport().GetDocHandler()->endElement( *pElem );
+ GetExport().EndElement( *pElem, sal_True );
pListElements->Remove( pListElements->Count()-1 );
delete pElem;
@@ -789,10 +781,8 @@ void XMLTextParagraphExport::exportListChange(
pElem = new OUString( GetExport().GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_TEXT,
GetXMLToken(XML_LIST_ITEM) ) );
- GetExport().GetDocHandler()->ignorableWhitespace( GetExport().sWS );
- GetExport().GetDocHandler()->startElement( *pElem,
- GetExport().GetXAttrList() );
- GetExport().ClearAttrList();
+ GetExport().IgnorableWhitespace();
+ GetExport().StartElement( *pElem, sal_False );
pListElements->Insert( pElem, pListElements->Count() );
}
@@ -1810,7 +1800,7 @@ void XMLTextParagraphExport::exportTextField(
else
{
// write only characters
- GetExport().GetDocHandler()->characters(rTextRange->getString());
+ GetExport().Characters(rTextRange->getString());
}
}
@@ -2368,7 +2358,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_SVG,
XML_DESC, sal_True, sal_False );
- GetExport().GetDocHandler()->characters( sAltText );
+ GetExport().Characters( sAltText );
}
*/
@@ -2481,7 +2471,7 @@ void XMLTextParagraphExport::exportAlternativeText(
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_SVG,
XML_DESC, sal_True, sal_False );
- GetExport().GetDocHandler()->characters( sAltText );
+ GetExport().Characters( sAltText );
}
}
}
@@ -2762,7 +2752,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
{
DBG_ASSERT( 0==nSpaceChars, "pending spaces" );
OUString sExp( rText.copy( nExpStartPos, nPos - nExpStartPos ) );
- GetExport().GetDocHandler()->characters( sExp );
+ GetExport().Characters( sExp );
nExpStartPos = nPos;
}
@@ -2830,7 +2820,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
{
DBG_ASSERT( 0==nSpaceChars, " pending spaces " );
OUString sExp( rText.copy( nExpStartPos, nEndPos - nExpStartPos ) );
- GetExport().GetDocHandler()->characters( sExp );
+ GetExport().Characters( sExp );
}
// If there are some spaces left, they have to be exported now.
@@ -3002,12 +2992,10 @@ void XMLTextParagraphExport::exportRuby(
XML_STYLE_NAME, sStyleName);
// export <text:ruby> and <text:ruby-base> start elements
- GetExport().GetDocHandler()->startElement(
- sTextRuby, GetExport().GetXAttrList());
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
GetExport().ClearAttrList();
- GetExport().GetDocHandler()->startElement(
- sTextRubyBase, GetExport().GetXAttrList());
-
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE,
+ sal_False );
bOpenRuby = sal_True;
}
else
@@ -3020,7 +3008,8 @@ void XMLTextParagraphExport::exportRuby(
return;
// close <text:ruby-base>
- GetExport().GetDocHandler()->endElement(sTextRubyBase);
+ GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY_BASE,
+ sal_False);
// write the ruby text (with char style)
{
@@ -3033,11 +3022,11 @@ void XMLTextParagraphExport::exportRuby(
GetExport(), XML_NAMESPACE_TEXT, XML_RUBY_TEXT,
sal_False, sal_False);
- GetExport().GetDocHandler()->characters(sOpenRubyText);
+ GetExport().Characters(sOpenRubyText);
}
// and finally, close the ruby
- GetExport().GetDocHandler()->endElement(sTextRuby);
+ GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
bOpenRuby = sal_False;
}
}
generated by cgit (git 2.34.1) at 2025-02-07 18:12:56 +0000