patches are inside the official tarball

5 files changed, 0 insertions, 148 deletions

diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwcanvas.diff b/app-office/koffice/files/koffice-1.2_beta1-kwcanvas.diff
deleted file mode 100644
index d94f33228311..000000000000
--- a/app-office/koffice/files/koffice-1.2_beta1-kwcanvas.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- kwcanvas.cc	2002/04/17 11:30:35	1.336
-+++ kwcanvas.cc	2002/04/22 19:19:12	1.337
-@@ -1256,13 +1256,14 @@ void KWCanvas::mrCreateTable()
- KWTableFrameSet * KWCanvas::createTable() // uses m_insRect and m_table to create the table
- {
-     KWTableFrameSet *table = new KWTableFrameSet( m_doc, QString::null /*automatic name*/ );
-+    int pageNum = static_cast<int>(m_insRect.y() / m_doc->ptPaperHeight());
-
-     // Create a set of cells with random-size frames.
-     for ( unsigned int i = 0; i < m_table.rows; i++ ) {
-         for ( unsigned int j = 0; j < m_table.cols; j++ ) {
-             KWTableFrameSet::Cell *cell = new KWTableFrameSet::Cell( table, i, j, QString::null /*automatic name*/ );
-             KWFrame *frame = new KWFrame(cell, 0, 0, 0, 0, KWFrame::RA_NO ); // pos and size will be set in setBoundingRect
--            // Wrong page! frame->setZOrder( m_doc->maxZOrder( frame->pageNum(m_doc) ) + 1 ); // make sure it's on top
-+            frame->setZOrder( m_doc->maxZOrder( pageNum ) + 1 ); // make sure it's on top
-             cell->addFrame( frame, false );
-             frame->setFrameBehavior(KWFrame::AutoExtendFrame);
-             frame->setNewFrameBehavior(KWFrame::NoFollowup);
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwdoc.diff b/app-office/koffice/files/koffice-1.2_beta1-kwdoc.diff
deleted file mode 100644
index 024dd14d5307..000000000000
--- a/app-office/koffice/files/koffice-1.2_beta1-kwdoc.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- kwdoc.cc	2002/04/18 08:56:25	1.384
-+++ kwdoc.cc	2002/04/22 19:02:40	1.385
-@@ -1659,22 +1659,25 @@ bool KWDocument::completeLoading( KoStor
-     processImageRequests();
-     processAnchorRequests();
-
-+    // Save memory
-+    m_urlIntern = QString::null;
-+
-     // The fields from documentinfo.xml just got loaded -> update vars
-     recalcVariables( VT_FIELD );
-
-+    // This computes the number of pages (from the frames)
-+    // for the first time (and adds footers/headers etc.)
-+    // It is necessary to do so BEFORE calling finalize, since updateFrames
-+    // (in KWTextFrameSet) needs the number of pages.
-+    recalcFrames();
-+
-     // Finalize all the existing framesets
-     QPtrListIterator<KWFrameSet> fit = framesetsIterator();
-     for ( ; fit.current() ; ++fit )
-         fit.current()->finalize();
-
--    // Save memory
--    m_urlIntern = QString::null;
--
-     // Fix z orders on older documents
-     fixZOrders();
--
--    recalcFrames(); // This computes the number of pages (from the frames)
--                    // for the first time (and adds footers/headers etc.)
-
-     emit newContentsSize();
-     repaintAllViews( true );     // in case any view exists already
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwtableframeset.diff b/app-office/koffice/files/koffice-1.2_beta1-kwtableframeset.diff
deleted file mode 100644
index bdee402857cb..000000000000
--- a/app-office/koffice/files/koffice-1.2_beta1-kwtableframeset.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- kwtableframeset.cc	2002/04/03 06:11:15	1.191
-+++ kwtableframeset.cc	2002/04/23 13:30:24
-@@ -81,7 +81,9 @@ void KWTableFrameSet::updateFrames()
-     for (unsigned int i =0; i < m_cells.count(); i++)
-     {
-         m_cells.at(i)->updateFrames();
--        m_cells.at(i)->invalidate();
-+        //This is wrong (reason for famous infinite loop bug)
-+        //Do this in KWTableFrameSet::invalidate
-+        //m_cells.at(i)->invalidate();
-     }
-     KWFrameSet::updateFrames();
- }
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.diff b/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.diff
deleted file mode 100644
index 19b26694f08c..000000000000
--- a/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.diff
+++ /dev/null
@@ -1,72 +0,0 @@
---- kwtextframeset.cc	2002/04/18 15:56:37	1.504
-+++ kwtextframeset.cc	2002/04/23 13:30:25
-@@ -1558,7 +1558,7 @@ void KWTextFrameSet::slotAfterFormatting
-                     if ( wantedPosition != theFrame->top() && QMAX(theFrame->bottom()-maxFooterSize,wantedPosition)==wantedPosition )
-                     {
-                         theFrame->setTop( wantedPosition);
--                        frameResized( theFrame );
-+                        frameResized( theFrame, true );
-                     }
-                     break;
-                 }
-@@ -1594,7 +1594,7 @@ void KWTextFrameSet::slotAfterFormatting
-
-                 if(newPosition < wantedPosition && (theFrame->newFrameBehavior() == KWFrame::NoFollowup)) {
-                     if ( resized )
--                        frameResized( theFrame );
-+                        frameResized( theFrame, false );
-                     m_textobj->setLastFormattedParag( 0 );
-                     break;
-                 }
-@@ -1603,7 +1603,7 @@ void KWTextFrameSet::slotAfterFormatting
-                     // fall through to AutoCreateNewFrame
-                 } else {
-                     if ( resized )
--                        frameResized( theFrame );
-+                        frameResized( theFrame, false );
-                     break;
-                 }
-             }
-@@ -1704,7 +1704,7 @@ void KWTextFrameSet::slotAfterFormatting
-             {
-                 kdDebug() << "top= " << theFrame->top() << " setTop " << wantedPosition << endl;
-                 theFrame->setTop( wantedPosition );
--                frameResized( theFrame );
-+                frameResized( theFrame, true );
-             }
-         }
-         else
-@@ -1725,12 +1725,12 @@ void KWTextFrameSet::slotAfterFormatting
-                         kdDebug(32002) << "is table cell; only setting new minFrameHeight, recalcrows will do the rest" << endl;
- #endif
-                         theFrame->setMinFrameHeight(wantedPosition - theFrame->top());
--                        frameResized( theFrame );
-+                        frameResized( theFrame, false );
-                     }
-                 } else {
-                     kdDebug() << "setBottom " << wantedPosition << endl;
-                     theFrame->setBottom( wantedPosition );
--                    frameResized( theFrame );
-+                    frameResized( theFrame, false );
-                 }
-             }
-         }
-@@ -1759,7 +1759,7 @@ double KWTextFrameSet::footerHeaderSizeM
-     return tmp;
- }
-
--void KWTextFrameSet::frameResized( KWFrame *theFrame )
-+void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout )
- {
-     //kdDebug() << "KWTextFrameSet::frameResized " << theFrame << endl;
-     if ( theFrame->frameSet()->frameSetInfo() != KWFrameSet::FI_BODY )
-@@ -1777,7 +1777,8 @@ void KWTextFrameSet::frameResized( KWFra
-     // Warning, can't call layout() (frameChanged calls it)
-     // from here, since it calls formatMore() !
-     m_doc->updateAllFrames();
--    m_doc->invalidate();
-+    if ( invalidateLayout )
-+        m_doc->invalidate();
-     theFrame->updateRulerHandles();
-
-     // Can't call this directly, we might be in a paint event already
diff --git a/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.h.diff b/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.h.diff
deleted file mode 100644
index 57575af1a7b7..000000000000
--- a/app-office/koffice/files/koffice-1.2_beta1-kwtextframeset.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kwtextframeset.h	2002/04/06 08:30:41	1.174
-+++ kwtextframeset.h	2002/04/23 13:30:25
-@@ -237,7 +237,7 @@ protected slots:
- protected:
-     void getMargins( int yp, int h, int* marginLeft, int* marginRight, int* breakBegin, int* breakEnd, int paragLeftMargin = 0 );
-     bool checkVerticalBreak( int & yp, int & h, KoTextParag * parag, bool linesTogether, int breakBegin, int breakEnd );
--    void frameResized( KWFrame *theFrame );
-+    void frameResized( KWFrame *theFrame, bool invalidateLayout );
-     double footerHeaderSizeMax( KWFrame *theFrame );
-     QDomElement saveInternal( QDomElement &parentElem, bool saveFrames, bool saveAnchorsFramesets );
-