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

diff --git a/src/ChangeLog b/src/ChangeLog
index 287b224f4383deee0f887ba53cb4858cca687c3a..45a12a1ea3fe52771f9b0fa9ba0c8f196eb951c1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-25  José Matos  <jamatos@lyx.org>
+
+       * output_docbook.C (makeCommand): merge two if's that tested the same condition.
+
 2004-10-25  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * sgml.C (escapeString): fix warning in a better way

diff --git a/src/output_docbook.C b/src/output_docbook.C
index 62822e35aad80fc640202f042f7cb025e6121660..e13b65e40d940cc9570d1aed08b3a796f0689def 100644 (file)
--- 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(),