Move getProcessWorkingDir from tools to unotools

Change-Id: Ifd86ab3c89c285ad5329fc86cc57967ebd1af91a
Reviewed-on: https://gerrit.libreoffice.org/37100
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

3 files changed, 19 insertions, 17 deletions

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 579ea99f6199..b86fe45d3b80 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -33,7 +33,7 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
-#include <tools/getprocessworkingdir.hxx>
+#include <unotools/bootstrap.hxx>
 
 #include <svl/documentlockfile.hxx>
 
@@ -79,7 +79,7 @@ public:
         m_index(0)
     {
         OUString url;
-        if (tools::getProcessWorkingDir(url)) {
+        if (utl::Bootstrap::getProcessWorkingDir(url)) {
             m_cwdUrl.reset(url);
         }
     }
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index f48260507dca..7e712bc3fdd5 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -45,7 +45,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/file.hxx>
 #include <rtl/process.h>
-#include <tools/getprocessworkingdir.hxx>
 
 #include <algorithm>
 #include <cassert>
@@ -494,7 +493,7 @@ RequestHandler::Status DbusIpcThread::enable(rtl::Reference<IpcThread> * thread)
             {
                 OStringBuffer buf(ARGUMENT_PREFIX);
                 OUString arg;
-                if (!(tools::getProcessWorkingDir(arg)
+                if (!(utl::Bootstrap::getProcessWorkingDir(arg)
                       && addArgument(buf, '1', arg)))
                 {
                     buf.append('0');
@@ -875,7 +874,7 @@ RequestHandler::Status PipeIpcThread::enable(rtl::Reference<IpcThread> * thread)
 
         OStringBuffer aArguments(ARGUMENT_PREFIX);
         OUString cwdUrl;
-        if (!(tools::getProcessWorkingDir(cwdUrl) &&
+        if (!(utl::Bootstrap::getProcessWorkingDir(cwdUrl) &&
               addArgument(aArguments, '1', cwdUrl)))
         {
             aArguments.append('0');
@@ -1309,7 +1308,7 @@ static void AddConversionsToDispatchList(
     }
     else
     {
-        ::tools::getProcessWorkingDir( aPWD );
+        utl::Bootstrap::getProcessWorkingDir( aPWD );
     }
 
     if( !::osl::FileBase::getAbsoluteFileURL( aPWD, rParamOut, aOutDir ) )
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index bf40197682d7..c74d9e0d98aa 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -19,11 +19,8 @@
 
 #include <config_folders.h>
 
-#include "deployment.hrc"
-#include "unopkg_shared.h"
-#include "dp_identifier.hxx"
-#include "dp_gui.hrc"
-#include "lockfile.hxx"
+#include <stdio.h>
+
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
 #include <rtl/bootstrap.hxx>
@@ -32,14 +29,20 @@
 #include <osl/process.h>
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
-#include <tools/getprocessworkingdir.hxx>
-#include <comphelper/processfactory.hxx>
 #include <unotools/configmgr.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ucb/UniversalContentBroker.hpp>
+#include <unotools/bootstrap.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/sequence.hxx>
-#include <stdio.h>
+#include <comphelper/processfactory.hxx>
+
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/ucb/UniversalContentBroker.hpp>
+
+#include "deployment.hrc"
+#include "unopkg_shared.h"
+#include "dp_identifier.hxx"
+#include "dp_gui.hrc"
+#include "lockfile.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -169,7 +172,7 @@ struct ProcessWorkingDir : public rtl::StaticWithInit<
     OUString, ProcessWorkingDir> {
     const OUString operator () () {
         OUString workingDir;
-        tools::getProcessWorkingDir(workingDir);
+        utl::Bootstrap::getProcessWorkingDir(workingDir);
         return workingDir;
     }
 };