summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-06-17 10:37:34 +0000
committerRüdiger Timm <rt@openoffice.org>2004-06-17 10:37:34 +0000
commit3236ca511da8e4d6e49a90d5e6eec57cea0b5e12 (patch)
treed5e80d74b23795e58ea5286e741d9f697d6aac74 /tools
parenta95d29054d5f58b254d931944301b42a0bf26eab (diff)
INTEGRATION: CWS gh6 (1.14.2); FILE MERGED
2004/03/12 16:28:25 gh 1.14.2.1: #109512#preserve case of path in ToAbs even for caseinsensitive filesystem
Diffstat (limited to 'tools')
-rw-r--r--tools/source/fsys/dirent.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index e0e8d4a0a05c..ec9ab60dfd52 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -2,8 +2,8 @@
*
* $RCSfile: dirent.cxx,v $
*
- * $Revision: 1.16 $
- * last change: $Author: kz $ $Date: 2004-06-11 12:20:22 $
+ * $Revision: 1.17 $
+ * last change: $Author: rt $ $Date: 2004-06-17 11:37:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1936,14 +1936,16 @@ BOOL DirEntry::ImpToRel( String aCurStr )
aThis.ToAbs();
String aThisStr( aThis.GetFull( FSYS_STYLE_HPFS ) );
+ // #109512 preserve case of path even if caseinsensitive
+ String aThisCompareStr( aThisStr ), aCurCompareStr( aCurStr );
if ( ! IsCaseSensitive() )
{
- aThisStr = String( aThisStr ).ToLowerAscii();
- aCurStr = String( aCurStr ).ToLowerAscii();
+ aThisCompareStr.ToLowerAscii();
+ aCurCompareStr.ToLowerAscii();
}
// "Ubereinstimmung pr"ufen
- USHORT nPos = aThisStr.Match( aCurStr );
+ USHORT nPos = aThisCompareStr.Match( aCurCompareStr );
if ( nPos == STRING_MATCH && aThisStr.Len() != aCurStr.Len() )
nPos = Min( aThisStr.Len(), aCurStr.Len() );