InsetPhantom::latex(): use a switch

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

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 37692af97a634c65244245908861036357a14206..cbcf613b788b3acdfaf891cb50a07a2a7012910c 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -191,7 +191,7 @@ void InsetHyperlink::latex(otexstream & os,
                pair<docstring, docstring> name_latexed =
                        runparams.encoding->latexString(name, runparams.dryrun);
                name = name_latexed.first;
-               if (!name_latexed.second.empty()) {
+               if (!name_latexed.second.empty() && !runparams.silent) {
                        // issue a warning about omitted characters
                        // FIXME: should be passed to the error dialog
                        frontend::Alert::warning(_("Uncodable characters"),
@@ -209,7 +209,8 @@ void InsetHyperlink::latex(otexstream & os,
 }
 
 
-int InsetHyperlink::plaintext(odocstream & os, OutputParams const &) const
+int InsetHyperlink::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
        odocstringstream oss;
 
@@ -250,11 +251,13 @@ docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 
 void InsetHyperlink::toString(odocstream & os) const
 {
-       plaintext(os, OutputParams(0));
+       odocstringstream ods;
+       plaintext(ods, OutputParams(0), INT_MAX);
+       os << ods.str();
 }
 
 
-void InsetHyperlink::forToc(docstring & os, size_t) const
+void InsetHyperlink::forOutliner(docstring & os, size_t) const
 {
        docstring const & n = getParam("name");
        if (!n.empty()) {