[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 83972] KOffice 1.3.1 does not compile on KDE 3.1/Qt 3.1
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2004-10-04 0:18:02
Message-ID: 20041004001802.31000.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
        
http://bugs.kde.org/show_bug.cgi?id=83972        




------- Additional Comments From nicolasg snafu de  2004-10-04 02:17 -------
CVS commit by goutte: 

Last step to be able to compile KoText on Qt 3.1
CCMAIL:83972 bugs kde org


  M +29 -0     kotextobject.cc   1.137.2.3


--- koffice/lib/kotext/kotextobject.cc  #1.137.2.2:1.137.2.3
 @ -18,4 +18,9  @
 */
 
+#include <qglobal.h>
+#if QT_VERSION >= 0x030200
+#define INDIC
+#endif
+
 #include <qtimer.h>
 #include <qregexp.h>
 @ -454,5 +459,10  @ void KoTextObject::doKeyboardAction( KoT
                 emit newCommand(cmd);
         }
+#ifndef INDIC
+        else if ( !cursor->atParagStart() || parag->prev() )
+        // Nothing to do if at the beginning of the very first parag
+#else
         else if ( !cursor->atParagStart() )
+#endif
         {
             checkUndoRedoInfo( cursor, UndoRedoInfo::Delete );
 @ -464,4 +474,20  @ void KoTextObject::doKeyboardAction( KoT
                 undoRedoInfo.oldParagLayouts << parag->paragLayout();
             }
+#ifndef INDIC
+            cursor->gotoPreviousLetter();
+            KoTextStringChar * ch = cursor->parag()->at( cursor->index() );
+            undoRedoInfo.text.prepend( QString( ch->c ) );
+            copyCharFormatting( cursor->parag(), cursor->index(), 0, true );
+            undoRedoInfo.index = cursor->index();
+            KoParagLayout paragLayout = cursor->parag()->paragLayout();
+            if ( cursor->remove() ) {
+                undoRedoInfo.text.remove( 0, 1 );
+                undoRedoInfo.text.prepend( "\n" );
+                undoRedoInfo.index = cursor->index();
+                undoRedoInfo.id = cursor->parag()->paragId();
+                undoRedoInfo.oldParagLayouts.prepend( paragLayout );
+            } else
+                emit paragraphModified( cursor->parag(), RemoveChar, \
cursor->index(),1 ); +#else
             undoRedoInfo.text.insert( 0, cursor->parag()->at( cursor->index()-1 ) );
             copyCharFormatting( cursor->parag(), cursor->index()-1, 0, true );
 @ -470,5 +496,7  @ void KoTextObject::doKeyboardAction( KoT
             cursor->removePreviousChar();
             emit paragraphModified( cursor->parag(), RemoveChar, cursor->index(),1 \
); +#endif
             m_lastFormatted = cursor->parag();
+#ifdef INDIC
         } else if ( parag->prev() ) { // joining paragraphs
             emit paragraphDeleted( cursor->parag() );
 @ -479,4 +507,5  @ void KoTextObject::doKeyboardAction( KoT
             removeSelectedText( cursor, KoTextDocument::Temp, i18n( "Delete Text" ) \
                );
             emit paragraphModified( cursor->parag(), AddChar, cursor->index(), \
cursor->parag()->length() - cursor->index() ); +#endif
         }
     } break;


[prev in list] [next in list] [prev in thread] [next in thread]