Do not compute caret geometry when we are not ready to do so.

[lyx.git] / src / frontends / qt4 / GuiCompare.cpp

diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp
index 3b97aa1106827381d17920f40993e7aaf927872c..4ea7f3578440668e2a052a964f5b50d553db86f9 100644 (file)
--- a/src/frontends/qt4/GuiCompare.cpp
+++ b/src/frontends/qt4/GuiCompare.cpp
@@ -78,7 +78,7 @@ GuiCompare::~GuiCompare()
 
 void GuiCompare::closeEvent(QCloseEvent *)
 {
-       slotCancel();   
+       slotCancel();
 }
 
 
@@ -154,19 +154,19 @@ QString GuiCompare::browse(QString const & in_name) const
        QString const title = qt_("Select document");
 
        QStringList const & filters = fileFilters(qt_("LyX Documents (*.lyx)"));
-       
+
        QString filename;
        if (lyxview().documentBufferView()) {
                QString path = bufferFilePath();
-               filename = browseRelFile(in_name, path, title, filters, false, 
+               filename = browseRelToParent(in_name, path, title, filters, false,
                        qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
        } else {
                QString path = toqstr(lyxrc.document_path);
-               QString rel_filename = browseRelFile(in_name, path, title, filters, false, 
+               QString rel_filename = browseRelToParent(in_name, path, title, filters, false,
                        qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
                filename = makeAbsPath(rel_filename, path);
        }
-       return filename;        
+       return filename;
 }
 
 
@@ -207,7 +207,7 @@ void GuiCompare::finished(bool aborted)
                delete compare_;
                compare_ = 0;
        }
-       
+
        if (aborted) {
                if (dest_buffer_) {
                        dest_buffer_->markClean();