Author: uwestoehr
Date: Wed Jan 5 01:59:39 2011
New Revision: 37111
URL: http://www.lyx.org/trac/changeset/37111
Log:
PDFOptions.cpp: revert fix for #7048 for now, see discussion in the bug report
Modified:
lyx-devel/trunk/src/PDFOptions.cpp
Modified: lyx-devel/trunk/src/PDFOptions.cpp
==============================================================================
--- lyx-devel/trunk/src/PDFOptions.cpp Wed Jan 5 01:21:14 2011 (r37110)
+++ lyx-devel/trunk/src/PDFOptions.cpp Wed Jan 5 01:59:39 2011 (r37111)
@@ -183,10 +183,10 @@
<< 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()) {
