[Libreoffice-commits] .: tools/CppunitTest_tools_test.mk tools/source

[Tor Lillqvist]

 tools/CppunitTest_tools_test.mk |    4 ++++
 tools/source/fsys/dirent.cxx    |    8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 35d51c6c28958eec2ca7eea44d6d76d363c0487e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jul 26 10:42:56 2011 +0300

    Fix Windows build

diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk
index 2d1e02e..665cb9d 100755
--- a/tools/CppunitTest_tools_test.mk
+++ b/tools/CppunitTest_tools_test.mk
@@ -46,6 +46,10 @@ $(eval $(call gb_CppunitTest_add_linked_libs,tools_test, \
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_linked_static_libs,tools_test, \
+    ooopathutils \
+))
+
 $(eval $(call gb_CppunitTest_set_include,tools_test,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/tools/inc) \
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 18bcaeb..796d746 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -220,6 +220,7 @@ public:
     inline  DirEntry*   Top();
     inline  DirEntry*   Bottom();
     inline  bool        Empty();
+    inline  void        Clear();
 };
 
 inline void DirEntryStack::Push( DirEntry *pEntry )
@@ -252,6 +253,11 @@ inline bool DirEntryStack::Empty()
     return maStack.empty();
 }
 
+inline void DirEntryStack::Clear()
+{
+    maStack.clear();
+}
+
 //--------------------------------------------------------------------
 
 DBG_NAME( DirEntry );
@@ -428,7 +434,7 @@ FSysError DirEntry::ImpParseOs2Name( const ByteString& rPfad, FSysPathStyle eSty
                     }
 
                     // liegt jetzt nichts mehr auf dem Stack?
-                    if ( aStack.empty() )
+                    if ( aStack.Empty() )
                         aStack.Push( new DirEntry( aName, FSYS_FLAG_RELROOT, eStyle ) );
                 }
             }