[Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

 desktop/source/app/officeipcthread.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 8d8668be3444560de127274201a3ab68b1dff950
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jul 15 22:58:33 2016 +0200

    Related tdf#37531: --convert-to output relative to caller's CWD
    
    Change-Id: Ifad33650694c16e89fc5e51fd4322da732f7d3eb

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 5da1584..1ef28d5 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 );