From: Uwe Stöhr <uwestoehr@web.de>
Date: Wed, 5 Jan 2011 00:59:39 +0000 (+0000)
Subject: PDFOptions.cpp: revert fix for #7048 for now, see discussion in the bug report
X-Git-Tag: 2.0.0~1182
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=079d159c876303c621ca0f5f8ac5317730e6e708;p=features.git

PDFOptions.cpp: revert fix for #7048 for now, see discussion in the bug report

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37111 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index d9f637e951..09bd79652a 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -183,10 +183,10 @@ int PDFOptions::writeLaTeX(OutputParams & runparams, odocstream & os,
 		   << setEncoding("UTF-8");
 		++lines;
 	}
-	// if hyperref is loaded by the document class and hyperset is empty,
-	// nothing must be output, see bug #7048
-	if (!(hyperref_already_provided && hyperset.empty()))
-		os << from_utf8(opt);
+	// FIXME: handle the case that hyperref is loaded by the document class and
+	// hyperset is empty, see bug #7048
+	//if (!(hyperref_already_provided && hyperset.empty()))
+	//	os << from_utf8(opt);
 
 	if (need_unicode && enc && enc->iconvName() != "UTF-8"
 	    &&!runparams.isFullUnicode()) {