Strip et al. for citation search

[lyx.git] / src / insets / InsetInclude.cpp

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index aeae2fb17d8cf1a1ddfe0998c34d6ba703975300..870310ef2ddaa9c03f3186ee18d4fc39f29f3939 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -618,9 +618,9 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
        FileName const writefile(makeAbsPath(mangled, runparams.for_preview ?
                                                 buffer().temppath() : masterBuffer->temppath()));
 
-       LYXERR(Debug::LATEX, "incfile:" << incfile);
-       LYXERR(Debug::LATEX, "exportfile:" << exportfile);
-       LYXERR(Debug::LATEX, "writefile:" << writefile);
+       LYXERR(Debug::OUTFILE, "incfile:" << incfile);
+       LYXERR(Debug::OUTFILE, "exportfile:" << exportfile);
+       LYXERR(Debug::OUTFILE, "writefile:" << writefile);
 
        string const tex_format = flavor2format(runparams.flavor);
 
@@ -783,7 +783,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
                if (checksum_in != checksum_out) {
                        if (!included_file.copyTo(writefile)) {
                                // FIXME UNICODE
-                               LYXERR(Debug::LATEX,
+                               LYXERR(Debug::OUTFILE,
                                        to_utf8(bformat(_("Could not copy the file\n%1$s\n"
                                                                        "into the temporary directory."),
                                                         from_utf8(included_file.absFileName()))));
@@ -1006,14 +1006,14 @@ int InsetInclude::plaintext(odocstringstream & os,
 {
        // just write the filename if we're making a tooltip or toc entry,
        // or are generating this for advanced search
-       if (op.for_tooltip || op.for_toc || op.for_searchAdv != OutputParams::NoSearch) {
+       if (op.for_tooltip || op.for_toc || op.find_effective()) {
                os << '[' << screenLabel() << '\n'
                   << ltrim(getParam("filename")) << "\n]";
                return PLAINTEXT_NEWLINE + 1; // one char on a separate line
        }
 
        if (isVerbatim(params()) || isListings(params())) {
-               if (op.for_searchAdv != OutputParams::NoSearch) {
+               if (op.find_effective()) {
                        os << '[' << screenLabel() << ']';
                }
                else {
@@ -1251,7 +1251,7 @@ string InsetInclude::contextMenuName() const
 }
 
 
-Inset::RowFlags InsetInclude::rowFlags() const
+int InsetInclude::rowFlags() const
 {
        return type(params()) == INPUT ? Inline : Display;
 }