summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-24 13:36:34 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-25 10:14:02 +0200
commitbbf134a2b77909706492cbc41952210f89c0df71 (patch)
treebbb1585a1dd0a92a22b511d93afb2b6d62331a49 /sc/source
parent4d6fc3c88902ca74f934960e7600df99605dea48 (diff)
SvTabListBox::SetTabs, pass count explicit
passing count as first element in array, dodgy. Change-Id: I49905b554b3b4d6cc3fa419a36389cd2e5ded463
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/condformat/condformatmgr.cxx6
-rw-r--r--sc/source/ui/dialogs/searchresults.cxx4
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.cxx9
-rw-r--r--sc/source/ui/namedlg/namemgrtable.cxx8
5 files changed, 15 insertions, 16 deletions
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 2a18c4289ada..d6370799ac06 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -95,9 +95,9 @@ void ScCondFormatManagerWindow::setColSizes()
HeaderBar &rBar = GetTheHeaderBar();
if (rBar.GetItemCount() < 2)
return;
- long aStaticTabs[]= { 2, 0, 0 };
- aStaticTabs[2] = rBar.GetSizePixel().Width() / 2;
- SvSimpleTable::SetTabs(aStaticTabs, MapUnit::MapPixel);
+ long aStaticTabs[]= { 0, 0 };
+ aStaticTabs[1] = rBar.GetSizePixel().Width() / 2;
+ SvSimpleTable::SetTabs(SAL_N_ELEMENTS(aStaticTabs), aStaticTabs, MapUnit::MapPixel);
}
ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList):
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index 374ce58407d4..38facd11121b 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -38,8 +38,8 @@ SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParen
pContainer->set_height_request(aControlSize.Height());
mpList = VclPtr<SvSimpleTable>::Create(*pContainer);
- long nTabs[] = {3, 0, 40, 60};
- mpList->SetTabs(&nTabs[0]);
+ long nTabs[] = {0, 40, 60};
+ mpList->SetTabs(SAL_N_ELEMENTS(nTabs), nTabs);
mpList->InsertHeaderEntry(ScResId(STR_SHEET) + "\t" + ScResId(STR_CELL) + "\t" + ScResId(STR_CONTENT));
mpList->SetSelectHdl( LINK(this, SearchResultsDlg, ListSelectHdl) );
}
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 4ceb6c11d92d..9e5c2cba5abd 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -401,8 +401,8 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD
SetMinOutputSizePixel( maDialogSize );
- long const nTabs[] = { 3, 10, 216, 266 };
- m_pLbConflicts->SetTabs( nTabs );
+ long const nTabs[] = { 10, 216, 266 };
+ m_pLbConflicts->SetTabs( SAL_N_ELEMENTS(nTabs), nTabs );
OUString aTab('\t');
OUString aHeader( maStrTitleConflict );
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 020cd67c303e..9038c96d4a33 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -60,9 +60,8 @@ public:
long nWebSiteWidth = std::max(
12 + rBar.GetTextWidth(rBar.GetItemText(1)),
GetSizePixel().Width() - nAccessedWidth);
- long aStaticTabs[]= { 2, 0, 0 };
- aStaticTabs[2] = nWebSiteWidth;
- SvSimpleTable::SetTabs(aStaticTabs, MapUnit::MapPixel);
+ long aStaticTabs[]= { 0, nWebSiteWidth };
+ SvSimpleTable::SetTabs(SAL_N_ELEMENTS(aStaticTabs), aStaticTabs, MapUnit::MapPixel);
}
};
@@ -93,8 +92,8 @@ ScShareDocumentDlg::ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewD
m_pCbShare->SetToggleHdl( LINK( this, ScShareDocumentDlg, ToggleHandle ) );
m_pFtWarning->Enable( bIsDocShared );
- long const nTabs[] = { 2, 0, 0 };
- m_pLbUsers->SetTabs( nTabs );
+ long const nTabs[] = { 0, 0 };
+ m_pLbUsers->SetTabs( SAL_N_ELEMENTS(nTabs), nTabs );
OUString aHeader(get<FixedText>("name")->GetText());
aHeader += "\t";
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 3e47b7cf8f06..129f263ba33e 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -43,8 +43,8 @@ ScRangeManagerTable::ScRangeManagerTable(SvSimpleTableContainer& rParent,
, maPos( rPos )
, mpInitListener(nullptr)
{
- static long aStaticTabs[] = {3, 0, 0, 0 };
- SetTabs( &aStaticTabs[0], MapUnit::MapPixel );
+ static long aStaticTabs[] = { 0, 0, 0 };
+ SetTabs( SAL_N_ELEMENTS(aStaticTabs), aStaticTabs, MapUnit::MapPixel );
OUString aNameStr(ScGlobal::GetRscString(STR_HEADER_NAME));
OUString aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE_OR_EXPR));
@@ -98,8 +98,8 @@ void ScRangeManagerTable::setColWidths()
rHeaderBar.SetItemSize( ITEMID_NAME, nTabSize);
rHeaderBar.SetItemSize( ITEMID_RANGE, nTabSize);
rHeaderBar.SetItemSize( ITEMID_SCOPE, nTabSize);
- static long aStaticTabs[] = {3, 0, nTabSize, 2*nTabSize };
- SetTabs( &aStaticTabs[0], MapUnit::MapPixel );
+ static long aStaticTabs[] = {0, nTabSize, 2*nTabSize };
+ SetTabs( SAL_N_ELEMENTS(aStaticTabs), aStaticTabs, MapUnit::MapPixel );
HeaderEndDragHdl(nullptr);
}