SvTabListBox::SetTabs, pass count explicit

passing count as first element in array, dodgy.

Change-Id: I49905b554b3b4d6cc3fa419a36389cd2e5ded463

2 files changed, 8 insertions, 13 deletions

diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 6e3257faece6..74b3769279c7 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -487,15 +487,15 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin,
     HeaderBarItemBits nBits = ( HeaderBarItemBits::LEFT | HeaderBarItemBits::VCENTER | HeaderBarItemBits::CLICKABLE );
     if (nFlags & FileViewFlags::SHOW_ONLYTITLE)
     {
-        long pTabs[] = { 2, 20, 600 };
-        SetTabs(&pTabs[0], MapUnit::MapPixel);
+        long aTabPositions[] = { 20, 600 };
+        SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions, MapUnit::MapPixel);
 
         mpHeaderBar->InsertItem(COLUMN_TITLE, SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE), 600, nBits | HeaderBarItemBits::UPARROW);
     }
     else
     {
-        long pTabs[] = { 5, 20, 180, 320, 400, 600 };
-        SetTabs(&pTabs[0], MapUnit::MapPixel);
+        long aTabPositions[] = { 20, 180, 320, 400, 600 };
+        SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions, MapUnit::MapPixel);
         SetTabJustify(2, AdjustRight); // column "Size"
 
         mpHeaderBar->InsertItem(COLUMN_TITLE, SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE), 180, nBits | HeaderBarItemBits::UPARROW);
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 9a804adb162b..6d6b9c1528d7 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -113,24 +113,19 @@ void SvTabListBox::dispose()
     SvTreeListBox::dispose();
 }
 
-void SvTabListBox::SetTabs(const long* pTabs, MapUnit eMapUnit)
+void SvTabListBox::SetTabs(sal_uInt16 nTabs, long const pTabPositions[], MapUnit eMapUnit)
 {
-    DBG_ASSERT(pTabs,"SetTabs:NULL-Ptr");
-    if( !pTabs )
-        return;
-
     delete [] pTabList;
-    sal_uInt16 nCount = static_cast<sal_uInt16>(*pTabs);
+    sal_uInt16 nCount = nTabs;
     pTabList = new SvLBoxTab[ nCount ];
     nTabCount = nCount;
 
     MapMode aMMSource( eMapUnit );
     MapMode aMMDest( MapUnit::MapPixel );
 
-    pTabs++;
-    for( sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++, pTabs++ )
+    for( sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++, pTabPositions++ )
     {
-        Size aSize( *pTabs, 0 );
+        Size aSize( *pTabPositions, 0 );
         aSize = LogicToLogic( aSize, &aMMSource, &aMMDest );
         long nNewTab = aSize.Width();
         pTabList[nIdx].SetPos( nNewTab );