mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS qadev21 (1.8.4); FILE MERGED

Browse Source 
2005/01/11 16:39:07 cn 1.8.4.1: bugfix in getFullURL()
This commit is contained in:
Vladimir Glazounov
2005-02-24 16:23:20 +00:00
parent dbd19fe5b2
commit 11efe49f23
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
qadevOOo/runner/util/utils.java
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: utils.java,v $ * $RCSfile: utils.java,v $
* *
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* last change:$Date: 2005-02-02 14:00:36 $ * last change:$Date: 2005-02-24 17:23:20 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -167,25 +167,23 @@ public class utils {
public static String getFullURL( String sDocName ) { public static String getFullURL( String sDocName ) {
String fullDocPath = sDocName; String fullDocPath = sDocName;
// System.out.println("##### getFullURL (in): "+sDocName); fullDocPath = fullDocPath.replace('\\','/');
if (fullDocPath.startsWith("http:")) { if (fullDocPath.startsWith("http:")) {
return fullDocPath; return fullDocPath;
} }
if (fullDocPath.startsWith("file:")) {
return fullDocPath;
}
if (fullDocPath.startsWith("ftp:")) { if (fullDocPath.startsWith("ftp:")) {
return fullDocPath; return fullDocPath;
} }
fullDocPath = fullDocPath.replace('\\','/');
String prefix = ""; String prefix = "";
if (! fullDocPath.startsWith("file:///")){
if (fullDocPath.startsWith("//")) { if (fullDocPath.startsWith("//")) {
prefix="file:"; prefix="file:";
} else { } else {
if (fullDocPath.startsWith("/")) prefix="file://"; if (fullDocPath.startsWith("/")) prefix="file://";
else prefix="file:///"; else prefix="file:///";
} }
}
if (!fullDocPath.endsWith("/")) { if (!fullDocPath.endsWith("/")) {
File aFile = new File(fullDocPath); File aFile = new File(fullDocPath);
if (aFile.isDirectory()) { if (aFile.isDirectory()) {
@@ -193,7 +191,7 @@ public class utils {
} }
} }
String fulldocURL = prefix+fullDocPath; String fulldocURL = prefix+fullDocPath;
// System.out.println("##### getFullURL (out): "+fulldocURL);
return fulldocURL; return fulldocURL;
} }