diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-05-12 15:32:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-05-17 20:43:16 +0200 |
| commit | d23064ba4796a52d60167581d8c5e5b33c49c0fc (patch) | |
| tree | 6789c164a874bce85cfc3c94be3f43a6571b2173 /sal | |
| parent | dd4adcd54bdff0b114560589872216a450fa6def (diff) | |
Remove osl_getFileURLFromSystemPath_
Change-Id: I8dd11b2f4cc9f4f1f622181fe478a4c180eb2af0
Reviewed-on: https://gerrit.libreoffice.org/37717
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/file_dirvol.cxx | 2 | ||||
| -rw-r--r-- | sal/osl/w32/file_url.cxx | 8 | ||||
| -rw-r--r-- | sal/osl/w32/file_url.hxx | 5 |
3 files changed, 2 insertions, 13 deletions
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 43bed440eb6d..36aea40cdc01 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -601,7 +601,7 @@ static DWORD create_dir_with_callback( if (aDirectoryCreationCallbackFunc) { rtl::OUString url; - osl_getFileURLFromSystemPath_(dir_path, &(url.pData)); + osl_getFileURLFromSystemPath(dir_path, &(url.pData)); aDirectoryCreationCallbackFunc(pData, url.pData); } return ERROR_SUCCESS; diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx index 2cfa469b3c66..c31fb24711d3 100644 --- a/sal/osl/w32/file_url.cxx +++ b/sal/osl/w32/file_url.cxx @@ -754,7 +754,7 @@ oslFileError osl_getSystemPathFromFileURL_( rtl_uString *strURL, rtl_uString **p return nError; } -oslFileError osl_getFileURLFromSystemPath_( rtl_uString* strPath, rtl_uString** pstrURL ) +oslFileError osl_getFileURLFromSystemPath( rtl_uString* strPath, rtl_uString** pstrURL ) { oslFileError nError = osl_File_E_INVAL; /* Assume failure */ rtl_uString *strTempURL = nullptr; @@ -859,12 +859,6 @@ oslFileError osl_getFileURLFromSystemPath_( rtl_uString* strPath, rtl_uString** return nError; } -oslFileError SAL_CALL osl_getFileURLFromSystemPath( - rtl_uString* ustrPath, rtl_uString** pustrURL ) -{ - return osl_getFileURLFromSystemPath_( ustrPath, pustrURL ); -} - oslFileError SAL_CALL osl_getSystemPathFromFileURL( rtl_uString *ustrURL, rtl_uString **pustrPath) { diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx index 6ccbc61d5a51..f969b637225e 100644 --- a/sal/osl/w32/file_url.hxx +++ b/sal/osl/w32/file_url.hxx @@ -73,11 +73,6 @@ oslFileError osl_getSystemPathFromFileURL_ ( bool bAllowRelative ); -oslFileError osl_getFileURLFromSystemPath_ ( - rtl_uString * strPath, - rtl_uString ** pstrURL -); - extern oslMutex g_CurrentDirectoryMutex; #endif |