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

List:       kde-commits
Subject:    koffice/kword
From:       Ulrich Kuettler <ulrich.kuettler () mailbox ! tu-dresden ! de>
Date:       2003-05-31 15:39:48
[Download RAW message or body]

CVS commit by kuettler: 

formula past fix


  M +7 -5      kwformulaframe.cc   1.4
  M +2 -1      kwview.cc   1.969


--- koffice/kword/kwformulaframe.cc  #1.3:1.4
@@ -59,8 +59,8 @@
 #include <assert.h>
 
-#ifdef __GNUC__
-#undef k_funcinfo
-#define k_funcinfo "[\033[36m" << __PRETTY_FUNCTION__ << "\033[m] "
-#endif
+// #ifdef __GNUC__
+// #undef k_funcinfo
+// #define k_funcinfo "[\033[36m" << __PRETTY_FUNCTION__ << "\033[m] "
+// #endif
 
 /******************************************************************/
@@ -417,5 +417,7 @@ void KWFormulaFrameSetEdit::focusInEvent
 {
     //kdDebug(32001) << "KWFormulaFrameSetEdit::focusInEvent" << endl;
+    if ( formulaView != 0 ) {
     formulaView->focusInEvent(0);
+    }
 }
 

--- koffice/kword/kwview.cc  #1.968:1.969
@@ -3843,5 +3843,6 @@ void KWView::insertFormula( QMimeSource*
             QDomDocument formula;
             formula.setContent( data );
-            frameset->paste( formula );
+            QDomElement formulaElem = formula.namedItem("KFORMULA").toElement();
+            frameset->paste( formulaElem );
         }
         KWFrame *frame = new KWFrame(frameset, 0, 0, 10, 10 );


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