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

List:       kde-commits
Subject:    koffice/libs/kofficecore
From:       Laurent Montel <montel () kde ! org>
Date:       2006-03-28 11:45:08
Message-ID: 1143546308.524869.18280.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 523496 by mlaurent:

Fix some error


 M  +1 -1      KoDocument.cpp  
 M  +4 -4      KoPictureShared.cpp  


--- trunk/koffice/libs/kofficecore/KoDocument.cpp #523495:523496
@@ -972,7 +972,7 @@
     {
         kDebug(30003) << "Saving as a flat XML file." << endl;
         QFile f( file );
-        if ( f.open( QIODevice::WriteOnly /*| QIODevice::Translate*/ ) )
+        if ( f.open( QIODevice::WriteOnly | QIODevice::Text ) )
         {
             bool success = saveToStream( &f );
             f.close();
--- trunk/koffice/libs/kofficecore/KoPictureShared.cpp #523495:523496
@@ -209,7 +209,7 @@
     else if ( ( array[0] == char( 0037 ) ) && ( array[1] == char( 0213 ) ) )
     {
         // Gzip
-        QBuffer buffer(array);
+        QBuffer buffer(&array);
         buffer.open(QIODevice::ReadOnly);
 
         const bool flag = loadCompressed( &buffer, "application/x-gzip", "tmp" );
@@ -219,7 +219,7 @@
     else if ( ( array[0] == 'B' ) && ( array[1] == 'Z' ) && ( array[2] == 'h') )
     {
         // BZip2
-        QBuffer buffer(array);
+        QBuffer buffer(&array);
         buffer.open(QIODevice::ReadOnly);
         const bool flag = loadCompressed( &buffer, "application/x-bzip2", "tmp" );
         buffer.close();
@@ -233,7 +233,7 @@
         // Do not trust QBuffer and do not work directly on the QByteArray array
         // DF: It would be faster to work on array here, and to create a completely
         // different QBuffer for the writing code!
-        QBuffer buf( array.copy() );
+        QBuffer buf( &array.copy() );
         if (!buf.open(QIODevice::ReadOnly))
         {
             kError(30003) << "Could not open read buffer!" << endl;
@@ -312,7 +312,7 @@
 
     m_base=new KoPictureImage();
 
-    QBuffer buffer(array);
+    QBuffer buffer(&array);
     bool check = m_base->load(&buffer,"xpm");
     setExtension("xpm");
     return check;
[prev in list] [next in list] [prev in thread] [next in thread]