From f6a49ae0f7cc580f02230d1585e93503be2c870d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Matox?= Date: Mon, 25 Oct 2004 11:20:02 +0000 Subject: [PATCH] merge two if's that tested the same condition. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9127 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/output_docbook.C | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 287b224f43..45a12a1ea3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-10-25 José Matos + + * output_docbook.C (makeCommand): merge two if's that tested the same condition. + 2004-10-25 Jean-Marc Lasgouttes * sgml.C (escapeString): fix warning in a better way diff --git a/src/output_docbook.C b/src/output_docbook.C index 62822e35aa..e13b65e40d 100644 --- a/src/output_docbook.C +++ b/src/output_docbook.C @@ -234,11 +234,8 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf, string id = par->getDocbookId(); id = id.empty()? "" : " id = \"" + id + "\""; - if (bstyle->latexparam().find('#') != string::npos) { - counters.step(bstyle->counter); - } - if (!bstyle->latexparam().empty()) { + counters.step(bstyle->counter); id = bstyle->latexparam(); if (id.find('#') != string::npos) { string el = expandLabel(buf.params().getLyXTextClass(), -- 2.39.2