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

List:       kde-commits
Subject:    koffice/filters/kword/mswrite
From:       Laurent Montel <montel () kde ! org>
Date:       2006-03-30 12:09:53
Message-ID: 1143720593.402391.19447.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 524368 by mlaurent:

fix some error


 M  +1 -1      CMakeLists.txt  
 M  +5 -6      mswriteexport.cc  


--- trunk/koffice/filters/kword/mswrite/CMakeLists.txt #524367:524368
@@ -1,8 +1,8 @@
 kde4_header()
 
 
+include_directories(${CMAKE_SOURCE_DIR}/libs/kwmf )
 
-
 ########### next target ###############
 
 set(mswriteimport_PART_SRCS 
--- trunk/koffice/filters/kword/mswrite/mswriteexport.cc #524367:524368
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include <qbuffer.h>
 #include <q3cstring.h>
 #include <qfile.h>
@@ -1128,12 +1127,12 @@
 
 				QByteArray imageWMF;
 					// input device
-					QBuffer inBuffer (imageData);
+					QBuffer inBuffer (&imageData);
 					inBuffer.open (QIODevice::ReadOnly);
 					QBufferDevice inDevice (&inBuffer);
 
 					// output device
-					QBuffer outBuffer (imageWMF);
+					QBuffer outBuffer (&imageWMF);
 					outBuffer.open (QIODevice::WriteOnly);
 					QBufferDevice outDevice (&outBuffer);
 
@@ -1172,7 +1171,7 @@
 
 				QByteArray imageBMP;
 					// input device
-					QBuffer inBuffer (imageData);
+					QBuffer inBuffer (&imageData);
 					inBuffer.open (QIODevice::ReadOnly);
 
 					// read foreign image
@@ -1184,7 +1183,7 @@
 					}
 
 					// output device
-					QBuffer outBuffer (imageBMP);
+					QBuffer outBuffer (&imageBMP);
 					outBuffer.open (QIODevice::WriteOnly);
 
 					// write BMP
@@ -1198,7 +1197,7 @@
 
 					outBuffer.close ();
 					inBuffer.close ();
-				imageData = imageBMP.copy ();
+				imageData = imageBMP/*.copy ()*/;
 
 				imageType = ".bmp";
 			}
[prev in list] [next in list] [prev in thread] [next in thread]