SvTabListBox::SetTabs, pass count explicit

passing count as first element in array, dodgy.

Change-Id: I49905b554b3b4d6cc3fa419a36389cd2e5ded463

7 files changed, 18 insertions, 29 deletions

diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index de20be28544d..5767642ac6d9 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -46,7 +46,7 @@ const sal_uInt16 SwCondCollPage::m_aPageRg[] = {
 
 // Warning! This table is indicated directly in code (0, 1, ...)
 static long nTabs[] =
-    {   2, // Number of Tabs
+    {
         0, 100
     };
 
@@ -92,7 +92,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet)
 
     m_pTbLinks->SetStyle(m_pTbLinks->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
     m_pTbLinks->SetSelectionMode( SelectionMode::Single );
-    m_pTbLinks->SetTabs( &nTabs[0] );
+    m_pTbLinks->SetTabs( SAL_N_ELEMENTS(nTabs), nTabs );
     m_pTbLinks->Resize();  // OS: Hack for the right selection
     m_pTbLinks->SetSpaceBetweenEntries( 0 );
 
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 3fa3c3a262c8..7c9f56525e29 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -155,9 +155,9 @@ void SwAddrSourceLB::setColSizes()
 
     long nWidth = rHB.GetSizePixel().Width();
 
-    long nTabs[] = { 2, 0, nWidth/2 };
+    long nTabs[] = { 0, nWidth/2 };
 
-    SvSimpleTable::SetTabs(&nTabs[0], MapUnit::MapPixel);
+    SvSimpleTable::SetTabs(SAL_N_ELEMENTS(nTabs), nTabs, MapUnit::MapPixel);
 }
 
 SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 6f1176f6cbdf..7f841e2ba7ae 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -274,10 +274,10 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem&
                             nPos2,
                             HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER );
 
-    static long nTabs[] = {2, 0, nPos1};
+    static long nTabs[] = {0, nPos1};
     m_pStatus->SetStyle( m_pStatus->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP );
     m_pStatus->SetSelectionMode( SelectionMode::Single );
-    m_pStatus->SetTabs(&nTabs[0], MapUnit::MapPixel);
+    m_pStatus->SetTabs(SAL_N_ELEMENTS(nTabs), nTabs, MapUnit::MapPixel);
     m_pStatus->SetSpaceBetweenEntries(3);
 
     m_pPaused->Show(false);
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 2849d57e306a..f376d78696bd 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -80,13 +80,8 @@ void SwAddressTable::setColSizes()
     long nWidth = rHB.GetSizePixel().Width();
     nWidth /= 2;
 
-    long nTabs_Impl[3];
-
-    nTabs_Impl[0] = 2;
-    nTabs_Impl[1] = 0;
-    nTabs_Impl[2] = nWidth;
-
-    SvSimpleTable::SetTabs(&nTabs_Impl[0], MapUnit::MapPixel);
+    long nTabs[2] = { 0, nWidth };
+    SvSimpleTable::SetTabs(SAL_N_ELEMENTS(nTabs), nTabs, MapUnit::MapPixel);
 }
 
 SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
@@ -105,8 +100,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent,
     pHeaderTreeContainer->set_width_request(aSize.Width());
     pHeaderTreeContainer->set_height_request(aSize.Height());
     m_pTable = VclPtr<SwAddressTable>::Create(*pHeaderTreeContainer);
-    long const aStaticTabs[]= { 2, 0, 0 };
-    m_pTable->SetTabs( aStaticTabs );
+    long const aStaticTabs[]= { 0, 0 };
+    m_pTable->SetTabs( SAL_N_ELEMENTS(aStaticTabs), aStaticTabs );
     m_pTable->InsertHeaderItem(1, m_sName );
     m_pTable->InsertHeaderItem(2, m_sType );
 
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index ed3cb92c6772..426ec4c3db2d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -611,14 +611,11 @@ void SwIndexTreeLB::setColSizes()
     nWidth /= 14;
     nWidth--;
 
-    long nTabs_Impl[MAXLEVEL+2];
-
-    nTabs_Impl[0] = MAXLEVEL+1;
-    nTabs_Impl[1] = 3 * nWidth;
-
+    long nTabs[MAXLEVEL+1];
+    nTabs[0] = 3 * nWidth;
     for(sal_uInt16 i = 1; i <= MAXLEVEL; ++i)
-        nTabs_Impl[i+1] = nTabs_Impl[i] + nWidth;
-    SvSimpleTable::SetTabs(&nTabs_Impl[0], MapUnit::MapPixel);
+        nTabs[i] = nTabs[i-1] + nWidth;
+    SvSimpleTable::SetTabs(SAL_N_ELEMENTS(nTabs), nTabs, MapUnit::MapPixel);
 }
 
 class SwAddStylesDlg_Impl : public SfxModalDialog
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 9a7bd9472710..309892627b47 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -349,9 +349,9 @@ void SwInsertBookmarkDlg::dispose()
 BookmarkTable::BookmarkTable(SvSimpleTableContainer& rParent) :
     SvSimpleTable(rParent, 0)
 {
-    static long nTabs[] = {3, 0, 40, 150};
+    static long nTabs[] = {0, 40, 150};
 
-    SetTabs(nTabs, MapUnit::MapPixel);
+    SetTabs(SAL_N_ELEMENTS(nTabs), nTabs, MapUnit::MapPixel);
     SetSelectionMode(SelectionMode::Multiple);
     InsertHeaderEntry(SwResId(STR_PAGE));
     InsertHeaderEntry(SwResId(STR_BOOKMARK_NAME));
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 4c84074f2e7e..dc957cb7650c 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -63,12 +63,9 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent,
     m_pGroupTLB->set_width_request(nWidth);
     m_pGroupTLB->set_height_request(GetTextHeight() * 10);
 
-    long nTabs[] =
-    {   2, // Number of Tabs
-        0, nAppFontUnits
-    };
+    long nTabs[] = {  0, nAppFontUnits };
 
-    m_pGroupTLB->SetTabs( &nTabs[0] );
+    m_pGroupTLB->SetTabs( SAL_N_ELEMENTS(nTabs), nTabs );
     m_pGroupTLB->SetSelectHdl(LINK(this, SwGlossaryGroupDlg, SelectHdl));
     m_pGroupTLB->GetModel()->SetSortMode(SortAscending);
     m_pNewPB->SetClickHdl(LINK(this, SwGlossaryGroupDlg, NewHdl));