[Libreoffice-commits] core.git: include/osl sal/osl sal/util

[Stephan Bergmann]

 include/osl/detail/file.h |    5 -----
 sal/osl/unx/file.cxx      |   15 ---------------
 sal/osl/w32/file.cxx      |   15 ---------------
 sal/util/sal.map          |    5 -----
 4 files changed, 40 deletions(-)

New commits:
commit 416543e829922f117ee5dc15125b470099c9e148
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 13 10:05:36 2014 +0200

    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

diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index a3cfc73..ddcc47e 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -38,11 +38,6 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath(
     oslFileHandle* pHandle,
     sal_uInt32 uFlags );
 
-/*  Get the OS specific "handle" of an open file. */
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle(
-    oslFileHandle Handle,
-    sal_IntPtr *piFileHandle );
-
 #if defined __cplusplus
 }
 #endif
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 99fee40..330f194 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 d51c243..1d13804 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 8380e7e..e601c6d 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: