diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-25 11:20:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-26 08:30:18 +0200 |
commit | bb7ce3137dbe12d67f393b95a437b18e3a63f8e7 (patch) | |
tree | 12d4b581ac21aaaa243d6d070b00a8695b624b92 /svtools | |
parent | 3dc50a3b9afc6eec42fb9f657a4dfd236066892f (diff) |
convert INVALIDATE constants to scoped enum
fixing a bug in Window::ImplMoveAllInvalidateRegions, and improving the
IDL docs for XWindowPeer
Change-Id: Idb774ac913945db2ac7c492c11cf86c370624c3d
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 16 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.cxx | 4 | ||||
-rw-r--r-- | svtools/source/brwbox/datwin.hxx | 6 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 8 | ||||
-rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 4 | ||||
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 6 | ||||
-rw-r--r-- | svtools/source/table/tablecontrol_impl.cxx | 12 |
7 files changed, 28 insertions, 28 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 2da27e8ca2b6..eb7e698d8dfd 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -481,7 +481,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ) Invalidate( aToRect ); } else - pDataWin->Window::Invalidate( INVALIDATE_NOCHILDREN ); + pDataWin->Window::Invalidate( InvalidateFlags::NoChildren ); // adjust header bar positions if ( getDataWindow()->pHeaderBar ) @@ -649,13 +649,13 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) aScrRect.Bottom() = pDataWin->GetSizePixel().Height(); getDataWindow()->Scroll( nWidth-nOldWidth, 0, aScrRect, SCROLL_FLAGS ); Rectangle aInvRect( nX, 0, nX + std::max( nWidth, (sal_uLong)nOldWidth ), USHRT_MAX ); - Control::Invalidate( aInvRect, INVALIDATE_NOCHILDREN ); + Control::Invalidate( aInvRect, InvalidateFlags::NoChildren ); static_cast<BrowserDataWin*>( pDataWin.get() )->Invalidate( aInvRect ); } else { - Control::Invalidate( INVALIDATE_NOCHILDREN ); - getDataWindow()->Window::Invalidate( INVALIDATE_NOCHILDREN ); + Control::Invalidate( InvalidateFlags::NoChildren ); + getDataWindow()->Window::Invalidate( InvalidateFlags::NoChildren ); } @@ -1028,8 +1028,8 @@ long BrowseBox::ScrollColumns( long nCols ) if( bInvalidateView ) { - Control::Invalidate( INVALIDATE_NOCHILDREN ); - pDataWin->Window::Invalidate( INVALIDATE_NOCHILDREN ); + Control::Invalidate( InvalidateFlags::NoChildren ); + pDataWin->Window::Invalidate( InvalidateFlags::NoChildren ); } // implicitly show cursor after scrolling @@ -1224,7 +1224,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeep SCROLL_FLAGS ); } else - pDataWin->Window::Invalidate( INVALIDATE_NOCHILDREN ); + pDataWin->Window::Invalidate( InvalidateFlags::NoChildren ); } else // scroll would cause a repaint, so we must explicitly invalidate @@ -1368,7 +1368,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint ) SCROLL_FLAGS ); } else - pDataWin->Window::Invalidate( INVALIDATE_NOCHILDREN ); + pDataWin->Window::Invalidate( InvalidateFlags::NoChildren ); } else { diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 4d037e21ca34..f4376eb71e5e 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -687,7 +687,7 @@ void BrowserDataWin::DoOutstandingInvalidations() -void BrowserDataWin::Invalidate( sal_uInt16 nFlags ) +void BrowserDataWin::Invalidate( InvalidateFlags nFlags ) { if ( !GetUpdateMode() ) { @@ -702,7 +702,7 @@ void BrowserDataWin::Invalidate( sal_uInt16 nFlags ) -void BrowserDataWin::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) +void BrowserDataWin::Invalidate( const Rectangle& rRect, InvalidateFlags nFlags ) { if ( !GetUpdateMode() ) aInvalidRegion.push_back( new Rectangle( rRect ) ); diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 5a1ade0ff0ae..4f5bba24b15b 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -172,9 +172,9 @@ public: void LeaveUpdateLock(); void Update(); void DoOutstandingInvalidations(); - void Invalidate( sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; - void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; - void Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE + void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) SAL_OVERRIDE; + void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) SAL_OVERRIDE; + void Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE ) SAL_OVERRIDE { Control::Invalidate( rRegion, nFlags ); } protected: diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 8704ab41cd66..a2428e9f146a 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -201,7 +201,7 @@ void SvxIconChoiceCtrl_Impl::Clear( bool bInCtor ) pZOrderList->clear(); SetOrigin( Point() ); if( bUpdateMode ) - pView->Invalidate(INVALIDATE_NOCHILDREN); + pView->Invalidate(InvalidateFlags::NoChildren); } AdjustScrollBars(); size_t nCount = aEntries.size(); @@ -580,7 +580,7 @@ void SvxIconChoiceCtrl_Impl::ImpArrange( bool bKeepPredecessors ) RecalcAllBoundingRectsSmart(); // TODO: the invalidation in the detail view should be more intelligent //if( !(nWinBits & WB_DETAILS )) - pView->Invalidate( INVALIDATE_NOCHILDREN ); + pView->Invalidate( InvalidateFlags::NoChildren ); nFlags &= ~F_ARRANGING; if( (nWinBits & WB_SMART_ARRANGE) && aCurOutputArea.TopLeft() != aEmptyPoint ) { @@ -1505,7 +1505,7 @@ void SvxIconChoiceCtrl_Impl::SetUpdateMode( bool bUpdate ) AdjustScrollBars(); pImpCursor->Clear(); pGridMap->Clear(); - pView->Invalidate(INVALIDATE_NOCHILDREN); + pView->Invalidate(InvalidateFlags::NoChildren); } } } @@ -2306,7 +2306,7 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const Rectangle& rRect, bool bScrBar, SCROLL_NOCHILDREN | SCROLL_USECLIPREGION | SCROLL_CLIP ); } else - pView->Invalidate(INVALIDATE_NOCHILDREN); + pView->Invalidate(InvalidateFlags::NoChildren); if( aHorSBar->IsVisible() || aVerSBar->IsVisible() ) { diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 56fff117da27..5378693828e5 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -354,7 +354,7 @@ void SvtIconChoiceCtrl::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { _pImp->InitSettings(); - Invalidate(INVALIDATE_NOCHILDREN); + Invalidate(InvalidateFlags::NoChildren); } else Control::DataChanged( rDCEvt ); @@ -405,7 +405,7 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper ) aFont.SetColor( rStyleSettings.GetFieldTextColor() ); SetFont( aFont ); - Invalidate(INVALIDATE_NOCHILDREN); + Invalidate(InvalidateFlags::NoChildren); } } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 9eaed195f786..abe9ad36c34f 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3508,7 +3508,7 @@ void SvTreeListBox::NotifyScrolled() aScrolledHdl.Call( this ); } -void SvTreeListBox::Invalidate( sal_uInt16 nInvalidateFlags ) +void SvTreeListBox::Invalidate( InvalidateFlags nInvalidateFlags ) { if (!pImp) return; @@ -3520,7 +3520,7 @@ void SvTreeListBox::Invalidate( sal_uInt16 nInvalidateFlags ) pImp->Invalidate(); } -void SvTreeListBox::Invalidate( const Rectangle& rRect, sal_uInt16 nInvalidateFlags ) +void SvTreeListBox::Invalidate( const Rectangle& rRect, InvalidateFlags nInvalidateFlags ) { if( nFocusWidth == -1 ) // to make sure that the control doesn't show the wrong focus rectangle @@ -3758,7 +3758,7 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt ) void SvTreeListBox::StateChanged( StateChangedType eType ) { if( eType == StateChangedType::Enable ) - Invalidate( INVALIDATE_CHILDREN ); + Invalidate( InvalidateFlags::Children ); Control::StateChanged( eType ); diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 4842dc748e33..916f7d8b824f 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -1815,7 +1815,7 @@ namespace svt { namespace table case TableAreaAll: m_pDataWindow->Invalidate(); - m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT ); + m_pDataWindow->GetParent()->Invalidate( InvalidateFlags::Transparent ); break; } } @@ -1892,7 +1892,7 @@ namespace svt { namespace table void TableControl_Impl::invalidateRect(const Rectangle &rInvalidateRect) { m_pDataWindow->Invalidate( rInvalidateRect, - m_pDataWindow->GetControlBackground().GetTransparency() ? INVALIDATE_TRANSPARENT : 0 ); + m_pDataWindow->GetControlBackground().GetTransparency() ? InvalidateFlags::Transparent : InvalidateFlags::NONE ); } @@ -2086,8 +2086,8 @@ namespace svt { namespace table } else { - m_pDataWindow->Invalidate( INVALIDATE_UPDATE ); - m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT ); + m_pDataWindow->Invalidate( InvalidateFlags::Update ); + m_pDataWindow->GetParent()->Invalidate( InvalidateFlags::Transparent ); } // update the position at the vertical scrollbar @@ -2164,8 +2164,8 @@ namespace svt { namespace table } else { - m_pDataWindow->Invalidate( INVALIDATE_UPDATE ); - m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT ); + m_pDataWindow->Invalidate( InvalidateFlags::Update ); + m_pDataWindow->GetParent()->Invalidate( InvalidateFlags::Transparent ); } // update the position at the horizontal scrollbar |