[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: koffice/filters/kword/libexport
From: Nicolas Goutte <nicolasg () snafu ! de>
Date: 2003-08-29 22:04:15
[Download RAW message or body]
CVS commit by goutte:
Add frame data to the cell data
(Needed for the table support of the RTF export filter.)
CCMAIL:koffice-devel@kde.org
M +2 -2 KWEFKWordLeader.cc 1.41
M +4 -3 KWEFStructures.cc 1.13
M +38 -34 KWEFStructures.h 1.45
--- koffice/filters/kword/libexport/KWEFKWordLeader.cc #1.40:1.41
@@ -381,5 +381,5 @@ static void ProcessFramesetTag ( QDomNod
ProcessSubtags (myNode, tagProcessingList, leader);
- frameAnchor->table.addCell (col, row, cellParaList);
+ frameAnchor->table.addCell (col, row, cellParaList, frameAnchor->frame);
}
else
--- koffice/filters/kword/libexport/KWEFStructures.cc #1.12:1.13
@@ -44,5 +44,6 @@ TableCell::~TableCell ( void )
void Table::addCell ( int c,
int r,
- QValueList<ParaData> &p )
+ QValueList<ParaData> &p,
+ FrameData &frameData )
{
if ( c + 1 > cols )
@@ -51,5 +52,5 @@ void Table::addCell ( int
}
- cellList << TableCell ( c, r, new QValueList<ParaData> (p) );
+ cellList << TableCell ( c, r, new QValueList<ParaData> (p), frameData );
}
--- koffice/filters/kword/libexport/KWEFStructures.h #1.44:1.45
@@ -110,37 +110,4 @@ class TextFormatting
-class ParaData;
-
-class TableCell
-{
- public:
- TableCell (): col( 0 ), row( 0 ), paraList( 0 ) {}
-
- TableCell ( int c,
- int r,
- QValueList<ParaData> *p ) : col (c), row (r), paraList (p) {}
-
- ~TableCell ();
-
- int col;
- int row;
- QValueList<ParaData> *paraList;
-};
-
-
-class Table
-{
- public:
- Table () : cols (0) {}
-
- void addCell ( int c,
- int r,
- QValueList<ParaData> &p );
-
- int cols;
- QValueList<TableCell> cellList;
-};
-
-
class Picture
{
@@ -186,4 +153,41 @@ public:
double bleftpt, brightpt, btoppt, bbottompt;
};
+
+
+class ParaData;
+
+class TableCell
+{
+ public:
+ TableCell (): col( 0 ), row( 0 ), paraList( 0 ) {}
+
+ TableCell ( int c,
+ int r,
+ QValueList<ParaData> *p,
+ FrameData &frameData ) : col (c), row (r), paraList (p), frame (frameData) {}
+
+ ~TableCell ();
+
+ int col;
+ int row;
+ QValueList<ParaData> *paraList;
+ FrameData frame;
+};
+
+
+class Table
+{
+ public:
+ Table () : cols (0) {}
+
+ void addCell ( int c,
+ int r,
+ QValueList<ParaData> &p,
+ FrameData &frameData );
+
+ int cols;
+ QValueList<TableCell> cellList;
+};
+
//This is basically FRAMESET tag
_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic