diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-17 08:30:09 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-17 08:30:09 +0000 |
| commit | 96f1e7bbb408f80098161a8fdacf722e379e328b (patch) | |
| tree | 8352d678f802960d3242cca8f16e566349bfa958 /shell | |
| parent | d75a74bf2a45c3ee051fa424b0e7350f5b77c518 (diff) | |
CWS-TOOLING: integrate CWS mav48_DEV300
2009-03-09 12:55:54 +0100 mav r269080 : #i99918# provide decoded version of the name
2009-03-09 10:14:59 +0100 mav r269064 : #99967# let readonly files be correctly recognized
2009-03-09 07:04:09 +0100 mav r269056 : #i99922# fix the typo
2009-03-06 14:10:29 +0100 mav r269005 : #i99922# convert system path correctly
2009-03-06 13:53:45 +0100 mav r269001 : #i99922# Prevent the problem for the case that the configuration contains wrong URL
2009-03-06 13:16:56 +0100 mav r268999 : #i99919# handle SID_OPENHYPERLINK correctly in slide-show
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/kdebe/kdepathslayer.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shell/source/backends/kdebe/kdepathslayer.cxx b/shell/source/backends/kdebe/kdepathslayer.cxx index 6e13e0ee39c3..34d85ee93d6d 100644 --- a/shell/source/backends/kdebe/kdepathslayer.cxx +++ b/shell/source/backends/kdebe/kdepathslayer.cxx @@ -79,20 +79,20 @@ void SAL_CALL KDEPathsLayer::readData( const uno::Reference<backend::XLayerHandl uno::Sequence<backend::PropertyInfo> aPropInfoList(1); sal_Int32 nProperties = 0; - QString aDocumentsDir( "file:" ); - ::rtl::OUString sDocumentsDir; - - aDocumentsDir += KGlobalSettings::documentPath(); + QString aDocumentsDir( KGlobalSettings::documentPath() ); + rtl::OUString sDocumentsDir; + rtl::OUString sDocumentsURL; if ( aDocumentsDir.endsWith(QChar('/')) ) aDocumentsDir.truncate ( aDocumentsDir.length() - 1 ); sDocumentsDir = (const sal_Unicode *) aDocumentsDir.ucs2(); + osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData ); aPropInfoList[nProperties].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Paths/Variables/Work") ); aPropInfoList[nProperties].Type = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "string" ) ); aPropInfoList[nProperties].Protected = sal_False; - aPropInfoList[nProperties++].Value = uno::makeAny( sDocumentsDir ); + aPropInfoList[nProperties++].Value = uno::makeAny( sDocumentsURL ); if( nProperties > 0 ) { |