[Libreoffice-commits] core.git: svtools/source

Ulrich Gemkow lobugs at ikr.uni-stuttgart.de
Mon Sep 18 22:57:21 UTC 2017


 svtools/source/control/tabbar.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c686dc4f33c7461a28df95603d06591a3a0171cd
Author: Ulrich Gemkow <lobugs at ikr.uni-stuttgart.de>
Date:   Sun Sep 10 20:12:14 2017 +0200

    tdf#43157 Replace DBG_ASSERT() with assert() in tabbar.cxx
    
    Change-Id: I6a7cc500c973b09236d90a3bfb044407c58fc2ef
    Reviewed-on: https://gerrit.libreoffice.org/42142
    Reviewed-by: Teodor Mircea Ionita <admin at shinnok.com>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index ead6835e73c9..86b2f3587b80 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1610,10 +1610,9 @@ void TabBar::AddTabClick()
 void TabBar::InsertPage(sal_uInt16 nPageId, const OUString& rText,
                         TabBarPageBits nBits, sal_uInt16 nPos)
 {
-    DBG_ASSERT(nPageId, "TabBar::InsertPage(): PageId == 0");
-    DBG_ASSERT(GetPagePos( nPageId ) == PAGE_NOT_FOUND,
-                "TabBar::InsertPage(): PageId already exists");
-    assert ((nBits <= TPB_DISPLAY_NAME_ALLFLAGS) && "TabBar::InsertPage(): Invalid flag set in in nBits");
+    assert (nPageId && "TabBar::InsertPage(): PageId must not be 0");
+    assert ((GetPagePos(nPageId) == PAGE_NOT_FOUND) && "TabBar::InsertPage(): Page already exists");
+    assert ((nBits <= TPB_DISPLAY_NAME_ALLFLAGS) && "TabBar::InsertPage(): Invalid flag set in nBits");
 
     // create PageItem and insert in the item list
     ImplTabBarItem* pItem = new ImplTabBarItem( nPageId, rText, nBits );


More information about the Libreoffice-commits mailing list