summaryrefslogtreecommitdiffstats
path: root/filters/kword/html/import
diff options
context:
space:
mode:
Diffstat (limited to 'filters/kword/html/import')
-rw-r--r--filters/kword/html/import/khtmlreader.cpp36
-rw-r--r--filters/kword/html/import/kwdwriter.cpp14
-rw-r--r--filters/kword/html/import/kwdwriter.h2
3 files changed, 26 insertions, 26 deletions
diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 1df58edf7..6e134e381 100644
--- a/filters/kword/html/import/khtmlreader.cpp
+++ b/filters/kword/html/import/khtmlreader.cpp
@@ -236,7 +236,7 @@ void KHTMLReader::parse_head(DOM::Element e)
state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\
if (!(_writer->getText(state()->paragraph).isEmpty())) \
startNewParagraph(false,false); \
- _writer->tqlayoutAttribute(state()->paragraph, #a,#b,#c); \
+ _writer->layoutAttribute(state()->paragraph, #a,#b,#c); \
return true; \
} \
}
@@ -317,11 +317,11 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout)
TQString ct=_writer->getLayoutAttribute(state()->paragraph,"COUNTER","type");
if ((!ct.isNull()) && (ct != "0"))
{
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","0");
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","type","0");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt();
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
}
}
@@ -353,12 +353,12 @@ bool KHTMLReader::parse_CommonAttributes(DOM::Element e)
// example: <p class="h1" style="text-align:left; ">
{
kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl;
- _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
+ _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
}
if ( e.getAttribute("class").string()=="Standard" )
{
kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl;
- _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
+ _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
}
kdDebug(30503) << "leaving parse_CommonAttributes" << endl;
return true;
@@ -509,7 +509,7 @@ void KHTMLReader::parseStyle(DOM::Element e)
if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") )
{
state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);
- _writer->tqlayoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
+ _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
}
// done
@@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
_list_depth++;
if (e.firstChild().nodeName().string().lower() == "#text") // e.g. <ul>this is indented<li>first listitem</li></ul>
{
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
startNewLayout();
}
for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling())
@@ -692,21 +692,21 @@ bool KHTMLReader::parse_ul(DOM::Element e)
if (items.nodeName().string().lower() == "li")
{
if (!(_writer->getText(state()->paragraph).isEmpty())) startNewLayout();
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",".");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
if (e.tagName().string().lower() == "ol")
{
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","1");
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",".");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","type","1");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
}
else
{
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","10");
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","type","10");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
}
- _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+ _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
}
parseNode(items);
}
diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp
index d2e4c4509..23211ecc2 100644
--- a/filters/kword/html/import/kwdwriter.cpp
+++ b/filters/kword/html/import/kwdwriter.cpp
@@ -207,7 +207,7 @@ void KWDWriter::finishTable(int tableno) {
void KWDWriter::createHR(TQDomElement paragraph, int width) {
- tqlayoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width));
+ layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width));
}
void KWDWriter::finishTable(int tableno,TQRect rect) {
@@ -353,16 +353,16 @@ TQRect getRect(TQDomElement frameset) {
}
-TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement tqlayoutToClone) {
+TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement layoutToClone) {
TQDomElement paragraph=_doc->createElement("PARAGRAPH");
TQDomElement formats=_doc->createElement("FORMATS");
TQDomElement tqlayout;
- if (tqlayoutToClone.isNull()) {
+ if (layoutToClone.isNull()) {
tqlayout=_doc->createElement("LAYOUT");
}
else {
- tqlayout=tqlayoutToClone.cloneNode().toElement();
+ tqlayout=layoutToClone.cloneNode().toElement();
}
TQDomElement text=_doc->createElement("TEXT");
TQDomText t=_doc->createTextNode(TQString(""));
@@ -371,7 +371,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement tqlayou
paragraph.appendChild(text);
tqparent.appendChild(paragraph);
paragraph.appendChild(tqlayout);
- tqlayoutAttribute(paragraph,"NAME","value","Standard");
+ layoutAttribute(paragraph,"NAME","value","Standard");
return paragraph;
}
@@ -403,9 +403,9 @@ TQString KWDWriter::getLayoutAttribute(TQDomElement paragraph, TQString name, TQ
return TQString();
}
-TQDomElement KWDWriter::tqlayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr)
+TQDomElement KWDWriter::layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr)
{
- kdDebug() << "Entering KWDWriter::tqlayoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl;
+ kdDebug() << "Entering KWDWriter::layoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl;
TQDomElement currentLayout=paragraph.elementsByTagName("LAYOUT").item(0).toElement();
TQDomNodeList qdnl= currentLayout.elementsByTagName(name);
diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h
index 2fc888c4b..59694e8d3 100644
--- a/filters/kword/html/import/kwdwriter.h
+++ b/filters/kword/html/import/kwdwriter.h
@@ -131,7 +131,7 @@ public:
/**
* adds/changes an attribute to/of the current tqlayout
**/
- TQDomElement tqlayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
+ TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
/**
* creates a new format in the current paragraph. do this before adding text
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 19:01:41 +0000