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

List:       kde-commits
Subject:    koffice/filters/kspread/gnumeric
From:       Laurent Montel <montel () kde ! org>
Date:       2005-02-01 22:38:31
Message-ID: 20050201223831.EADF91D018 () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Nikolas is right.
Apply its patch.
Thanks.
(copying by value is slow!)


  M +6 -7      gnumericexport.cc   1.37
  M +6 -0      gnumericimport.cc   1.33


--- koffice/filters/kspread/gnumeric/gnumericexport.cc  #1.36:1.37
@@ -1,4 +1,5 @@
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
+   Copyright (C) 2005 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or
@@ -810,10 +811,8 @@ KoFilter::ConversionStatus GNUMERICExpor
     {
         QDomElement areaNames = gnumeric_doc.createElement("gmr:Names");
-        QValueList<Reference>::Iterator it;
-        QValueList<Reference>::Iterator itbegin;
-        QValueList<Reference> area =ksdoc->listArea();
-        itbegin=area.begin();
-        QValueList<Reference>::Iterator itend( area.end() );
-        for ( it = itbegin; it != itend; ++it )
+        const QValueList<Reference> &area = ksdoc->listArea(); // copying by value is slow!
+        QValueList<Reference>::ConstIterator it = area.begin();
+        QValueList<Reference>::ConstIterator end = area.end();
+        for ( ; it != end; ++it )
         {
             QDomElement areaName = gnumeric_doc.createElement("gmr:Name");
@@ -1226,5 +1225,5 @@ QString convertRefToRange( const QString
   QPoint topLeft( rect.topLeft() );
   QPoint bottomRight( rect.bottomRight() );
-#if 0
+#if 0 //FIXME !!!!
   if ( topLeft == bottomRight )
     return convertRefToBase( table, rect );

--- koffice/filters/kspread/gnumeric/gnumericimport.cc  #1.32:1.33
@@ -975,4 +975,5 @@ void GNUMERICFilter::setStyleInfo(QDomNo
       QDomNode validation = style.namedItem( "gmr:Validation" );
       QDomNode gmr_styleborder = style.namedItem( "gmr:StyleBorder" );
+      QDomNode hyperlink = style.namedItem( "gmr:HyperLink" );
       int startCol = e.attribute( "startCol" ).toInt() + 1;
       int endCol   = e.attribute( "endCol" ).toInt() + 1;
@@ -1291,4 +1292,9 @@ void GNUMERICFilter::setStyleInfo(QDomNo
 
             }
+            if ( !hyperlink.isNull() )
+            {
+                //TODO
+                kdDebug()<<" import hyperlink \n";
+            }
           }
         }


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