summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-07-15 22:58:33 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-07-15 22:58:33 +0200
commit8d8668be3444560de127274201a3ab68b1dff950 (patch)
tree1c4202b1e4f8cbe7ee338870b50e871c06127131
parent08367272b95a944cad6bf0bc6915544f2a6ee243 (diff)
Related tdf#37531: --convert-to output relative to caller's CWD
Change-Id: Ifad33650694c16e89fc5e51fd4322da732f7d3eb
-rw-r--r--desktop/source/app/officeipcthread.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 5da15848dda0..1ef28d502aa7 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1309,7 +1309,14 @@ static void AddConversionsToDispatchList(
OUString aOutDir( rParamOut.trim() );
OUString aPWD;
- ::tools::getProcessWorkingDir( aPWD );
+ if (cwdUrl)
+ {
+ aPWD = *cwdUrl;
+ }
+ else
+ {
+ ::tools::getProcessWorkingDir( aPWD );
+ }
if( !::osl::FileBase::getAbsoluteFileURL( aPWD, rParamOut, aOutDir ) )
::osl::FileBase::getSystemPathFromFileURL( aOutDir, aOutDir );