[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KOFFICE_1_3_BRANCH: koffice/lib/kotext
From: Nicolas Goutte <nicolasg () snafu ! de>
Date: 2004-10-04 0:17:54
Message-ID: 20041004001754.AC6D39910 () office ! kde ! org
[Download RAW message or body]
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic