[Libreoffice-commits] core.git: include/svtools svtools/source
Stephan Bergmann
sbergman at redhat.com
Thu Mar 9 17:27:13 UTC 2017
include/svtools/brwbox.hxx | 2
svtools/source/brwbox/brwbox1.cxx | 138 ++++++++++++++++++--------------------
svtools/source/brwbox/brwbox2.cxx | 108 ++++++++++++++---------------
svtools/source/brwbox/datwin.cxx | 16 ++--
4 files changed, 131 insertions(+), 133 deletions(-)
New commits:
commit 5b25275002e12d2c9794ca0dd014e5d25efe486e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Mar 9 18:26:40 2017 +0100
No need for extra heap allocation
Change-Id: I0844a0a8a3476cdb007ab1d587b15ce26c68783e
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 4e9f2df..fd6b18b 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -240,7 +240,7 @@ private:
TriState bHideCursor; // hide cursor (frame)
Range aSelRange; // for selection expansion
- BrowserColumns* pCols; // array of column-descriptions
+ BrowserColumns pCols; // array of column-descriptions
union
{
MultiSelection* pSel; // selected rows for multi-selection
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index c4a0ab9..35ff282 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -63,7 +63,6 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
pColSel = nullptr;
pVScroll = nullptr;
pDataWin = VclPtr<BrowserDataWin>::Create( this ).get();
- pCols = new BrowserColumns;
m_pImpl.reset( new ::svt::BrowseBoxImpl() );
aGridLineColor = Color( COL_LIGHTGRAY );
@@ -140,10 +139,9 @@ void BrowseBox::dispose()
aHScroll.disposeAndClear();
// free columns-space
- for (BrowserColumn* pCol : *pCols)
+ for (BrowserColumn* pCol : pCols)
delete pCol;
- pCols->clear();
- delete pCols;
+ pCols.clear();
delete pColSel;
if ( bMultiSelection )
delete uRow.pSel;
@@ -220,17 +218,17 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
{
#if OSL_DEBUG_LEVEL > 0
- OSL_ENSURE( ColCount() == 0 || (*pCols)[0]->GetId() != HandleColumnId , "BrowseBox::InsertHandleColumn: there is already a handle column" );
+ OSL_ENSURE( ColCount() == 0 || pCols[0]->GetId() != HandleColumnId , "BrowseBox::InsertHandleColumn: there is already a handle column" );
{
- BrowserColumns::iterator iCol = pCols->begin();
- const BrowserColumns::iterator colsEnd = pCols->end();
+ BrowserColumns::iterator iCol = pCols.begin();
+ const BrowserColumns::iterator colsEnd = pCols.end();
if ( iCol != colsEnd )
for (++iCol; iCol != colsEnd; ++iCol)
OSL_ENSURE( (*iCol)->GetId() != HandleColumnId, "BrowseBox::InsertHandleColumn: there is a non-Handle column with handle ID" );
}
#endif
- pCols->insert( pCols->begin(), new BrowserColumn( 0, OUString(), nWidth, GetZoom() ) );
+ pCols.insert( pCols.begin(), new BrowserColumn( 0, OUString(), nWidth, GetZoom() ) );
FreezeColumn( 0 );
// adjust headerbar
@@ -255,21 +253,21 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
#if OSL_DEBUG_LEVEL > 0
{
- const BrowserColumns::iterator colsEnd = pCols->end();
- for (BrowserColumns::iterator iCol = pCols->begin(); iCol != colsEnd; ++iCol)
+ const BrowserColumns::iterator colsEnd = pCols.end();
+ for (BrowserColumns::iterator iCol = pCols.begin(); iCol != colsEnd; ++iCol)
OSL_ENSURE( (*iCol)->GetId() != nItemId, "BrowseBox::InsertDataColumn: duplicate column Id" );
}
#endif
- if ( nPos < pCols->size() )
+ if ( nPos < pCols.size() )
{
- BrowserColumns::iterator it = pCols->begin();
+ BrowserColumns::iterator it = pCols.begin();
::std::advance( it, nPos );
- pCols->insert( it, new BrowserColumn( nItemId, rText, nWidth, GetZoom() ) );
+ pCols.insert( it, new BrowserColumn( nItemId, rText, nWidth, GetZoom() ) );
}
else
{
- pCols->push_back( new BrowserColumn( nItemId, rText, nWidth, GetZoom() ) );
+ pCols.push_back( new BrowserColumn( nItemId, rText, nWidth, GetZoom() ) );
}
if ( nCurColId == 0 )
nCurColId = nItemId;
@@ -295,7 +293,7 @@ sal_uInt16 BrowseBox::ToggleSelectedColumn()
ToggleSelection();
long nSelected = pColSel->FirstSelected();
if (nSelected != static_cast<long>(SFX_ENDOFSELECTION))
- nSelectedColId = (*pCols)[nSelected]->GetId();
+ nSelectedColId = pCols[nSelected]->GetId();
pColSel->SelectAll(false);
}
return nSelectedColId;
@@ -316,30 +314,30 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId )
{
// get the position in the current array
size_t nItemPos = GetColumnPos( nItemId );
- if ( nItemPos >= pCols->size() )
+ if ( nItemPos >= pCols.size() )
// not available!
return;
// doesn't the state change?
- if ( (*pCols)[ nItemPos ]->IsFrozen() )
+ if ( pCols[ nItemPos ]->IsFrozen() )
return;
// remark the column selection
sal_uInt16 nSelectedColId = ToggleSelectedColumn();
// to be moved?
- if ( nItemPos != 0 && !(*pCols)[ nItemPos-1 ]->IsFrozen() )
+ if ( nItemPos != 0 && !pCols[ nItemPos-1 ]->IsFrozen() )
{
// move to the right of the last frozen column
sal_uInt16 nFirstScrollable = FrozenColCount();
- BrowserColumn *pColumn = (*pCols)[ nItemPos ];
- BrowserColumns::iterator it = pCols->begin();
+ BrowserColumn *pColumn = pCols[ nItemPos ];
+ BrowserColumns::iterator it = pCols.begin();
::std::advance( it, nItemPos );
- pCols->erase( it );
+ pCols.erase( it );
nItemPos = nFirstScrollable;
- it = pCols->begin();
+ it = pCols.begin();
::std::advance( it, nItemPos );
- pCols->insert( it, pColumn );
+ pCols.insert( it, pColumn );
}
// adjust the number of the first scrollable and visible column
@@ -347,7 +345,7 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId )
nFirstCol = nItemPos + 1;
// toggle the freeze-state of the column
- (*pCols)[ nItemPos ]->Freeze();
+ pCols[ nItemPos ]->Freeze();
// align the scrollbar-range
UpdateScrollbars();
@@ -369,7 +367,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
// get the position in the current array
sal_uInt16 nOldPos = GetColumnPos( nColumnId );
- if ( nOldPos >= pCols->size() )
+ if ( nOldPos >= pCols.size() )
// not available!
return;
@@ -391,18 +389,18 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
if ( nOldPos > nPos )
nNextPos = nOldPos - 1;
- BrowserColumn *pNextCol = (*pCols)[ nNextPos ];
+ BrowserColumn *pNextCol = pCols[ nNextPos ];
Rectangle aNextRect(GetFieldRect( pNextCol->GetId() ));
// move column internally
{
- BrowserColumns::iterator it = pCols->begin();
+ BrowserColumns::iterator it = pCols.begin();
::std::advance( it, nOldPos );
BrowserColumn* pTemp = *it;
- pCols->erase( it );
- it = pCols->begin();
+ pCols.erase( it );
+ it = pCols.begin();
::std::advance( it, nPos );
- pCols->insert( it, pTemp );
+ pCols.insert( it, pTemp );
}
// determine new column area
@@ -488,12 +486,12 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle )
// get the position in the current array
sal_uInt16 nItemPos = GetColumnPos( nItemId );
- if ( nItemPos >= pCols->size() )
+ if ( nItemPos >= pCols.size() )
// not available!
return;
// does the state change?
- BrowserColumn *pCol = (*pCols)[ nItemPos ];
+ BrowserColumn *pCol = pCols[ nItemPos ];
if ( pCol->Title() != rTitle )
{
OUString sOld(pCol->Title());
@@ -527,17 +525,17 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
// get the position in the current array
size_t nItemPos = GetColumnPos( nItemId );
- if ( nItemPos >= pCols->size() )
+ if ( nItemPos >= pCols.size() )
return;
// does the state change?
nWidth = QueryColumnResize( nItemId, nWidth );
- if ( nWidth >= LONG_MAX || (*pCols)[ nItemPos ]->Width() != nWidth )
+ if ( nWidth >= LONG_MAX || pCols[ nItemPos ]->Width() != nWidth )
{
- long nOldWidth = (*pCols)[ nItemPos ]->Width();
+ long nOldWidth = pCols[ nItemPos ]->Width();
// adjust last column, if necessary
- if ( IsVisible() && nItemPos == pCols->size() - 1 )
+ if ( IsVisible() && nItemPos == pCols.size() - 1 )
{
long nMaxWidth = pDataWin->GetSizePixel().Width();
nMaxWidth -= pDataWin->bAutoSizeLastCol
@@ -558,7 +556,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
// do we want to display the change immediately?
bool bUpdate = GetUpdateMode() &&
- ( (*pCols)[ nItemPos ]->IsFrozen() || nItemPos >= nFirstCol );
+ ( pCols[ nItemPos ]->IsFrozen() || nItemPos >= nFirstCol );
if ( bUpdate )
{
@@ -570,7 +568,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
}
// set width
- (*pCols)[ nItemPos ]->SetWidth(nWidth, GetZoom());
+ pCols[ nItemPos ]->SetWidth(nWidth, GetZoom());
// scroll and invalidate
if ( bUpdate )
@@ -579,7 +577,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
long nX = 0;
for ( size_t nCol = 0; nCol < nItemPos; ++nCol )
{
- BrowserColumn *pCol = (*pCols)[ nCol ];
+ BrowserColumn *pCol = pCols[ nCol ];
if ( pCol->IsFrozen() || nCol >= nFirstCol )
nX += pCol->Width();
}
@@ -622,7 +620,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
nItemId ? nItemId : USHRT_MAX - 1, nWidth );
// adjust last column
- if ( nItemPos != pCols->size() - 1 )
+ if ( nItemPos != pCols.size() - 1 )
AutoSizeLastColumn();
}
@@ -634,7 +632,7 @@ void BrowseBox::AutoSizeLastColumn()
if ( pDataWin->bAutoSizeLastCol &&
pDataWin->GetUpdateMode() )
{
- sal_uInt16 nId = GetColumnId( (sal_uInt16)pCols->size() - 1 );
+ sal_uInt16 nId = GetColumnId( (sal_uInt16)pCols.size() - 1 );
SetColumnWidth( nId, LONG_MAX );
ColumnResized( nId );
}
@@ -659,10 +657,10 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
nCurColId = 0;
// delete column
- BrowserColumns::iterator it = pCols->begin();
+ BrowserColumns::iterator it = pCols.begin();
::std::advance( it, nPos );
delete *it;
- pCols->erase( it );
+ pCols.erase( it );
if ( nFirstCol >= nPos && nFirstCol > FrozenColCount() )
{
OSL_ENSURE(nFirstCol > 0,"FirstCol must be greater zero!");
@@ -725,12 +723,12 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
void BrowseBox::RemoveColumns()
{
- size_t nOldCount = pCols->size();
+ size_t nOldCount = pCols.size();
// remove all columns
for ( size_t i = 0; i < nOldCount; ++i )
- delete (*pCols)[ i ];
- pCols->clear();
+ delete pCols[ i ];
+ pCols.clear();
// correct column selection
if ( pColSel )
@@ -758,7 +756,7 @@ void BrowseBox::RemoveColumns()
if ( isAccessibleAlive() )
{
- if ( pCols->size() != nOldCount )
+ if ( pCols.size() != nOldCount )
{
// all columns should be removed, so we remove the column header bar and append it again
// to avoid to notify every column remove
@@ -796,9 +794,9 @@ OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const
{
sal_uInt16 nItemPos = GetColumnPos( nId );
- if ( nItemPos >= pCols->size() )
+ if ( nItemPos >= pCols.size() )
return OUString();
- return (*pCols)[ nItemPos ]->Title();
+ return pCols[ nItemPos ]->Title();
}
@@ -811,7 +809,7 @@ long BrowseBox::GetRowCount() const
sal_uInt16 BrowseBox::ColCount() const
{
- return (sal_uInt16) pCols->size();
+ return (sal_uInt16) pCols.size();
}
@@ -846,7 +844,7 @@ long BrowseBox::ScrollColumns( long nCols )
{
if ( nFirstCol + nCols < 0 ||
- nFirstCol + nCols >= (long)pCols->size() )
+ nFirstCol + nCols >= (long)pCols.size() )
return 0;
// implicitly hides cursor while scrolling
@@ -868,7 +866,7 @@ long BrowseBox::ScrollColumns( long nCols )
}
else
{
- long nDelta = (*pCols)[ nFirstCol-1 ]->Width();
+ long nDelta = pCols[ nFirstCol-1 ]->Width();
long nFrozenWidth = GetFrozenWidth();
Rectangle aScrollRect( Point( nFrozenWidth + nDelta, 0 ),
@@ -914,7 +912,7 @@ long BrowseBox::ScrollColumns( long nCols )
}
else
{
- long nDelta = (*pCols)[ nFirstCol ]->Width();
+ long nDelta = pCols[ nFirstCol ]->Width();
long nFrozenWidth = GetFrozenWidth();
Rectangle aScrollRect( Point( nFrozenWidth, 0 ),
@@ -954,12 +952,12 @@ long BrowseBox::ScrollColumns( long nCols )
{
long nWidth = 0;
for ( size_t nCol = 0;
- nCol < pCols->size() && nCol < nFirstCol;
+ nCol < pCols.size() && nCol < nFirstCol;
++nCol )
{
// not the handle column
- if ( (*pCols)[ nCol ]->GetId() )
- nWidth += (*pCols)[ nCol ]->Width();
+ if ( pCols[ nCol ]->GetId() )
+ nWidth += pCols[ nCol ]->Width();
}
pDataWin->pHeaderBar->SetOffset( nWidth );
@@ -1509,7 +1507,7 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowCol
if ( nColId != nCurColId || (bMakeVisible && !IsFieldVisible(nCurRow, nColId, true)))
{
sal_uInt16 nNewPos = GetColumnPos(nColId);
- BrowserColumn* pColumn = (nNewPos < pCols->size()) ? (*pCols)[ nNewPos ] : nullptr;
+ BrowserColumn* pColumn = (nNewPos < pCols.size()) ? pCols[ nNewPos ] : nullptr;
DBG_ASSERT( pColumn, "no column object - invalid id?" );
if ( !pColumn )
return false;
@@ -1640,7 +1638,7 @@ void BrowseBox::SelectAll()
uRow.pSel->SelectAll();
// don't highlight handle column
- BrowserColumn *pFirstCol = (*pCols)[ 0 ];
+ BrowserColumn *pFirstCol = pCols[ 0 ];
long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
// highlight the row selection
@@ -1727,7 +1725,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
)
{
// don't highlight handle column
- BrowserColumn *pFirstCol = (*pCols)[ 0 ];
+ BrowserColumn *pFirstCol = pCols[ 0 ];
long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
// highlight only newly selected part
@@ -1779,12 +1777,12 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMak
if ( !bMultiSelection )
{
if ( _bSelect )
- GoToColumnId( (*pCols)[ nNewColPos ]->GetId(), bMakeVisible );
+ GoToColumnId( pCols[ nNewColPos ]->GetId(), bMakeVisible );
return;
}
else
{
- if ( !GoToColumnId( (*pCols)[ nNewColPos ]->GetId(), bMakeVisible ) )
+ if ( !GoToColumnId( pCols[ nNewColPos ]->GetId(), bMakeVisible ) )
return;
}
@@ -1805,7 +1803,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMak
Rectangle aFieldRectPix( GetFieldRectPixel( nCurRow, nCurColId, false ) );
Rectangle aRect(
Point( aFieldRectPix.Left() - MIN_COLUMNWIDTH, 0 ),
- Size( (*pCols)[ nNewColPos ]->Width(),
+ Size( pCols[ nNewColPos ]->Width(),
pDataWin->GetOutputSizePixel().Height() ) );
pDataWin->Invalidate( aRect );
if ( !bSelecting )
@@ -2027,12 +2025,12 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
sal_uInt16 nFrozenCols = FrozenColCount();
size_t nCol;
for ( nCol = 0;
- nCol < pCols->size() && (*pCols)[ nCol ]->GetId() != nColumnId;
+ nCol < pCols.size() && pCols[ nCol ]->GetId() != nColumnId;
++nCol )
- if ( (*pCols)[ nCol ]->IsFrozen() || nCol >= nFirstCol )
- nColX += (*pCols)[ nCol ]->Width();
+ if ( pCols[ nCol ]->IsFrozen() || nCol >= nFirstCol )
+ nColX += pCols[ nCol ]->Width();
- if ( nCol >= pCols->size() || ( nCol >= nFrozenCols && nCol < nFirstCol ) )
+ if ( nCol >= pCols.size() || ( nCol >= nFrozenCols && nCol < nFirstCol ) )
return Rectangle();
// compute the Y-coordinate relative to DataWin
@@ -2043,7 +2041,7 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
// assemble the Rectangle relative to DataWin
return Rectangle(
Point( nColX + MIN_COLUMNWIDTH, nRowY ),
- Size( (*pCols)[ nCol ]->Width() - 2*MIN_COLUMNWIDTH,
+ Size( pCols[ nCol ]->Width() - 2*MIN_COLUMNWIDTH,
GetDataRowHeight() - 1 ) );
}
@@ -2079,9 +2077,9 @@ sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const
// accumulate the widths of the visible columns
long nColX = 0;
- for ( size_t nCol = 0; nCol < pCols->size(); ++nCol )
+ for ( size_t nCol = 0; nCol < pCols.size(); ++nCol )
{
- BrowserColumn *pCol = (*pCols)[ nCol ];
+ BrowserColumn *pCol = pCols[ nCol ];
if ( pCol->IsFrozen() || nCol >= nFirstCol )
nColX += pCol->Width();
@@ -2198,7 +2196,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
if ( bColumnCursor )
{
pColSel = pOldColSel ? pOldColSel : new MultiSelection;
- pColSel->SetTotalRange( Range( 0, pCols->size()-1 ) );
+ pColSel->SetTotalRange( Range( 0, pCols.size()-1 ) );
}
else
{
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index f623b17..76201c9 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -137,7 +137,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
pHeaderBar->SetZoom(GetZoom());
// let the columns calculate their new widths and adjust the header bar
- for (BrowserColumn* pCol : *pCols)
+ for (BrowserColumn* pCol : pCols)
{
pCol->ZoomChanged(GetZoom());
if ( pHeaderBar )
@@ -150,7 +150,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
else if (StateChangedType::Enable == nStateChange)
{
// do we have a handle column?
- bool bHandleCol = !pCols->empty() && (0 == (*pCols)[ 0 ]->GetId());
+ bool bHandleCol = !pCols.empty() && (0 == pCols[ 0 ]->GetId());
// do we have a header bar?
bool bHeaderBar = (nullptr != pDataWin->pHeaderBar.get());
@@ -246,7 +246,7 @@ void BrowseBox::ToggleSelection()
long nLastRowInRect = 0; // for the CFront
// don't highlight handle column
- BrowserColumn *pFirstCol = pCols->empty() ? nullptr : (*pCols)[ 0 ];
+ BrowserColumn *pFirstCol = pCols.empty() ? nullptr : pCols[ 0 ];
long nOfsX = (!pFirstCol || pFirstCol->GetId()) ? 0 : pFirstCol->Width();
// accumulate old row selection
@@ -286,7 +286,7 @@ void BrowseBox::ToggleSelection()
nColId = pColSel->NextSelected() )
{
Rectangle aRect( GetFieldRectPixel(nCurRow,
- (*pCols)[ nColId ]->GetId(),
+ pCols[ nColId ]->GetId(),
false ) );
aRect.Left() -= MIN_COLUMNWIDTH;
aRect.Right() += MIN_COLUMNWIDTH;
@@ -334,8 +334,8 @@ void BrowseBox::DrawCursor()
}
else
aCursor = Rectangle(
- Point( ( !pCols->empty() && (*pCols)[ 0 ]->GetId() == 0 ) ?
- (*pCols)[ 0 ]->Width() : 0,
+ Point( ( !pCols.empty() && pCols[ 0 ]->GetId() == 0 ) ?
+ pCols[ 0 ]->Width() : 0,
(nCurRow - nTopRow) * GetDataRowHeight() + 1 ),
Size( pDataWin->GetOutputSizePixel().Width() + 1,
GetDataRowHeight() - 2 ) );
@@ -372,26 +372,26 @@ sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const
{
sal_uInt16 nItemPos = GetColumnPos( nId );
- if ( nItemPos >= pCols->size() )
+ if ( nItemPos >= pCols.size() )
return 0;
- return (*pCols)[ nItemPos ]->Width();
+ return pCols[ nItemPos ]->Width();
}
sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const
{
- if ( nPos >= pCols->size() )
+ if ( nPos >= pCols.size() )
return BROWSER_INVALIDID;
- return (*pCols)[ nPos ]->GetId();
+ return pCols[ nPos ]->GetId();
}
sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
{
- for ( size_t nPos = 0; nPos < pCols->size(); ++nPos )
- if ( (*pCols)[ nPos ]->GetId() == nId )
+ for ( size_t nPos = 0; nPos < pCols.size(); ++nPos )
+ if ( pCols[ nPos ]->GetId() == nId )
return nPos;
return BROWSER_INVALIDID;
}
@@ -400,7 +400,7 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const
{
- for (BrowserColumn* pCol : *pCols)
+ for (BrowserColumn* pCol : pCols)
if ( pCol->GetId() == nColumnId )
return pCol->IsFrozen();
return false;
@@ -475,7 +475,7 @@ void BrowseBox::Resize()
{
if ( !bBootstrapped && IsReallyVisible() )
BrowseBox::StateChanged( StateChangedType::InitShow );
- if ( pCols->empty() )
+ if ( pCols.empty() )
{
pDataWin->bResizeOnPaint = true;
return;
@@ -497,7 +497,7 @@ void BrowseBox::Resize()
// did we need a horizontal scroll bar or is there a Control Area?
if ( !pDataWin->bNoHScroll &&
- ( ( pCols->size() - FrozenColCount() ) > 1 ) )
+ ( ( pCols.size() - FrozenColCount() ) > 1 ) )
aHScroll->Show();
else
aHScroll->Hide();
@@ -538,7 +538,7 @@ void BrowseBox::Resize()
if ( pHeaderBar )
{
// take the handle column into account
- BrowserColumn *pFirstCol = (*pCols)[ 0 ];
+ BrowserColumn *pFirstCol = pCols[ 0 ];
long nOfsX = pFirstCol->GetId() ? 0 : pFirstCol->Width();
pHeaderBar->SetPosSizePixel( Point( nOfsX, 0 ), Size( GetOutputSizePixel().Width() - nOfsX, GetTitleHeight() ) );
}
@@ -554,10 +554,10 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
// initializations
if (!bBootstrapped && IsReallyVisible())
BrowseBox::StateChanged(StateChangedType::InitShow);
- if (pCols->empty())
+ if (pCols.empty())
return;
- BrowserColumn *pFirstCol = (*pCols)[ 0 ];
+ BrowserColumn *pFirstCol = pCols[ 0 ];
bool bHandleCol = pFirstCol && pFirstCol->GetId() == 0;
bool bHeaderBar = pDataWin->pHeaderBar.get() != nullptr;
@@ -589,17 +589,17 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
// iterate through columns to redraw
long nX = 0;
size_t nCol;
- for (nCol = 0; nCol < pCols->size() && nX < rRect.Right(); ++nCol)
+ for (nCol = 0; nCol < pCols.size() && nX < rRect.Right(); ++nCol)
{
// skip invisible columns between frozen and scrollable area
- if (nCol < nFirstCol && !(*pCols)[nCol]->IsFrozen())
+ if (nCol < nFirstCol && !pCols[nCol]->IsFrozen())
nCol = nFirstCol;
// only the handle column?
if (bHeaderBar && bHandleCol && nCol > 0)
break;
- BrowserColumn* pCol = (*pCols)[nCol];
+ BrowserColumn* pCol = pCols[nCol];
// draw the column and increment position
if ( pCol->Width() > 4 )
@@ -624,7 +624,7 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
}
// retouching
- if ( !bHeaderBar && nCol == pCols->size() )
+ if ( !bHeaderBar && nCol == pCols.size() )
{
const StyleSettings &rSettings = rRenderContext.GetSettings().GetStyleSettings();
Color aColFace(rSettings.GetFaceColor());
@@ -686,9 +686,9 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
// this counts for the column widths, too
size_t nPos;
- for ( nPos = 0; nPos < pCols->size(); ++nPos )
+ for ( nPos = 0; nPos < pCols.size(); ++nPos )
{
- BrowserColumn* pCurrent = (*pCols)[ nPos ];
+ BrowserColumn* pCurrent = pCols[ nPos ];
long nWidthLogic = PixelToLogic(Size(pCurrent->Width(), 0), MapUnit::Map10thMM).Width();
long nForeignWidthPixel = pDev->LogicToPixel(Size(nWidthLogic, 0), MapUnit::Map10thMM).Width();
@@ -711,7 +711,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
long nTitleHeight = PixelToLogic(Size(0, GetTitleHeight()), MapUnit::Map10thMM).Height();
nTitleHeight = pDev->LogicToPixel(Size(0, nTitleHeight), MapUnit::Map10thMM).Height();
- BrowserColumn* pFirstCol = !pCols->empty() ? (*pCols)[ 0 ] : nullptr;
+ BrowserColumn* pFirstCol = !pCols.empty() ? pCols[ 0 ] : nullptr;
Point aHeaderPos(pFirstCol && (pFirstCol->GetId() == 0) ? pFirstCol->Width() : 0, 0);
Size aHeaderSize(aRealSize.Width() - aHeaderPos.X(), nTitleHeight);
@@ -765,9 +765,9 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
// restore the column widths/data row height
nDataRowHeight = nOriginalHeight;
- for ( nPos = 0; nPos < pCols->size(); ++nPos )
+ for ( nPos = 0; nPos < pCols.size(); ++nPos )
{
- BrowserColumn* pCurrent = (*pCols)[ nPos ];
+ BrowserColumn* pCurrent = pCols[ nPos ];
long nForeignWidthLogic = pDev->PixelToLogic(Size(pCurrent->Width(), 0), MapUnit::Map10thMM).Width();
long nWidthPixel = LogicToPixel(Size(nForeignWidthLogic, 0), MapUnit::Map10thMM).Width();
@@ -808,7 +808,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
Color aOldTextColor = _rOut.GetTextColor();
Color aOldFillColor = _rOut.GetFillColor();
Color aOldLineColor = _rOut.GetLineColor();
- long nHLineX = 0 == (*pCols)[ 0 ]->GetId() ? (*pCols)[ 0 ]->Width() : 0;
+ long nHLineX = 0 == pCols[ 0 ]->GetId() ? pCols[ 0 ]->Width() : 0;
nHLineX += aOverallAreaPos.X();
Color aDelimiterLineColor( ::svtools::ColorConfig().GetColorValue( ::svtools::CALCGRID ).nColor );
@@ -851,10 +851,10 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
// iterate through columns to redraw
size_t nCol;
- for ( nCol = 0; nCol < pCols->size(); ++nCol )
+ for ( nCol = 0; nCol < pCols.size(); ++nCol )
{
// get column
- BrowserColumn *pCol = (*pCols)[ nCol ];
+ BrowserColumn *pCol = pCols[ nCol ];
// at end of invalid area
if ( aPos.X() >= _rRect.Right() )
@@ -864,7 +864,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
if ( nCol < nFirstCol && !pCol->IsFrozen() )
{
nCol = nFirstCol;
- pCol = (nCol < pCols->size() ) ? (*pCols)[ nCol ] : nullptr;
+ pCol = (nCol < pCols.size() ) ? pCols[ nCol ] : nullptr;
if (!pCol)
{ // FS - 21.05.99 - 66325
// actually this has been fixed elsewhere (in the right place),
@@ -966,14 +966,14 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
aOldLineColor = _rOut.GetLineColor();
aOldFillColor = _rOut.GetFillColor();
_rOut.SetFillColor( rSettings.GetFaceColor() );
- if ( !pCols->empty() && ( (*pCols)[ 0 ]->GetId() == 0 ) && ( aPos.Y() <= _rRect.Bottom() ) )
+ if ( !pCols.empty() && ( pCols[ 0 ]->GetId() == 0 ) && ( aPos.Y() <= _rRect.Bottom() ) )
{
// fill rectangle gray below handle column
// DG: fill it only until the end of the drawing rect and not to the end, as this may overpaint handle columns
_rOut.SetLineColor( Color( COL_BLACK ) );
_rOut.DrawRect( Rectangle(
Point( aOverallAreaPos.X() - 1, aPos.Y() - 1 ),
- Point( aOverallAreaPos.X() + (*pCols)[ 0 ]->Width() - 1,
+ Point( aOverallAreaPos.X() + pCols[ 0 ]->Width() - 1,
_rRect.Bottom() + 1) ) );
}
_rOut.SetFillColor( aOldFillColor );
@@ -992,16 +992,16 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
_rOut.SetLineColor( aDelimiterLineColor );
Point aVertPos( aOverallAreaPos.X() - 1, aOverallAreaPos.Y() );
long nDeltaY = aOverallAreaBRPos.Y();
- for ( size_t nCol = 0; nCol < pCols->size(); ++nCol )
+ for ( size_t nCol = 0; nCol < pCols.size(); ++nCol )
{
// get column
- BrowserColumn *pCol = (*pCols)[ nCol ];
+ BrowserColumn *pCol = pCols[ nCol ];
// skip invisible columns between frozen and scrollable area
if ( nCol < nFirstCol && !pCol->IsFrozen() )
{
nCol = nFirstCol;
- pCol = (*pCols)[ nCol ];
+ pCol = pCols[ nCol ];
}
// skip column
@@ -1031,7 +1031,7 @@ void BrowseBox::PaintData( vcl::Window& rWin, vcl::RenderContext& rRenderContext
BrowseBox::StateChanged(StateChangedType::InitShow);
// initializations
- if (!pCols || pCols->empty() || !rWin.IsUpdateMode())
+ if (pCols.empty() || !rWin.IsUpdateMode())
return;
if (pDataWin->bResizeOnPaint)
Resize();
@@ -1092,7 +1092,7 @@ void BrowseBox::UpdateScrollbars()
sal_uInt16 nFrozenCols = FrozenColCount();
bool bNeedsHScroll = pDataWin->bAutoHScroll
- ? ( nFirstCol > nFrozenCols ) || ( nLastCol <= pCols->size() )
+ ? ( nFirstCol > nFrozenCols ) || ( nLastCol <= pCols.size() )
: !pDataWin->bNoHScroll;
if ( !bNeedsHScroll )
{
@@ -1121,11 +1121,11 @@ void BrowseBox::UpdateScrollbars()
Size( aDataWinSize.Width() - nHScrX, nCornerSize ) );
// total scrollable columns
- short nScrollCols = short(pCols->size()) - (short)nFrozenCols;
+ short nScrollCols = short(pCols.size()) - (short)nFrozenCols;
// visible columns
short nVisibleHSize = nLastCol == BROWSER_INVALIDID
- ? (short)( pCols->size() - nFirstCol )
+ ? (short)( pCols.size() - nFirstCol )
: (short)( nLastCol - nFirstCol );
short nRange = std::max( nScrollCols, (short)0 );
@@ -1192,12 +1192,12 @@ void BrowseBox::UpdateScrollbars()
{
long nWidth = 0;
for ( size_t nCol = 0;
- nCol < pCols->size() && nCol < nFirstCol;
+ nCol < pCols.size() && nCol < nFirstCol;
++nCol )
{
// not the handle column
- if ( (*pCols)[ nCol ]->GetId() )
- nWidth += (*pCols)[ nCol ]->Width();
+ if ( pCols[ nCol ]->GetId() )
+ nWidth += pCols[ nCol ]->Width();
}
pDataWin->pHeaderBar->SetOffset( nWidth );
@@ -1253,9 +1253,9 @@ long BrowseBox::GetFrozenWidth() const
long nWidth = 0;
for ( size_t nCol = 0;
- nCol < pCols->size() && (*pCols)[ nCol ]->IsFrozen();
+ nCol < pCols.size() && pCols[ nCol ]->IsFrozen();
++nCol )
- nWidth += (*pCols)[ nCol ]->Width();
+ nWidth += pCols[ nCol ]->Width();
return nWidth;
}
@@ -1273,7 +1273,7 @@ sal_uInt16 BrowseBox::FrozenColCount() const
{
sal_uInt16 nCol;
for ( nCol = 0;
- nCol < pCols->size() && (*pCols)[ nCol ]->IsFrozen();
+ nCol < pCols.size() && pCols[ nCol ]->IsFrozen();
++nCol )
/* empty loop */;
return nCol;
@@ -1330,10 +1330,10 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
long nX = 0;
long nWidth = GetOutputSizePixel().Width();
- for ( size_t nCol = 0; nCol < pCols->size() && nX < nWidth; ++nCol )
+ for ( size_t nCol = 0; nCol < pCols.size() && nX < nWidth; ++nCol )
{
// is this column visible?
- BrowserColumn *pCol = (*pCols)[ nCol ];
+ BrowserColumn *pCol = pCols[ nCol ];
if ( pCol->IsFrozen() || nCol >= nFirstCol )
{
// compute right end of column
@@ -1380,14 +1380,14 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt )
sal_uInt16 nX = 0;
for ( size_t nCol = 0;
- nCol < pCols->size() &&
- ( nX + (*pCols)[ nCol ]->Width() ) < sal_uInt16(GetOutputSizePixel().Width());
+ nCol < pCols.size() &&
+ ( nX + pCols[ nCol ]->Width() ) < sal_uInt16(GetOutputSizePixel().Width());
++nCol )
// is this column visible?
- if ( (*pCols)[ nCol ]->IsFrozen() || nCol >= nFirstCol )
+ if ( pCols[ nCol ]->IsFrozen() || nCol >= nFirstCol )
{
// compute right end of column
- BrowserColumn *pCol = (*pCols)[ nCol ];
+ BrowserColumn *pCol = pCols[ nCol ];
sal_uInt16 nR = (sal_uInt16)(nX + pCol->Width() - 1);
// show resize-pointer?
@@ -1434,7 +1434,7 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt )
// width changed?
nDragX = std::max( rEvt.GetPosPixel().X(), nMinResizeX );
- if ( (nDragX - nResizeX) != (long)(*pCols)[ nResizeCol ]->Width() )
+ if ( (nDragX - nResizeX) != (long)pCols[ nResizeCol ]->Width() )
{
// resize column
long nMaxX = pDataWin->GetSizePixel().Width();
@@ -1480,7 +1480,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
{
if ( bColumnCursor && rEvt.GetColumn() != 0 )
{
- if ( rEvt.GetColumn() < pCols->size() )
+ if ( rEvt.GetColumn() < pCols.size() )
SelectColumnPos( rEvt.GetColumn(), true, false);
}
}
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 3ba541a..48aeacd 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -320,26 +320,26 @@ BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel )
long nColX = 0;
size_t nCol;
for ( nCol = 0;
- nCol < pBox->pCols->size() && nColX < GetSizePixel().Width();
+ nCol < pBox->pCols.size() && nColX < GetSizePixel().Width();
++nCol )
- if ( (*pBox->pCols)[ nCol ]->IsFrozen() || nCol >= pBox->nFirstCol )
+ if ( pBox->pCols[ nCol ]->IsFrozen() || nCol >= pBox->nFirstCol )
{
- nColX += (*pBox->pCols)[ nCol ]->Width();
+ nColX += pBox->pCols[ nCol ]->Width();
if ( nMouseX < nColX )
break;
}
sal_uInt16 nColId = BROWSER_INVALIDID;
- if ( nCol < pBox->pCols->size() )
- nColId = (*pBox->pCols)[ nCol ]->GetId();
+ if ( nCol < pBox->pCols.size() )
+ nColId = pBox->pCols[ nCol ]->GetId();
// compute the field rectangle and field relative MouseEvent
Rectangle aFieldRect;
- if ( nCol < pBox->pCols->size() )
+ if ( nCol < pBox->pCols.size() )
{
- nColX -= (*pBox->pCols)[ nCol ]->Width();
+ nColX -= pBox->pCols[ nCol ]->Width();
aFieldRect = Rectangle(
Point( nColX, nRelRow * pBox->GetDataRowHeight() ),
- Size( (*pBox->pCols)[ nCol ]->Width(),
+ Size( pBox->pCols[ nCol ]->Width(),
pBox->GetDataRowHeight() ) );
}
More information about the Libreoffice-commits
mailing list