[PATCH 1/4] tools: fsys: Delete unused DirEntry::GetDevice()

Greg Kroah-Hartman gregkh at linuxfoundation.org
Mon Feb 6 14:05:38 PST 2012


---
 tools/inc/tools/fsys.hxx  |    3 +--
 tools/source/fsys/unx.cxx |   21 ---------------------
 unusedcode.easy           |    1 -
 3 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 3ec1799..a39c159 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -102,7 +102,7 @@ typedef ::std::vector< FSysSort > FSysSortList;
 enum DirEntryFlag
 {
     FSYS_FLAG_NORMAL,
-    FSYS_FLAG_VOLUME,                      // Dir( FSYS_FLAG_VOLUME ) und GetDevice()
+    FSYS_FLAG_VOLUME,                      // Dir( FSYS_FLAG_VOLUME )
     FSYS_FLAG_ABSROOT,                     // z.B. "a:\" oder "\"
     FSYS_FLAG_RELROOT,                     // z.B. "a:", "a:." oder "."
     FSYS_FLAG_CURRENT = FSYS_FLAG_RELROOT, // Synonym fuer FSYS_FLAG_RELROOT
@@ -274,7 +274,6 @@ public:
     void                SetBase( const String& rBase, char cSep = '.' );
     String              GetBase(char cSep = '.' ) const;
     DirEntry            GetPath() const;
-    DirEntry            GetDevice() const;
     String              GetVolume() const;
     String              GetFull( FSysPathStyle eFormatter = FSYS_STYLE_HOST,
                                  sal_Bool bWithDelimiter = sal_False,
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index b53caac..f8be021 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -241,27 +241,6 @@ String DirEntry::GetVolume() const
                     String());
 }
 
-DirEntry DirEntry::GetDevice() const
-{
-  DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
-    DirEntry aPath( *this );
-    aPath.ToAbs();
-
-    struct stat buf;
-    while (stat(rtl::OUStringToOString(aPath.GetFull(), osl_getThreadTextEncoding()).getStr(), &buf))
-    {
-        if (aPath.Level() <= 1)
-            return String();
-        aPath = aPath [1];
-    }
-    mymnttab &rMnt = mymnt::get();
-    return ((buf.st_dev == rMnt.mountdevice ||
-                GetMountEntry(buf.st_dev, &rMnt)) ?
-                    String( rMnt.mountpoint, osl_getThreadTextEncoding()) :
-                    String());
-}
-
 /*************************************************************************
 |*
 |*    DirEntry::SetCWD()
diff --git a/unusedcode.easy b/unusedcode.easy
index 036c9bb..be5d0b8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -18,7 +18,6 @@ DdeTopic::DdeTopic(String const&)
 DdeTopic::RemoveItem(DdeItem const&)
 DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
 Dialog::Dialog(Window*, ResId const&)
-DirEntry::GetDevice() const
 EditView::GetSelectionMode() const
 EditView::SetCursor(Cursor const&)
 EditView::SetPointer(Pointer const&)
-- 
1.7.9



More information about the LibreOffice mailing list