summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-02-02 16:02:36 +0100
committerTor Lillqvist <tml@collabora.com>2015-02-03 10:28:46 +0100
commit607cc768a7f2e5e6fb34d1b1687e480e7a9e55f2 (patch)
tree20f776e9b7504d7aa2d8de68e52d311a5dcbbae1 /desktop
parent0d35b7aee38046f7ffba79911d9c669f78ab7c0e (diff)
Make the handling of the pAppPath==NULL case actually work
Change-Id: I8b185ad37e1db3262c2533c0146e4fe7fb3ef3ea
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4f2d1ed90642..498ef803f5ea 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -770,8 +770,11 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
}
else
{
+ // Fun conversion dance back and forth between URLs and system paths...
+ OUString aAppURL;
::osl::Module::getUrlFromAddress( reinterpret_cast< oslGenericFunction >(lo_initialize),
- aAppPath);
+ aAppURL);
+ osl::FileBase::getSystemPathFromFileURL( aAppURL, aAppPath );
}
OUString aAppURL;