summaryrefslogtreecommitdiff
path: root/psprint
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2003-06-12 07:20:46 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2003-06-12 07:20:46 +0000
commitf13b61952166fbd5bbda38906ee74bf1a671af1f (patch)
treec4b5bce5aa4c70896a6b766ab48cda92a202cebe /psprint
parentcda9301a387d705cdeccb6092205269956849cca (diff)
INTEGRATION: CWS vcl12 (1.7.10); FILE MERGED
2003/06/04 15:03:53 pl 1.7.10.1: #i15112# do not accept empty path element for font cache
Diffstat (limited to 'psprint')
-rw-r--r--psprint/source/fontmanager/fontcache.cxx17
1 files changed, 10 insertions, 7 deletions
diff --git a/psprint/source/fontmanager/fontcache.cxx b/psprint/source/fontmanager/fontcache.cxx
index dd200076eb13..8efcafea2764 100644
--- a/psprint/source/fontmanager/fontcache.cxx
+++ b/psprint/source/fontmanager/fontcache.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fontcache.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: vg $ $Date: 2003-04-11 17:17:59 $
+ * last change: $Author: rt $ $Date: 2003-06-12 08:20:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -148,12 +148,15 @@ void FontCache::flush()
while( nIndex >= 0 )
{
aPath = aPrinterPath.getToken( 0, ':', nIndex );
- aPath.AppendAscii( "/pspfontcache" );
- aStream.Open( aPath, STREAM_WRITE | STREAM_TRUNC );
- if( aStream.IsOpen() && aStream.IsWritable() )
+ if( aPath.Len() ) // #i15112# never even attempt to write into root
{
- bHavePath = true;
- break;
+ aPath.AppendAscii( "/pspfontcache" );
+ aStream.Open( aPath, STREAM_WRITE | STREAM_TRUNC );
+ if( aStream.IsOpen() && aStream.IsWritable() )
+ {
+ bHavePath = true;
+ break;
+ }
}
}