summaryrefslogtreecommitdiff
path: root/shell/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-03-17 08:30:09 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-03-17 08:30:09 +0000
commit98a3e762a1c93503d18aeb99f627b68b4c2538f2 (patch)
tree08b724f0687c723b370c599580c671ee9da3c9bc /shell/source
parent676528ac3e3fd3d6fc56d1b4e6dcbe346353c51a (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/source')
-rw-r--r--shell/source/backends/kdebe/kdepathslayer.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/shell/source/backends/kdebe/kdepathslayer.cxx b/shell/source/backends/kdebe/kdepathslayer.cxx
index df933359ec..dd622f1bc0 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 )
{