summaryrefslogtreecommitdiffstats
path: root/filters/kspread/opencalc
diff options
context:
space:
mode:
Diffstat (limited to 'filters/kspread/opencalc')
-rw-r--r--filters/kspread/opencalc/opencalcexport.cc48
-rw-r--r--filters/kspread/opencalc/opencalcexport.h6
-rw-r--r--filters/kspread/opencalc/opencalcimport.cc10
-rw-r--r--filters/kspread/opencalc/opencalcimport.h2
-rw-r--r--filters/kspread/opencalc/opencalcstyleexport.cc2
5 files changed, 34 insertions, 34 deletions
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index 6a0376f4..9e37597c 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -402,7 +402,7 @@ bool OpenCalcExport::exportContent( KoStore * store, const Doc * ksdoc )
return true;
}
-void exportNamedExpr( TQDomDocument & doc, TQDomElement & tqparent,
+void exportNamedExpr( TQDomDocument & doc, TQDomElement & parent,
AreaList const & namedAreas )
{
AreaList::const_iterator it = namedAreas.begin();
@@ -418,7 +418,7 @@ void exportNamedExpr( TQDomDocument & doc, TQDomElement & tqparent,
namedRange.setAttribute( "table:base-cell-address", convertRefToBase( ref.sheet_name, ref.rect ) );
namedRange.setAttribute( "table:cell-range-address", convertRefToRange( ref.sheet_name, ref.rect ) );
- tqparent.appendChild( namedRange );
+ parent.appendChild( namedRange );
++it;
}
@@ -1026,14 +1026,14 @@ void OpenCalcExport::exportMasterStyles( TQDomDocument & doc, TQDomElement & mas
}
void OpenCalcExport::addText( TQString const & text, TQDomDocument & doc,
- TQDomElement & tqparent )
+ TQDomElement & parent )
{
if (text.length() > 0 )
- tqparent.appendChild( doc.createTextNode( text ) );
+ parent.appendChild( doc.createTextNode( text ) );
}
void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
- TQDomElement & tqparent, const Doc * ksdoc )
+ TQDomElement & parent, const Doc * ksdoc )
{
TQString text;
TQString var;
@@ -1052,54 +1052,54 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
inVar = false;
if ( var == "<page>" )
{
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
TQDomElement page = doc.createElement( "text:page-number" );
page.appendChild( doc.createTextNode( "1" ) );
- tqparent.appendChild( page );
+ parent.appendChild( page );
}
else if ( var == "<pages>" )
{
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
TQDomElement page = doc.createElement( "text:page-count" );
page.appendChild( doc.createTextNode( "99" ) );
- tqparent.appendChild( page );
+ parent.appendChild( page );
}
else if ( var == "<date>" )
{
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
TQDomElement t = doc.createElement( "text:date" );
t.setAttribute( "text:date-value", "0-00-00" );
// todo: "style:data-style-name", "N2"
t.appendChild( doc.createTextNode( TQDate::tqcurrentDate().toString() ) );
- tqparent.appendChild( t );
+ parent.appendChild( t );
}
else if ( var == "<time>" )
{
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
TQDomElement t = doc.createElement( "text:time" );
t.appendChild( doc.createTextNode( TQTime::currentTime().toString() ) );
- tqparent.appendChild( t );
+ parent.appendChild( t );
}
else if ( var == "<file>" ) // filepath + name
{
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
TQDomElement t = doc.createElement( "text:file-name" );
t.setAttribute( "text:display", "full" );
t.appendChild( doc.createTextNode( "???" ) );
- tqparent.appendChild( t );
+ parent.appendChild( t );
}
else if ( var == "<name>" ) // filename
{
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
TQDomElement t = doc.createElement( "text:title" );
t.appendChild( doc.createTextNode( "???" ) );
- tqparent.appendChild( t );
+ parent.appendChild( t );
}
else if ( var == "<author>" )
{
@@ -1108,7 +1108,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
text += authorPage->fullName();
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
}
else if ( var == "<email>" )
{
@@ -1117,7 +1117,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
text += authorPage->email();
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
}
else if ( var == "<org>" )
{
@@ -1126,21 +1126,21 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
text += authorPage->company();
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
}
else if ( var == "<sheet>" )
{
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
TQDomElement s = doc.createElement( "text:sheet-name" );
s.appendChild( doc.createTextNode( "???" ) );
- tqparent.appendChild( s );
+ parent.appendChild( s );
}
else
{
// no known variable:
text += var;
- addText( text, doc, tqparent );
+ addText( text, doc, parent );
}
text = "";
@@ -1156,7 +1156,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
if ( !text.isEmpty() || !var.isEmpty() )
{
//we don't have var at the end =>store it
- addText( text+var, doc, tqparent );
+ addText( text+var, doc, parent );
}
}
diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h
index 54748144..97832a9a 100644
--- a/filters/kspread/opencalc/opencalcexport.h
+++ b/filters/kspread/opencalc/opencalcexport.h
@@ -43,7 +43,7 @@ class OpenCalcExport : public KoFilter
TQ_OBJECT
public:
- OpenCalcExport( KoFilter * tqparent, const char * name, const TQStringList & );
+ OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & );
virtual ~OpenCalcExport() {}
virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
@@ -76,9 +76,9 @@ class OpenCalcExport : public KoFilter
void maxRowCols( const KSpread::Sheet * sheet,
int & maxCols, int & maxRows );
void convertPart( TQString const & part, TQDomDocument & doc,
- TQDomElement & tqparent, const KSpread::Doc * ksdoc );
+ TQDomElement & parent, const KSpread::Doc * ksdoc );
void addText( TQString const & text, TQDomDocument & doc,
- TQDomElement & tqparent );
+ TQDomElement & parent );
void createDefaultStyles();
TQString convertFormula( TQString const & formula ) const;
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index f52ffd0f..376a8f77 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -476,8 +476,8 @@ bool OpenCalcImport::readCells( TQDomElement & rowNode, Sheet * table, int row,
cell = table->nonDefaultCell( columns, row );
TQString psName( "Default" );
- if ( e.hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
- psName = e.attributeNS( ooNS::style, "tqparent-style-name", TQString() );
+ if ( e.hasAttributeNS( ooNS::style, "parent-style-name" ) )
+ psName = e.attributeNS( ooNS::style, "parent-style-name", TQString() );
kdDebug(30518) << "Default style: " << psName << endl;
Format * tqlayout = m_defaultStyles[psName];
@@ -2221,11 +2221,11 @@ void OpenCalcImport::readInStyle( Format * tqlayout, TQDomElement const & style
kdDebug(30518) << "** Reading Style: " << style.tagName() << "; " << style.attributeNS( ooNS::style, "name", TQString()) << endl;
if ( style.localName() == "style" && style.namespaceURI()==ooNS::style)
{
- if ( style.hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
+ if ( style.hasAttributeNS( ooNS::style, "parent-style-name" ) )
{
Format * cp
- = m_defaultStyles.find( style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) );
- kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "tqparent-style-name", TQString() ) << endl;
+ = m_defaultStyles.find( style.attributeNS( ooNS::style, "parent-style-name", TQString() ) );
+ kdDebug(30518) << "Copying tqlayout from " << style.attributeNS( ooNS::style, "parent-style-name", TQString() ) << endl;
if ( cp != 0 )
tqlayout->copy( *cp );
diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h
index b7dca822..cd1f23b6 100644
--- a/filters/kspread/opencalc/opencalcimport.h
+++ b/filters/kspread/opencalc/opencalcimport.h
@@ -44,7 +44,7 @@ class OpenCalcImport : public KoFilter
Q_OBJECT
TQ_OBJECT
public:
- OpenCalcImport( KoFilter * tqparent, const char * name, const TQStringList & );
+ OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & );
virtual ~OpenCalcImport();
virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc
index 2c81a2cc..f075713a 100644
--- a/filters/kspread/opencalc/opencalcstyleexport.cc
+++ b/filters/kspread/opencalc/opencalcstyleexport.cc
@@ -200,7 +200,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl
TQDomElement ts = doc.createElement( "style:style" );
ts.setAttribute( "style:name", t->name );
ts.setAttribute( "style:family", "table-cell" );
- ts.setAttribute( "style:tqparent-style-name", "Default" );
+ ts.setAttribute( "style:parent-style-name", "Default" );
if ( t->numberStyle.length() > 0 )
ts.setAttribute( "style:data-style-name", t->numberStyle );