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

List:       koffice-devel
Subject:    file:// vs file:///
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2006-02-23 11:51:58
Message-ID: 200602231251.58987.mail () dipe ! org
[Download RAW message or body]

Hi *,

attached is a patch that translates all remaining (at least all I found with a 
grep ;) file:// references to file:/// as defined by opendoc, rfc and kurl.

Cause I don't know what sideeffect it would introduce to apply that patch 
right now, I would suggest to wait with it after the final release.

-- 
Sebastian Sauer aka dipesh[sebsauer]
http://www.dipe.org/public_key.asc
Fingerprint: 8F1E 219B 16E6 4EC7 29CC F408 E193 65E2 9134 2221
Coder in http://www.koffice.org && http://www.kmldonkey.org

["fileurl.patch" (text/x-diff)]

Index: lib/kofficecore/KoTemplates.cpp
===================================================================
--- lib/kofficecore/KoTemplates.cpp	(Revision 512170)
+++ lib/kofficecore/KoTemplates.cpp	(Arbeitskopie)
@@ -283,8 +283,10 @@
                         templatePath=config.readPathEntry("URL");
                         //kdDebug() << "Link to : " << templatePath << endl;
                         if(templatePath[0]!='/') {
-                            if(templatePath.left(6)=="file:/") // I doubt this will happen
+                            if(templatePath.left(6)=="file:/") { // I doubt this will happen
                                 templatePath=templatePath.right(templatePath.length()-6);
+                                if(templatePath.startsWith("//")) templatePath.remove(0,1);
+                            }
                             //else
                             //  kdDebug() << "dirname=" << *it << endl;
                             templatePath=*it+templatePath;
Index: filters/kword/pdf/misc.cpp
===================================================================
--- filters/kword/pdf/misc.cpp	(Revision 512170)
+++ filters/kword/pdf/misc.cpp	(Arbeitskopie)
@@ -364,7 +364,7 @@
 
     case actionGoToR: {
         LinkGoToR &lgotor = static_cast<LinkGoToR &>(action);
-        _href = "file://";
+        _href = "file:///";
         if ( lgotor.getFileName() )
             _href += lgotor.getFileName()->getCString();
         int page = 1;
@@ -381,7 +381,7 @@
 
     case actionLaunch: {
         LinkLaunch &llaunch = static_cast<LinkLaunch &>(action);
-        _href = "file://";
+        _href = "file:///";
         if ( llaunch.getFileName() )
             _href += llaunch.getFileName()->getCString();
 
Index: kpresenter/autoformEdit/AFChoose.cpp
===================================================================
--- kpresenter/autoformEdit/AFChoose.cpp	(Revision 512170)
+++ kpresenter/autoformEdit/AFChoose.cpp	(Arbeitskopie)
@@ -105,8 +105,10 @@
                             icon=path + icon;
                         QString filename=config.readPathEntry("URL");
                         if(filename[0]!='/') {
-                            if(filename.left(6)=="file:/") // I doubt this will happen
+                            if(filename.left(6)=="file:/") { // I doubt this will happen
                                 filename=filename.right(filename.length()-6);
+                                if(filename.startsWith("//")) filename.remove(0,1);
+                            }
                             filename=path + filename;
                         }
                         grpPtr->entries.insert(text, filename);


_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel


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