Routines to retrieve HTML style information.

[lyx.git] / src / BufferList.cpp

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index e46d1015868eed6e625b9ed741aebf0ae0dbac63..4f6c848452c7605a09065ade1548493f47842af1 100644 (file)
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -300,10 +300,25 @@ bool BufferList::isLoaded(Buffer const * b) const
 }
 
 
+namespace {
+struct equivalent_to : public binary_function<FileName, FileName, bool>
+{
+       bool operator()(FileName const & x, FileName const & y) const
+       { return equivalent(x, y); }
+};
+}
+
+
 Buffer * BufferList::getBuffer(support::FileName const & fname) const
 {
+       // 1) cheap test, using string comparison of file names
        BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(),
                bind(equal_to<FileName>(), bind(&Buffer::fileName, _1), fname));
+       if (it != bstore.end())
+                       return *it;
+       // 2) possibly expensive test, using quivalence test of file names
+       it = find_if(bstore.begin(), bstore.end(),
+               bind(equivalent_to(), bind(&Buffer::fileName, _1), fname));
        return it != bstore.end() ? (*it) : 0;
 }