[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Michael Stahl]

 sw/source/core/tox/ToxTextGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 15156e06c9a3a73a375445955265999731800458
Author: Michael Stahl <mst...@redhat.com>
Date:   Tue Nov 25 23:18:01 2014 +0100

    fdo#83798: sw: fix generation of ToX with chapter numbers
    
    (regression from 0a1b1511faaa3302429d93ccdad3eb41dc8f36cb
     and 26259e0cca3bc4d8f45337b0cafea2eed8eb32f9)
    
    Change-Id: Idf9a6f5620c9efe62d2824df1688b30d13a4782e
    (cherry picked from commit 9ba1f8e19efd208cb791bc3c51731d9287074b54)

diff --git a/sw/source/core/tox/ToxTextGenerator.cxx 
b/sw/source/core/tox/ToxTextGenerator.cxx
index 89a45c9..7b43312 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -52,7 +52,7 @@ bool sortTabHasNoToxSourcesOrFirstToxSourceHasNoNode(const 
SwTOXSortTabBase& sor
     if (sortTab.aTOXSources.empty()) {
         return true;
     }
-    if (sortTab.aTOXSources.at(0).pNd != NULL) {
+    if (sortTab.aTOXSources.at(0).pNd == nullptr) {
         return true;
     }
     return false;
@@ -70,7 +70,7 @@ ToxTextGenerator::GetNumStringOfFirstNode( const 
SwTOXSortTabBase& rBase, bool b
     }
 
     OUString sRet;
-    if (!rBase.pTxtMark) { // only if it's not a Mark
+    if (rBase.pTxtMark) { // only if it's not a Mark
         return sRet;
     }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits