diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-05-13 10:05:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-05-13 10:08:19 +0200 |
| commit | 416543e829922f117ee5dc15125b470099c9e148 (patch) | |
| tree | c20110a4e423931a7dbbd73fdd475b553e4950f9 /sal | |
| parent | 6e2818a1f8304562ec393f6d84c237596657b54f (diff) | |
All three uses of osl_getFileOSHandle have been removed again
...introduced with a64db11b6ca1c0c99937cd99129758dbbe575ac2 "Add some non-public
API to be used by SvFileStream" and e541105b45d5da8df296883111194e3a0297a2e7
"Use osl API to access files in the SvFileStream code" but subsequently
identified as dead code with ab02fa6552fb098990e74f2787cf02b01c0e532b
"callcatcher: update list," 05a8216d03b5db559e01dd1808f2805df31c970a
"STAR_ENABLE_FILE_LOCKING was a secret," and
1d3483ed279982278b2f9fb1bab63485523e48c5 "Remove some unused code from
unusedcode.easy."
Change-Id: I9c8584890270a87e58b8d8021080ffe54bc97b93
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/file.cxx | 15 | ||||
| -rw-r--r-- | sal/osl/w32/file.cxx | 15 | ||||
| -rw-r--r-- | sal/util/sal.map | 5 |
3 files changed, 0 insertions, 35 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 99fee40c956d..330f194475f7 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -1081,21 +1081,6 @@ SAL_CALL osl_syncFile(oslFileHandle Handle) } oslFileError -SAL_CALL osl_getFileOSHandle( - oslFileHandle Handle, - sal_IntPtr *piFileHandle ) -{ - FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - - if (0 == pImpl || pImpl->m_kind != FileHandle_Impl::KIND_FD || -1 == pImpl->m_fd) - return osl_File_E_INVAL; - - *piFileHandle = pImpl->m_fd; - - return osl_File_E_None; -} - -oslFileError SAL_CALL osl_mapFile ( oslFileHandle Handle, void** ppAddr, diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx index d51c243b5a38..1d13804e01b3 100644 --- a/sal/osl/w32/file.cxx +++ b/sal/osl/w32/file.cxx @@ -751,21 +751,6 @@ SAL_CALL osl_syncFile(oslFileHandle Handle) } oslFileError -SAL_CALL osl_getFileOSHandle( - oslFileHandle Handle, - sal_IntPtr *piFileHandle ) -{ - FileHandle_Impl* pImpl = static_cast<FileHandle_Impl*>(Handle); - - if (0 == pImpl || !IsValidHandle(pImpl->m_hFile)) - return osl_File_E_INVAL; - - *piFileHandle = (sal_IntPtr) pImpl->m_hFile; - - return osl_File_E_None; -} - -oslFileError SAL_CALL osl_closeFile(oslFileHandle Handle) { FileHandle_Impl * pImpl = static_cast<FileHandle_Impl*>(Handle); diff --git a/sal/util/sal.map b/sal/util/sal.map index 8380e7e4786b..e601c6d57863 100644 --- a/sal/util/sal.map +++ b/sal/util/sal.map @@ -706,11 +706,6 @@ PRIVATE_textenc.1 { # LibreOffice 3.6 _ZN3sal6detail7textenc37handleBadInputUnicodeToTextConversion*; }; -PRIVATE_file.1 { # LibreOffice 3.6 - global: - osl_getFileOSHandle; -}; - # Unique libstdc++ symbols: GLIBCXX_3.4 { global: |