diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /svtools/source | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/source')
117 files changed, 2719 insertions, 2719 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 6ec387356f9d..be9ad5d96473 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -46,7 +46,7 @@ using com::sun::star::lang::XComponent; using namespace ::com::sun::star::uno; using namespace svt; -//------------------------------------------------------------------- + namespace { @@ -116,7 +116,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode ) ( bHasFocus ? 0 : 1 ) + ( GetUpdateMode() ? 0 : 1 ); } -//------------------------------------------------------------------- + BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode ) :Control( pParent, nBits | WB_3DLOOK ) @@ -128,7 +128,7 @@ BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode ) ConstructImpl( nMode ); } -//------------------------------------------------------------------- + BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode ) :Control( pParent, rId ) @@ -139,7 +139,7 @@ BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode ) DBG_CTOR( BrowseBox, NULL ); ConstructImpl(nMode); } -//------------------------------------------------------------------- + BrowseBox::~BrowseBox() { @@ -169,14 +169,14 @@ BrowseBox::~BrowseBox() delete uRow.pSel; } -//------------------------------------------------------------------- + short BrowseBox::GetCursorHideCount() const { return getDataWindow()->nCursorHidden; } -//------------------------------------------------------------------- + void BrowseBox::DoShowCursor( const char * ) { @@ -193,7 +193,7 @@ void BrowseBox::DoShowCursor( const char * ) } } -//------------------------------------------------------------------- + void BrowseBox::DoHideCursor( const char * ) { @@ -210,14 +210,14 @@ void BrowseBox::DoHideCursor( const char * ) } } -//------------------------------------------------------------------- + void BrowseBox::SetRealRowCount( const OUString &rRealRowCount ) { getDataWindow()->aRealRowCount = rRealRowCount; } -//------------------------------------------------------------------- + void BrowseBox::SetFont( const Font& rNewFont ) { @@ -226,14 +226,14 @@ void BrowseBox::SetFont( const Font& rNewFont ) ImpGetDataRowHeight(); } -//------------------------------------------------------------------- + sal_uLong BrowseBox::GetDefaultColumnWidth( const OUString& _rText ) const { return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(OUString('0')) * 4; } -//------------------------------------------------------------------- + void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) { @@ -265,7 +265,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) ColumnInserted( 0 ); } -//------------------------------------------------------------------- + void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText, long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos ) @@ -308,7 +308,7 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText, ColumnInserted( nPos ); } -//------------------------------------------------------------------- + sal_uInt16 BrowseBox::ToggleSelectedColumn() { sal_uInt16 nSelectedColId = BROWSER_INVALIDID; @@ -321,7 +321,7 @@ sal_uInt16 BrowseBox::ToggleSelectedColumn() } return nSelectedColId; } -// ----------------------------------------------------------------------------- + void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId) { if ( pColSel && _nSelectedColumnId != BROWSER_INVALIDID ) @@ -332,7 +332,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId) DoShowCursor( "SetToggledSelectedColumn" ); } } -// ----------------------------------------------------------------------------- + void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); @@ -411,7 +411,7 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze ) SetToggledSelectedColumn(nSelectedColId); } -//------------------------------------------------------------------- + void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ) { @@ -530,7 +530,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ) } -//------------------------------------------------------------------- + void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle ) { @@ -576,7 +576,7 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle ) } } -//------------------------------------------------------------------- + void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) { @@ -685,7 +685,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) } } -//------------------------------------------------------------------- + void BrowseBox::AutoSizeLastColumn() { @@ -698,7 +698,7 @@ void BrowseBox::AutoSizeLastColumn() } } -//------------------------------------------------------------------- + void BrowseBox::RemoveColumn( sal_uInt16 nItemId ) { @@ -782,7 +782,7 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId ) } } -//------------------------------------------------------------------- + void BrowseBox::RemoveColumns() { @@ -854,7 +854,7 @@ void BrowseBox::RemoveColumns() } } -//------------------------------------------------------------------- + OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const { @@ -866,14 +866,14 @@ OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const return (*pCols)[ nItemPos ]->Title(); } -//------------------------------------------------------------------- + long BrowseBox::GetRowCount() const { return nRowCount; } -//------------------------------------------------------------------- + sal_uInt16 BrowseBox::ColCount() const { @@ -882,7 +882,7 @@ sal_uInt16 BrowseBox::ColCount() const return (sal_uInt16) pCols->size(); } -//------------------------------------------------------------------- + long BrowseBox::ImpGetDataRowHeight() const { @@ -895,7 +895,7 @@ long BrowseBox::ImpGetDataRowHeight() const return nDataRowHeight; } -//------------------------------------------------------------------- + void BrowseBox::SetDataRowHeight( long nPixel ) { @@ -906,7 +906,7 @@ void BrowseBox::SetDataRowHeight( long nPixel ) getDataWindow()->Invalidate(); } -//------------------------------------------------------------------- + void BrowseBox::SetTitleLines( sal_uInt16 nLines ) { @@ -915,7 +915,7 @@ void BrowseBox::SetTitleLines( sal_uInt16 nLines ) nTitleLines = nLines; } -//------------------------------------------------------------------- + long BrowseBox::ScrollColumns( long nCols ) { @@ -1059,7 +1059,7 @@ long BrowseBox::ScrollColumns( long nCols ) return nCols; } -//------------------------------------------------------------------- + long BrowseBox::ScrollRows( long nRows ) { @@ -1117,7 +1117,7 @@ long BrowseBox::ScrollRows( long nRows ) return nTopRow - nOldTopRow; } -//------------------------------------------------------------------- + void BrowseBox::RowModified( long nRow, sal_uInt16 nColId ) { @@ -1139,7 +1139,7 @@ void BrowseBox::RowModified( long nRow, sal_uInt16 nColId ) getDataWindow()->Invalidate( aRect ); } -//------------------------------------------------------------------- + void BrowseBox::Clear() { @@ -1205,7 +1205,7 @@ void BrowseBox::Clear() } } } -// ----------------------------------------------------------------------------- + void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bool bKeepSelection ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); @@ -1310,7 +1310,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo DBG_ASSERT(nCurRow < nRowCount,"nCurRow >= nRowCount"); } -//------------------------------------------------------------------- + void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) { @@ -1483,14 +1483,14 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) DBG_ASSERT(nCurRow < nRowCount,"nCurRow >= nRowCount"); } -//------------------------------------------------------------------- + sal_Bool BrowseBox::GoToRow( long nRow) { return GoToRow(nRow, sal_False, sal_False); } -//------------------------------------------------------------------- + sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSelection ) { @@ -1578,7 +1578,7 @@ sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSele return sal_True; } -//------------------------------------------------------------------- + sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId) { @@ -1630,7 +1630,7 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_ return sal_True; } -//------------------------------------------------------------------- + sal_Bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId ) { @@ -1662,7 +1662,7 @@ sal_Bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId ) return bMoved; } -//------------------------------------------------------------------- + void BrowseBox::SetNoSelection() { @@ -1703,7 +1703,7 @@ void BrowseBox::SetNoSelection() } } -//------------------------------------------------------------------- + void BrowseBox::SelectAll() { @@ -1770,7 +1770,7 @@ void BrowseBox::SelectAll() } } -//------------------------------------------------------------------- + void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand ) { @@ -1844,7 +1844,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand ) } } -//------------------------------------------------------------------- + long BrowseBox::GetSelectRowCount() const { @@ -1854,7 +1854,7 @@ long BrowseBox::GetSelectRowCount() const uRow.nSel == BROWSER_ENDOFSELECTION ? 0 : 1; } -//------------------------------------------------------------------- + void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_Bool bMakeVisible ) { @@ -1920,7 +1920,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); } -//------------------------------------------------------------------- + sal_uInt16 BrowseBox::GetSelectColumnCount() const { @@ -1931,13 +1931,13 @@ sal_uInt16 BrowseBox::GetSelectColumnCount() const nCurRow >= 0 ? 1 : 0; } -//------------------------------------------------------------------- + long BrowseBox::FirstSelectedColumn( ) const { return pColSel ? pColSel->FirstSelected() : BROWSER_ENDOFSELECTION; } -//------------------------------------------------------------------- + long BrowseBox::FirstSelectedRow( sal_Bool bInverse ) { @@ -1946,7 +1946,7 @@ long BrowseBox::FirstSelectedRow( sal_Bool bInverse ) return bMultiSelection ? uRow.pSel->FirstSelected(bInverse) : uRow.nSel; } -//------------------------------------------------------------------- + long BrowseBox::NextSelectedRow() { @@ -1955,7 +1955,7 @@ long BrowseBox::NextSelectedRow() return bMultiSelection ? uRow.pSel->NextSelected() : BROWSER_ENDOFSELECTION; } -//------------------------------------------------------------------- + long BrowseBox::LastSelectedRow() { @@ -1964,7 +1964,7 @@ long BrowseBox::LastSelectedRow() return bMultiSelection ? uRow.pSel->LastSelected() : uRow.nSel; } -//------------------------------------------------------------------- + bool BrowseBox::IsRowSelected( long nRow ) const { @@ -1973,7 +1973,7 @@ bool BrowseBox::IsRowSelected( long nRow ) const return bMultiSelection ? uRow.pSel->IsSelected(nRow) : nRow == uRow.nSel; } -//------------------------------------------------------------------- + bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const { @@ -1983,7 +1983,7 @@ bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const nCurColId == nColumnId; } -//------------------------------------------------------------------- + sal_Bool BrowseBox::MakeFieldVisible ( @@ -2063,7 +2063,7 @@ sal_Bool BrowseBox::MakeFieldVisible return IsFieldVisible( nRow, nColId, bComplete ); } -//------------------------------------------------------------------- + sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, sal_Bool bCompletely ) const @@ -2090,7 +2090,7 @@ sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, return !aOutRect.Intersection( aRect ).IsEmpty(); } -//------------------------------------------------------------------- + Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, sal_Bool bRelToBrowser) const @@ -2113,7 +2113,7 @@ Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, return Rectangle( aTopLeft, aRect.GetSize() ); } -//------------------------------------------------------------------- + Rectangle BrowseBox::GetRowRectPixel( long nRow, sal_Bool bRelToBrowser ) const { @@ -2142,7 +2142,7 @@ Rectangle BrowseBox::GetRowRectPixel( long nRow, sal_Bool bRelToBrowser ) const return Rectangle( aTopLeft, aRect.GetSize() ); } -//------------------------------------------------------------------- + Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const { @@ -2173,7 +2173,7 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const GetDataRowHeight() - 1 ) ); } -//------------------------------------------------------------------- + long BrowseBox::GetRowAtYPosPixel( long nY, sal_Bool bRelToBrowser ) const { @@ -2194,7 +2194,7 @@ long BrowseBox::GetRowAtYPosPixel( long nY, sal_Bool bRelToBrowser ) const return nY / GetDataRowHeight() + nTopRow; } -//------------------------------------------------------------------- + Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const { @@ -2203,7 +2203,7 @@ Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const return GetFieldRectPixel( nCurRow, nColumnId ); } -//------------------------------------------------------------------- + sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const { @@ -2224,7 +2224,7 @@ sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const return BROWSER_INVALIDID; } -//------------------------------------------------------------------- + void BrowseBox::ReserveControlArea( sal_uInt16 nWidth ) { @@ -2238,7 +2238,7 @@ void BrowseBox::ReserveControlArea( sal_uInt16 nWidth ) } } -//------------------------------------------------------------------- + Rectangle BrowseBox::GetControlArea() const { @@ -2250,7 +2250,7 @@ Rectangle BrowseBox::GetControlArea() const aHScroll.GetSizePixel().Height() ) ); } -//------------------------------------------------------------------- + void BrowseBox::SetMode( BrowserMode nMode ) { @@ -2381,7 +2381,7 @@ void BrowseBox::SetMode( BrowserMode nMode ) m_nCurrentMode = nMode; } -//------------------------------------------------------------------- + void BrowseBox::VisibleRowsChanged( long, sal_uInt16 ) { @@ -2398,7 +2398,7 @@ void BrowseBox::VisibleRowsChanged( long, sal_uInt16 ) } } -//------------------------------------------------------------------- + sal_Bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const @@ -2418,14 +2418,14 @@ sal_Bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const return sal_True; } -//------------------------------------------------------------------- + long BrowseBox::GetDataRowHeight() const { return CalcZoom(nDataRowHeight ? nDataRowHeight : ImpGetDataRowHeight()); } -//------------------------------------------------------------------- + BrowserHeader* BrowseBox::CreateHeaderBar( BrowseBox* pParent ) { @@ -2440,7 +2440,7 @@ void BrowseBox::SetHeaderBar( BrowserHeader* pHeaderBar ) ( (BrowserDataWin*)pDataWin )->pHeaderBar = pHeaderBar; ( (BrowserDataWin*)pDataWin )->pHeaderBar->SetStartDragHdl( LINK( this, BrowseBox, StartDragHdl ) ); } -//------------------------------------------------------------------- + #ifdef DBG_UTIL const char* BrowseBoxCheckInvariants( const void * pVoid ) @@ -2461,7 +2461,7 @@ const char* BrowseBoxCheckInvariants( const void * pVoid ) } #endif -//------------------------------------------------------------------- + long BrowseBox::GetTitleHeight() const { long nHeight; @@ -2476,7 +2476,7 @@ long BrowseBox::GetTitleHeight() const return nTitleLines ? nTitleLines * nHeight + 4 : 0; } -//------------------------------------------------------------------- + long BrowseBox::CalcReverseZoom(long nVal) { if (IsZoom()) @@ -2504,7 +2504,7 @@ void BrowseBox::CursorMoved() ); } -//------------------------------------------------------------------- + void BrowseBox::LoseFocus() { @@ -2527,7 +2527,7 @@ void BrowseBox::LoseFocus() Control::LoseFocus(); } -//------------------------------------------------------------------- + void BrowseBox::GetFocus() { diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 5b9057c5486f..fb3918610cf8 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -220,14 +220,14 @@ void BrowseBox::Select() DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); } -//------------------------------------------------------------------- + void BrowseBox::DoubleClick( const BrowserMouseEvent & ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); } -//------------------------------------------------------------------- + long BrowseBox::QueryMinimumRowHeight() { @@ -235,35 +235,35 @@ long BrowseBox::QueryMinimumRowHeight() return CalcZoom( 5 ); } -//------------------------------------------------------------------- + void BrowseBox::ImplStartTracking() { DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants ); } -//------------------------------------------------------------------- + void BrowseBox::ImplTracking() { DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants ); } -//------------------------------------------------------------------- + void BrowseBox::ImplEndTracking() { DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants ); } -//------------------------------------------------------------------- + void BrowseBox::RowHeightChanged() { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); } -//------------------------------------------------------------------- + long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth ) { @@ -271,21 +271,21 @@ long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth ) return nWidth; } -//------------------------------------------------------------------- + void BrowseBox::ColumnResized( sal_uInt16 ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); } -//------------------------------------------------------------------- + void BrowseBox::ColumnMoved( sal_uInt16 ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); } -//------------------------------------------------------------------- + void BrowseBox::StartScroll() { @@ -293,7 +293,7 @@ void BrowseBox::StartScroll() DoHideCursor( "StartScroll" ); } -//------------------------------------------------------------------- + void BrowseBox::EndScroll() { @@ -303,7 +303,7 @@ void BrowseBox::EndScroll() DoShowCursor( "EndScroll" ); } -//------------------------------------------------------------------- + void BrowseBox::ToggleSelection( sal_Bool bForce ) { @@ -378,7 +378,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce ) bNotToggleSel = sal_False; } -//------------------------------------------------------------------- + void BrowseBox::DrawCursor() { @@ -448,7 +448,7 @@ void BrowseBox::DrawCursor() } } -//------------------------------------------------------------------- + sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const { @@ -460,7 +460,7 @@ sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const return (*pCols)[ nItemPos ]->Width(); } -//------------------------------------------------------------------- + sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const { @@ -471,7 +471,7 @@ sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const return (*pCols)[ nPos ]->GetId(); } -//------------------------------------------------------------------- + sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const { @@ -483,7 +483,7 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const return BROWSER_INVALIDID; } -//------------------------------------------------------------------- + sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const { @@ -495,7 +495,7 @@ sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const return sal_False; } -//------------------------------------------------------------------- + void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) { @@ -561,7 +561,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) DoShowCursor( "ExpandRowSelection" ); } -//------------------------------------------------------------------- + void BrowseBox::Resize() { @@ -640,7 +640,7 @@ void BrowseBox::Resize() DoShowCursor( "Resize" ); } -//------------------------------------------------------------------- + void BrowseBox::Paint( const Rectangle& rRect ) { @@ -735,13 +735,13 @@ void BrowseBox::Paint( const Rectangle& rRect ) } } -//------------------------------------------------------------------- + void BrowseBox::PaintRow( OutputDevice&, const Rectangle& ) { } -//------------------------------------------------------------------- + void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { @@ -884,7 +884,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } -//------------------------------------------------------------------- + void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_Bool _bForeignDevice, sal_Bool _bDrawSelections) { @@ -1131,7 +1131,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_ _rOut.SetLineColor( aOldLineColor ); } -//------------------------------------------------------------------- + void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect ) { @@ -1149,7 +1149,7 @@ void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect ) ImplPaintData(rWin, rRect, sal_False, sal_True); } -//------------------------------------------------------------------- + void BrowseBox::UpdateScrollbars() { @@ -1324,7 +1324,7 @@ void BrowseBox::UpdateScrollbars() } } -//------------------------------------------------------------------- + void BrowseBox::SetUpdateMode( sal_Bool bUpdate ) { @@ -1355,7 +1355,7 @@ void BrowseBox::SetUpdateMode( sal_Bool bUpdate ) DoHideCursor( "SetUpdateMode" ); } -//------------------------------------------------------------------- + sal_Bool BrowseBox::GetUpdateMode() const { @@ -1364,7 +1364,7 @@ sal_Bool BrowseBox::GetUpdateMode() const return getDataWindow()->IsUpdateMode(); } -//------------------------------------------------------------------- + long BrowseBox::GetFrozenWidth() const { @@ -1378,7 +1378,7 @@ long BrowseBox::GetFrozenWidth() const return nWidth; } -//------------------------------------------------------------------- + void BrowseBox::ColumnInserted( sal_uInt16 nPos ) { @@ -1389,7 +1389,7 @@ void BrowseBox::ColumnInserted( sal_uInt16 nPos ) UpdateScrollbars(); } -//------------------------------------------------------------------- + sal_uInt16 BrowseBox::FrozenColCount() const { @@ -1402,7 +1402,7 @@ sal_uInt16 BrowseBox::FrozenColCount() const return nCol; } -//------------------------------------------------------------------- + IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar) { @@ -1425,7 +1425,7 @@ IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar) return 0; } -//------------------------------------------------------------------- + IMPL_LINK_NOARG(BrowseBox, EndScrollHdl) { @@ -1440,7 +1440,7 @@ IMPL_LINK_NOARG(BrowseBox, EndScrollHdl) return 0; } -//------------------------------------------------------------------- + IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar ) { @@ -1448,7 +1448,7 @@ IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar ) return 0; } -//------------------------------------------------------------------- + // usually only the first column was resized void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) @@ -1505,7 +1505,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) SetNoSelection(); } -//------------------------------------------------------------------- + void BrowseBox::MouseMove( const MouseEvent& rEvt ) { @@ -1559,7 +1559,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt ) SetPointer( aNewPointer ); } -//------------------------------------------------------------------- + void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) { @@ -1596,7 +1596,7 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) rEvt.GetModifier() ) ) ); } -//------------------------------------------------------------------- + sal_Bool bExtendedMode = sal_False; sal_Bool bFieldMode = sal_False; @@ -1748,14 +1748,14 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) } } -//------------------------------------------------------------------- + void BrowseBox::MouseMove( const BrowserMouseEvent& ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); } -//------------------------------------------------------------------- + void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) { @@ -1794,7 +1794,7 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) } } -//------------------------------------------------------------------- + void BrowseBox::KeyInput( const KeyEvent& rEvt ) { @@ -1802,7 +1802,7 @@ void BrowseBox::KeyInput( const KeyEvent& rEvt ) Control::KeyInput( rEvt ); } -//------------------------------------------------------------------- + sal_Bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) { @@ -1873,7 +1873,7 @@ sal_Bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) return nId != BROWSER_NONE; } -//------------------------------------------------------------------- + void BrowseBox::Dispatch( sal_uInt16 nId ) { @@ -2056,7 +2056,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) //! return bDone; } -//------------------------------------------------------------------- + void BrowseBox::SetCursorColor(const Color& _rCol) { @@ -2074,7 +2074,7 @@ void BrowseBox::SetCursorColor(const Color& _rCol) DoShowCursor("SetCursorColor - force"); DoShowCursor("SetCursorColor"); } -// ----------------------------------------------------------------------------- + Rectangle BrowseBox::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen) { Window* pParent = NULL; @@ -2098,7 +2098,7 @@ Rectangle BrowseBox::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen) aTopLeft += GetWindowExtentsRelative( pParent ).TopLeft(); return Rectangle(aTopLeft,Size(nWidth,nHeight)); } -// ----------------------------------------------------------------------------- + Rectangle BrowseBox::calcTableRect(sal_Bool _bOnScreen) { Window* pParent = NULL; @@ -2114,7 +2114,7 @@ Rectangle BrowseBox::calcTableRect(sal_Bool _bOnScreen) return Rectangle(aRowBar.TopRight(), Size(aSize.A() - nX, aSize.B() - nY - aHScroll.GetSizePixel().Height()) ); } -// ----------------------------------------------------------------------------- + Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId,sal_uInt16 _nColId, sal_Bool /*_bIsHeader*/, sal_Bool _bOnScreen ) { Window* pParent = NULL; diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index ea8a201ff086..1683c63ed41d 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -66,7 +66,7 @@ namespace svt } // ============================================================================ - // ---------------------------------------------------------------------------- + Reference< XAccessible > BrowseBoxImpl::getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType ) { if ( m_pAccessible && m_pAccessible->isAlive() ) @@ -74,7 +74,7 @@ namespace svt return NULL; } - // ---------------------------------------------------------------------------- + Reference< XAccessible > BrowseBoxImpl::getAccessibleTable( ) { if ( m_pAccessible && m_pAccessible->isAlive() ) @@ -107,7 +107,7 @@ Reference< XAccessible > BrowseBox::CreateAccessible() return xAccessible; } -// ----------------------------------------------------------------------------- + // Children ------------------------------------------------------------------- @@ -125,7 +125,7 @@ Reference< XAccessible > BrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_u OFFSET_DEFAULT ); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > BrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow ) { @@ -138,7 +138,7 @@ Reference< XAccessible > BrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow ) m_pImpl->m_aFactoryAccess.getFactory() ); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > BrowseBox::CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos ) { @@ -151,20 +151,20 @@ Reference< XAccessible > BrowseBox::CreateAccessibleColumnHeader( sal_uInt16 _nC m_pImpl->m_aFactoryAccess.getFactory() ); } -// ----------------------------------------------------------------------------- + sal_Int32 BrowseBox::GetAccessibleControlCount() const { return 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > BrowseBox::CreateAccessibleControl( sal_Int32 ) { DBG_ASSERT( false, "BrowseBox::CreateAccessibleControl: to be overwritten!" ); return NULL; } -// ----------------------------------------------------------------------------- + // Conversions ---------------------------------------------------------------- @@ -176,7 +176,7 @@ sal_Bool BrowseBox::ConvertPointToCellAddress( rnColumnPos = GetColumnAtXPosPixel(rPoint.X()); return rnRow != BROWSER_INVALIDID && rnColumnPos != BROWSER_INVALIDID; } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ) { @@ -184,14 +184,14 @@ sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoi // sal_uInt16 nColumnId = GetColumnAtXPosPixel(rPoint.X()); return rnRow != BROWSER_INVALIDID;// && nColumnId == 0; } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::ConvertPointToColumnHeader( sal_uInt16& _rnColumnPos, const Point& _rPoint ) { _rnColumnPos = GetColumnAtXPosPixel(_rPoint.X()); return _rnColumnPos != BROWSER_INVALIDID; } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) { @@ -204,7 +204,7 @@ sal_Bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point return bRet; } -// ----------------------------------------------------------------------------- + // Object data and state ------------------------------------------------------ @@ -272,7 +272,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e } return aRetText; } -// ----------------------------------------------------------------------------- + OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 ) const { @@ -305,20 +305,20 @@ OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxOb } return aRetText; } -// ----------------------------------------------------------------------------- + OUString BrowseBox::GetRowDescription( sal_Int32 ) const { return OUString(); } -// ----------------------------------------------------------------------------- + OUString BrowseBox::GetColumnDescription( sal_uInt16 _nColumn ) const { return OUString( GetColumnTitle( GetColumnId( _nColumn ) ) ); } -// ----------------------------------------------------------------------------- + void BrowseBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, @@ -379,7 +379,7 @@ void BrowseBox::FillAccessibleStateSet( break; } } -// ----------------------------------------------------------------------- + void BrowseBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const { @@ -391,20 +391,20 @@ void BrowseBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& else // only transient when column is not focused _rStateSet.AddState( AccessibleStateType::TRANSIENT ); } -// ----------------------------------------------------------------------------- + void BrowseBox::GrabTableFocus() { GrabFocus(); } -// ----------------------------------------------------------------------------- + OUString BrowseBox::GetCellText(long, sal_uInt16 ) const { DBG_ASSERT(false,"This method has to be implemented by the derived classes! BUG!!"); return OUString(); } -// ----------------------------------------------------------------------------- + void BrowseBox::commitHeaderBarEvent(sal_Int16 nEventId, const Any& rNewValue, const Any& rOldValue, sal_Bool _bColumnHeaderBar ) { @@ -413,81 +413,81 @@ void BrowseBox::commitHeaderBarEvent(sal_Int16 nEventId, rNewValue, rOldValue, _bColumnHeaderBar ); } -// ----------------------------------------------------------------------------- + void BrowseBox::commitTableEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue ) { if ( isAccessibleAlive() ) m_pImpl->m_pAccessible->commitTableEvent( _nEventId, _rNewValue, _rOldValue ); } -// ----------------------------------------------------------------------------- + void BrowseBox::commitBrowseBoxEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue ) { if ( isAccessibleAlive() ) m_pImpl->m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue); } -// ----------------------------------------------------------------------------- + ::svt::IAccessibleFactory& BrowseBox::getAccessibleFactory() { return m_pImpl->m_aFactoryAccess.getFactory(); } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::isAccessibleAlive( ) const { return ( NULL != m_pImpl->m_pAccessible ) && m_pImpl->m_pAccessible->isAlive(); } -// ----------------------------------------------------------------------------- + // IAccessibleTableProvider -// ----------------------------------------------------------------------------- + sal_Int32 BrowseBox::GetCurrRow() const { return GetCurRow(); } -// ----------------------------------------------------------------------------- + sal_uInt16 BrowseBox::GetCurrColumn() const { return GetColumnPos( GetCurColumnId() ); } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::HasRowHeader() const { return ( GetColumnId( 0 ) == HandleColumnId ); // HandleColumn == RowHeader } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::IsCellFocusable() const { return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) { return GoToRowColumnId( _nRow, GetColumnId( _nColumn ) ); } -// ----------------------------------------------------------------------------- + void BrowseBox::SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect ) { SelectColumnPos( _nColumn, _bSelect ); } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::IsColumnSelected( long _nColumn ) const { return ( pColSel && (0 <= _nColumn) && (_nColumn <= 0xFFF) ) ? pColSel->IsSelected( static_cast< sal_uInt16 >( _nColumn ) ) : sal_False; } -// ----------------------------------------------------------------------------- + sal_Int32 BrowseBox::GetSelectedRowCount() const { return GetSelectRowCount(); } -// ----------------------------------------------------------------------------- + sal_Int32 BrowseBox::GetSelectedColumnCount() const { const MultiSelection* pColumnSel = GetColumnSelection(); return pColumnSel ? pColumnSel->GetSelectCount() : 0; } -// ----------------------------------------------------------------------------- + void BrowseBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const { sal_Int32 nCount = GetSelectRowCount(); @@ -501,7 +501,7 @@ void BrowseBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 > "BrowseBox::GetAllSelectedRows - too many selected rows found" ); } } -// ----------------------------------------------------------------------------- + void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const { const MultiSelection* pColumnSel = GetColumnSelection(); @@ -526,43 +526,43 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3 } } } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const { return IsFieldVisible( _nRow, GetColumnId( _nColumnPos ) ); } -// ----------------------------------------------------------------------------- + OUString BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const { return GetCellText( _nRow, GetColumnId( _nColPos ) ); } -// ----------------------------------------------------------------------------- + sal_Bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) { return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector ); } -// ----------------------------------------------------------------------------- + Rectangle BrowseBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } -// ----------------------------------------------------------------------------- + void BrowseBox::GrabFocus() { Control::GrabFocus(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > BrowseBox::GetAccessible( sal_Bool bCreate ) { return Control::GetAccessible( bCreate ); } -// ----------------------------------------------------------------------------- + Window* BrowseBox::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } -// ----------------------------------------------------------------------------- + Window* BrowseBox::GetWindowInstance() { return this; diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx index d3b7a7e9d0f9..42160d891831 100644 --- a/svtools/source/brwbox/brwhead.cxx +++ b/svtools/source/brwbox/brwhead.cxx @@ -35,7 +35,7 @@ BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits ) Show(); } -//------------------------------------------------------------------- + void BrowserHeader::Command( const CommandEvent& rCEvt ) { @@ -50,14 +50,14 @@ void BrowserHeader::Command( const CommandEvent& rCEvt ) } } -//------------------------------------------------------------------- + void BrowserHeader::Select() { HeaderBar::Select(); } -//------------------------------------------------------------------- + void BrowserHeader::EndDrag() { @@ -99,7 +99,7 @@ void BrowserHeader::EndDrag() } } } -// ----------------------------------------------------------------------------- + diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 77eed29b9917..a43c1fea893f 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -101,7 +101,7 @@ void ButtonFrame::Draw( OutputDevice& rDev ) rDev.SetFillColor( aOldFillColor ); } -//------------------------------------------------------------------- + BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage, const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom ) @@ -121,7 +121,7 @@ BrowserColumn::~BrowserColumn() { } -//------------------------------------------------------------------- + void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom) { @@ -132,7 +132,7 @@ void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZ _nOriginalWidth = n>0 ? (long)(n+0.5) : -(long)(-n+0.5); } -//------------------------------------------------------------------- + void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, sal_Bool bCurs ) { @@ -172,7 +172,7 @@ void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos } } -//------------------------------------------------------------------- + void BrowserColumn::ZoomChanged(const Fraction& rNewZoom) { @@ -183,7 +183,7 @@ void BrowserColumn::ZoomChanged(const Fraction& rNewZoom) _nWidth = n>0 ? (long)(n+0.5) : -(long)(-n+0.5); } -//------------------------------------------------------------------- + BrowserDataWin::BrowserDataWin( BrowseBox* pParent ) :Control( pParent, WinBits(WB_CLIPCHILDREN) ) @@ -217,7 +217,7 @@ BrowserDataWin::BrowserDataWin( BrowseBox* pParent ) aMouseTimer.SetTimeout( 100 ); } -//------------------------------------------------------------------- + BrowserDataWin::~BrowserDataWin() { if( pDtorNotify ) @@ -228,7 +228,7 @@ BrowserDataWin::~BrowserDataWin() aInvalidRegion.clear(); } -//------------------------------------------------------------------- + void BrowserDataWin::LeaveUpdateLock() { if ( !--nUpdateLock ) @@ -242,7 +242,7 @@ void BrowserDataWin::LeaveUpdateLock() } } -//------------------------------------------------------------------- + void InitSettings_Impl( Window *pWin, sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { @@ -274,7 +274,7 @@ void InitSettings_Impl( Window *pWin, } } -//------------------------------------------------------------------- + void BrowserDataWin::Update() { if ( !nUpdateLock ) @@ -283,7 +283,7 @@ void BrowserDataWin::Update() bUpdateOnUnlock = true; } -//------------------------------------------------------------------- + void BrowserDataWin::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -302,7 +302,7 @@ void BrowserDataWin::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); } -//------------------------------------------------------------------- + void BrowserDataWin::Paint( const Rectangle& rRect ) { if ( !nUpdateLock && GetUpdateMode() ) @@ -321,7 +321,7 @@ void BrowserDataWin::Paint( const Rectangle& rRect ) aInvalidRegion.push_back( new Rectangle( rRect ) ); } -//------------------------------------------------------------------- + BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel ) { @@ -365,7 +365,7 @@ BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel ) return BrowseEvent( this, nRow, nCol, nColId, aFieldRect ); } -//------------------------------------------------------------------- + sal_Int8 BrowserDataWin::AcceptDrop( const AcceptDropEvent& _rEvt ) { bCallingDropCallback = true; @@ -374,7 +374,7 @@ sal_Int8 BrowserDataWin::AcceptDrop( const AcceptDropEvent& _rEvt ) return nReturn; } -//------------------------------------------------------------------- + sal_Int8 BrowserDataWin::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { bCallingDropCallback = true; @@ -383,7 +383,7 @@ sal_Int8 BrowserDataWin::ExecuteDrop( const ExecuteDropEvent& _rEvt ) return nReturn; } -//------------------------------------------------------------------- + void BrowserDataWin::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) { if ( !GetParent()->bRowDividerDrag ) @@ -394,7 +394,7 @@ void BrowserDataWin::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) } } -//------------------------------------------------------------------- + void BrowserDataWin::Command( const CommandEvent& rEvt ) { // scroll mouse event? @@ -442,7 +442,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt ) Control::Command( rEvt ); } -//------------------------------------------------------------------- + sal_Bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent ) { @@ -458,7 +458,7 @@ sal_Bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent return ( nDividerDistance <= 4 ); } -//------------------------------------------------------------------- + void BrowserDataWin::MouseButtonDown( const MouseEvent& rEvt ) { @@ -474,7 +474,7 @@ void BrowserDataWin::MouseButtonDown( const MouseEvent& rEvt ) GetParent()->MouseButtonDown( BrowserMouseEvent( this, rEvt ) ); } -//------------------------------------------------------------------- + void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) { @@ -509,7 +509,7 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) aMouseTimer.Stop(); } -//------------------------------------------------------------------- + IMPL_LINK_NOARG_INLINE_START(BrowserDataWin, RepeatedMouseMove) { @@ -518,7 +518,7 @@ IMPL_LINK_NOARG_INLINE_START(BrowserDataWin, RepeatedMouseMove) } IMPL_LINK_NOARG_INLINE_END(BrowserDataWin, RepeatedMouseMove) -//------------------------------------------------------------------- + void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt ) { @@ -536,7 +536,7 @@ void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt ) GetParent()->MouseButtonUp( BrowserMouseEvent( this, rEvt ) ); } -//------------------------------------------------------------------- + void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos ) { @@ -561,7 +561,7 @@ void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos ) StartTracking(); } -//------------------------------------------------------------------- + void BrowserDataWin::Tracking( const TrackingEvent& rTEvt ) { @@ -606,7 +606,7 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt ) } } -//------------------------------------------------------------------- + void BrowserDataWin::KeyInput( const KeyEvent& rEvt ) { @@ -615,7 +615,7 @@ void BrowserDataWin::KeyInput( const KeyEvent& rEvt ) Control::KeyInput( rEvt ); } -//------------------------------------------------------------------- + void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt ) { @@ -645,7 +645,7 @@ BrowserMouseEvent::BrowserMouseEvent( BrowserDataWin *pWindow, { } -//------------------------------------------------------------------- + BrowserMouseEvent::BrowserMouseEvent( Window *pWindow, const MouseEvent& rEvt, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, @@ -673,7 +673,7 @@ BrowserExecuteDropEvent::BrowserExecuteDropEvent( BrowserDataWin *pWindow, const //=================================================================== -//------------------------------------------------------------------- + void BrowserDataWin::SetUpdateMode( sal_Bool bMode ) { @@ -686,7 +686,7 @@ void BrowserDataWin::SetUpdateMode( sal_Bool bMode ) DoOutstandingInvalidations(); } -//------------------------------------------------------------------- + void BrowserDataWin::DoOutstandingInvalidations() { for ( size_t i = 0, n = aInvalidRegion.size(); i < n; ++i ) { @@ -696,7 +696,7 @@ void BrowserDataWin::DoOutstandingInvalidations() aInvalidRegion.clear(); } -//------------------------------------------------------------------- + void BrowserDataWin::Invalidate( sal_uInt16 nFlags ) { @@ -711,7 +711,7 @@ void BrowserDataWin::Invalidate( sal_uInt16 nFlags ) Window::Invalidate( nFlags ); } -//------------------------------------------------------------------- + void BrowserDataWin::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) { @@ -746,7 +746,7 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt ) ScrollBar::Tracking( rTEvt ); } -//------------------------------------------------------------------- + void BrowserScrollBar::EndScroll() { diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 57c951ac6e26..f95303af39c6 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -49,7 +49,7 @@ namespace svt SetDropDownLineCount(5); } - //------------------------------------------------------------------ + bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) { switch (rNEvt.GetType()) @@ -82,13 +82,13 @@ namespace svt //================================================================== //= ComboBoxCellController //================================================================== - //------------------------------------------------------------------ + ComboBoxCellController::ComboBoxCellController(ComboBoxControl* pWin) :CellController(pWin) { } - //------------------------------------------------------------------ + sal_Bool ComboBoxCellController::MoveAllowed(const KeyEvent& rEvt) const { ComboBoxControl& rBox = GetComboBox(); @@ -126,19 +126,19 @@ namespace svt } } - //------------------------------------------------------------------ + sal_Bool ComboBoxCellController::IsModified() const { return GetComboBox().GetSavedValue() != GetComboBox().GetText(); } - //------------------------------------------------------------------ + void ComboBoxCellController::ClearModified() { GetComboBox().SaveValue(); } - //------------------------------------------------------------------ + void ComboBoxCellController::SetModifyHdl(const Link& rLink) { GetComboBox().SetModifyHdl(rLink); @@ -147,7 +147,7 @@ namespace svt //================================================================== //= ListBoxControl //================================================================== - //------------------------------------------------------------------ + ListBoxControl::ListBoxControl(Window* pParent, WinBits nWinStyle) :ListBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER) { @@ -156,7 +156,7 @@ namespace svt SetDropDownLineCount(20); } - //------------------------------------------------------------------ + bool ListBoxControl::PreNotify( NotifyEvent& rNEvt ) { switch (rNEvt.GetType()) @@ -192,13 +192,13 @@ namespace svt //================================================================== //= ListBoxCellController //================================================================== - //------------------------------------------------------------------ + ListBoxCellController::ListBoxCellController(ListBoxControl* pWin) :CellController(pWin) { } - //------------------------------------------------------------------ + sal_Bool ListBoxCellController::MoveAllowed(const KeyEvent& rEvt) const { ListBoxControl& rBox = GetListBox(); @@ -222,19 +222,19 @@ namespace svt } } - //------------------------------------------------------------------ + sal_Bool ListBoxCellController::IsModified() const { return GetListBox().GetSelectEntryPos() != GetListBox().GetSavedValue(); } - //------------------------------------------------------------------ + void ListBoxCellController::ClearModified() { GetListBox().SaveValue(); } - //------------------------------------------------------------------ + void ListBoxCellController::SetModifyHdl(const Link& rLink) { GetListBox().SetSelectHdl(rLink); @@ -243,7 +243,7 @@ namespace svt //================================================================== //= CheckBoxControl //================================================================== - //------------------------------------------------------------------ + CheckBoxControl::CheckBoxControl(Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle) { @@ -266,34 +266,34 @@ namespace svt pBox->Show(); } - //------------------------------------------------------------------ + CheckBoxControl::~CheckBoxControl() { delete pBox; } - //------------------------------------------------------------------ + IMPL_LINK_NOARG(CheckBoxControl, OnClick) { m_aClickLink.Call(pBox); return m_aModifyLink.Call(pBox); } - //------------------------------------------------------------------ + void CheckBoxControl::Resize() { Control::Resize(); pBox->SetPosSizePixel(Point(0,0),GetSizePixel()); } - //------------------------------------------------------------------------------ + void CheckBoxControl::DataChanged( const DataChangedEvent& _rEvent ) { if ( _rEvent.GetType() == DATACHANGED_SETTINGS ) pBox->SetSettings( GetSettings() ); } - //------------------------------------------------------------------------------ + void CheckBoxControl::StateChanged( StateChangedType nStateChange ) { Control::StateChanged(nStateChange); @@ -301,19 +301,19 @@ namespace svt pBox->SetZoom(GetZoom()); } - //------------------------------------------------------------------ + void CheckBoxControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { pBox->Draw(pDev,rPos,rSize,nFlags); } - //------------------------------------------------------------------ + void CheckBoxControl::GetFocus() { pBox->GrabFocus(); } - //------------------------------------------------------------------ + void CheckBoxControl::Paint(const Rectangle& rClientRect) { Control::Paint(rClientRect); @@ -321,7 +321,7 @@ namespace svt ShowFocus(aFocusRect); } - //------------------------------------------------------------------ + bool CheckBoxControl::PreNotify(NotifyEvent& rEvt) { switch (rEvt.GetType()) @@ -338,31 +338,31 @@ namespace svt //================================================================== //= CheckBoxCellController //================================================================== - //------------------------------------------------------------------ + sal_Bool CheckBoxCellController::WantMouseEvent() const { return sal_True; } - //------------------------------------------------------------------ + CheckBox& CheckBoxCellController::GetCheckBox() const { return ((CheckBoxControl &)GetWindow()).GetBox(); } - //------------------------------------------------------------------ + sal_Bool CheckBoxCellController::IsModified() const { return GetCheckBox().GetSavedValue() != GetCheckBox().GetState(); } - //------------------------------------------------------------------ + void CheckBoxCellController::ClearModified() { GetCheckBox().SaveValue(); } - //------------------------------------------------------------------ + void CheckBoxCellController::SetModifyHdl(const Link& rLink) { ((CheckBoxControl &)GetWindow()).SetModifyHdl(rLink); @@ -371,13 +371,13 @@ namespace svt //================================================================== //= MultiLineEditImplementation //================================================================== - //------------------------------------------------------------------ + OUString MultiLineEditImplementation::GetText( LineEnd aSeparator ) const { return const_cast< MultiLineEditImplementation* >( this )->GetEditWindow().GetText( aSeparator ); } - //------------------------------------------------------------------ + OUString MultiLineEditImplementation::GetSelected( LineEnd aSeparator ) const { return const_cast< MultiLineEditImplementation* >( this )->GetEditWindow().GetSelected( aSeparator ); @@ -386,7 +386,7 @@ namespace svt //================================================================== //= EditCellController //================================================================== - //------------------------------------------------------------------ + EditCellController::EditCellController( Edit* _pEdit ) :CellController( _pEdit ) ,m_pEditImplementation( new EditImplementation( *_pEdit ) ) @@ -394,7 +394,7 @@ namespace svt { } - //------------------------------------------------------------------ + EditCellController::EditCellController( IEditImplementation* _pImplementation ) :CellController( &_pImplementation->GetControl() ) ,m_pEditImplementation( _pImplementation ) @@ -402,26 +402,26 @@ namespace svt { } - //----------------------------------------------------------------------------- + EditCellController::~EditCellController( ) { if ( m_bOwnImplementation ) DELETEZ( m_pEditImplementation ); } - //----------------------------------------------------------------------------- + void EditCellController::SetModified() { m_pEditImplementation->SetModified(); } - //----------------------------------------------------------------------------- + void EditCellController::ClearModified() { m_pEditImplementation->ClearModified(); } - //------------------------------------------------------------------ + sal_Bool EditCellController::MoveAllowed(const KeyEvent& rEvt) const { sal_Bool bResult; @@ -445,13 +445,13 @@ namespace svt return bResult; } - //------------------------------------------------------------------ + sal_Bool EditCellController::IsModified() const { return m_pEditImplementation->IsModified(); } - //------------------------------------------------------------------ + void EditCellController::SetModifyHdl(const Link& rLink) { m_pEditImplementation->SetModifyHdl(rLink); @@ -460,25 +460,25 @@ namespace svt //================================================================== //= SpinCellController //================================================================== - //------------------------------------------------------------------ + SpinCellController::SpinCellController(SpinField* pWin) :CellController(pWin) { } - //----------------------------------------------------------------------------- + void SpinCellController::SetModified() { GetSpinWindow().SetModifyFlag(); } - //----------------------------------------------------------------------------- + void SpinCellController::ClearModified() { GetSpinWindow().ClearModifyFlag(); } - //------------------------------------------------------------------ + sal_Bool SpinCellController::MoveAllowed(const KeyEvent& rEvt) const { sal_Bool bResult; @@ -502,13 +502,13 @@ namespace svt return bResult; } - //------------------------------------------------------------------ + sal_Bool SpinCellController::IsModified() const { return GetSpinWindow().IsModified(); } - //------------------------------------------------------------------ + void SpinCellController::SetModifyHdl(const Link& rLink) { GetSpinWindow().SetModifyHdl(rLink); @@ -517,13 +517,13 @@ namespace svt //================================================================== //= FormattedFieldCellController //================================================================== - //------------------------------------------------------------------ + FormattedFieldCellController::FormattedFieldCellController( FormattedField* _pFormatted ) :EditCellController( _pFormatted ) { } - //------------------------------------------------------------------ + void FormattedFieldCellController::CommitModifications() { static_cast< FormattedField& >( GetWindow() ).Commit(); @@ -532,14 +532,14 @@ namespace svt //================================================================== //= MultiLineTextCell //================================================================== - //------------------------------------------------------------------ + void MultiLineTextCell::Modify() { GetTextEngine()->SetModified( true ); MultiLineEdit::Modify(); } - //------------------------------------------------------------------ + sal_Bool MultiLineTextCell::dispatchKeyEvent( const KeyEvent& _rEvent ) { Selection aOldSelection( GetSelection() ); @@ -567,7 +567,7 @@ namespace svt return sal_False; } - //------------------------------------------------------------------ + bool MultiLineTextCell::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 135740c2f518..128793b21201 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -71,7 +71,7 @@ namespace svt //================================================================== //= EditBrowserHeader //================================================================== - //------------------------------------------------------------------------------ + void EditBrowserHeader::DoubleClick() { sal_uInt16 nColId = GetCurItemId(); @@ -90,13 +90,13 @@ namespace svt //================================================================== //= EditBrowseBox //================================================================== - //------------------------------------------------------------------------------ + void EditBrowseBox::BrowserMouseEventPtr::Clear() { DELETEZ(pEvent); } - //------------------------------------------------------------------------------ + void EditBrowseBox::BrowserMouseEventPtr::Set(const BrowserMouseEvent* pEvt, sal_Bool bIsDown) { if (pEvt == pEvent) @@ -117,7 +117,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + DBG_NAME(EditBrowseBox); void EditBrowseBox::impl_construct() { @@ -133,7 +133,7 @@ namespace svt pCheckBoxPaint->SetBackground(); } - //------------------------------------------------------------------------------ + EditBrowseBox::EditBrowseBox(Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags, BrowserMode _nMode ) :BrowseBox( pParent, rId, _nMode ) ,nStartEvent(0) @@ -176,13 +176,13 @@ namespace svt impl_construct(); } - //------------------------------------------------------------------------------ + void EditBrowseBox::Init() { // late construction } - //------------------------------------------------------------------------------ + EditBrowseBox::~EditBrowseBox() { if (nStartEvent) @@ -197,7 +197,7 @@ namespace svt DBG_DTOR(EditBrowseBox,NULL); } - //------------------------------------------------------------------------------ + void EditBrowseBox::RemoveRows() { BrowseBox::Clear(); @@ -205,7 +205,7 @@ namespace svt nEditCol = nOldEditCol = 0; } - //------------------------------------------------------------------------------ + BrowserHeader* EditBrowseBox::CreateHeaderBar(BrowseBox* pParent) { pHeader = imp_CreateHeaderBar(pParent); @@ -214,20 +214,20 @@ namespace svt return pHeader; } - //------------------------------------------------------------------------------ + BrowserHeader* EditBrowseBox::imp_CreateHeaderBar(BrowseBox* pParent) { return new EditBrowserHeader(pParent); } - //------------------------------------------------------------------------------ + void EditBrowseBox::LoseFocus() { BrowseBox::LoseFocus(); DetermineFocus( 0 ); } - //------------------------------------------------------------------------------ + void EditBrowseBox::GetFocus() { BrowseBox::GetFocus(); @@ -240,14 +240,14 @@ namespace svt DetermineFocus( getRealGetFocusFlags( this ) ); } - //------------------------------------------------------------------------------ + sal_Bool EditBrowseBox::SeekRow(long nRow) { nPaintRow = nRow; return sal_True; } - //------------------------------------------------------------------------------ + IMPL_LINK_NOARG(EditBrowseBox, StartEditHdl) { nStartEvent = 0; @@ -260,7 +260,7 @@ namespace svt return 0; } - //------------------------------------------------------------------------------ + void EditBrowseBox::PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const { @@ -283,7 +283,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + Image EditBrowseBox::GetImage(RowStatus eStatus) const { if ( !m_aStatusImages.GetImageCount() ) @@ -335,7 +335,7 @@ namespace svt return aImage; } - //------------------------------------------------------------------------------ + void EditBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const { if (nPaintRow < 0) @@ -382,7 +382,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + void EditBrowseBox::ImplStartTracking() { bActiveBeforeTracking = IsEditing(); @@ -395,13 +395,13 @@ namespace svt BrowseBox::ImplStartTracking(); } - //------------------------------------------------------------------------------ + void EditBrowseBox::ImplTracking() { BrowseBox::ImplTracking(); } - //------------------------------------------------------------------------------ + void EditBrowseBox::ImplEndTracking() { if ( bActiveBeforeTracking ) @@ -411,7 +411,7 @@ namespace svt BrowseBox::ImplEndTracking(); } - //------------------------------------------------------------------------------ + void EditBrowseBox::RowHeightChanged() { if ( IsEditing() ) @@ -425,13 +425,13 @@ namespace svt BrowseBox::RowHeightChanged(); } - //------------------------------------------------------------------------------ + EditBrowseBox::RowStatus EditBrowseBox::GetRowStatus(long) const { return CLEAN; } - //------------------------------------------------------------------------------ + void EditBrowseBox::KeyInput( const KeyEvent& rEvt ) { sal_uInt16 nCode = rEvt.GetKeyCode().GetCode(); @@ -474,7 +474,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + void EditBrowseBox::MouseButtonDown(const BrowserMouseEvent& rEvt) { sal_uInt16 nColPos = GetColumnPos( rEvt.GetColumnId() ); @@ -520,7 +520,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + void EditBrowseBox::MouseButtonUp( const BrowserMouseEvent& rEvt ) { // absorb double clicks @@ -536,7 +536,7 @@ namespace svt implActivateCellOnMouseEvent(rEvt, sal_True); } - //------------------------------------------------------------------------------ + void EditBrowseBox::implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, sal_Bool _bUp) { if (!IsEditing()) @@ -586,7 +586,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + void EditBrowseBox::Dispatch( sal_uInt16 _nId ) { if ( _nId == BROWSER_ENHANCESELECTION ) @@ -610,7 +610,7 @@ namespace svt BrowseBox::Dispatch( _nId ); } - //------------------------------------------------------------------------------ + bool EditBrowseBox::PreNotify(NotifyEvent& rEvt) { switch (rEvt.GetType()) @@ -729,13 +729,13 @@ namespace svt return BrowseBox::PreNotify(rEvt); } - //------------------------------------------------------------------------------ + sal_Bool EditBrowseBox::IsTabAllowed(sal_Bool) const { return sal_True; } - //------------------------------------------------------------------------------ + bool EditBrowseBox::Notify(NotifyEvent& rEvt) { switch (rEvt.GetType()) @@ -751,7 +751,7 @@ namespace svt return BrowseBox::Notify(rEvt); } - //------------------------------------------------------------------------------ + void EditBrowseBox::StateChanged( StateChangedType nType ) { BrowseBox::StateChanged( nType ); @@ -799,7 +799,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + void EditBrowseBox::DataChanged( const DataChangedEvent& rDCEvt ) { BrowseBox::DataChanged( rDCEvt ); @@ -813,7 +813,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + void EditBrowseBox::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -863,7 +863,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + sal_Bool EditBrowseBox::IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const { sal_uInt16 nInfo = 0; @@ -951,7 +951,7 @@ namespace svt return pTHIS->CursorMoving(nNewRow, nNewColId); } - //------------------------------------------------------------------------------ + void EditBrowseBox::ColumnMoved(sal_uInt16 nId) { BrowseBox::ColumnMoved(nId); @@ -964,20 +964,20 @@ namespace svt } } - //------------------------------------------------------------------------------ + sal_Bool EditBrowseBox::SaveRow() { return sal_True; } - //------------------------------------------------------------------------------ + sal_Bool EditBrowseBox::CursorMoving(long, sal_uInt16) { ((EditBrowseBox *) this)->DeactivateCell(sal_False); return sal_True; } - //------------------------------------------------------------------------------ + void EditBrowseBox::CursorMoved() { long nNewRow = GetCurRow(); @@ -993,7 +993,7 @@ namespace svt //BrowseBox::CursorMoved(); } - //------------------------------------------------------------------------------ + void EditBrowseBox::EndScroll() { if (IsEditing()) @@ -1005,7 +1005,7 @@ namespace svt BrowseBox::EndScroll(); } - //------------------------------------------------------------------------------ + void EditBrowseBox::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bCellFocus) { if (IsEditing()) @@ -1055,7 +1055,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + void EditBrowseBox::DeactivateCell(sal_Bool bUpdate) { if (IsEditing()) @@ -1091,7 +1091,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + Rectangle EditBrowseBox::GetCellRect(long nRow, sal_uInt16 nColId, sal_Bool bRel) const { Rectangle aRect( GetFieldRectPixel(nRow, nColId, bRel)); @@ -1103,7 +1103,7 @@ namespace svt return aRect; } - //------------------------------------------------------------------------------ + IMPL_LINK_NOARG(EditBrowseBox, EndEditHdl) { nEndEvent = 0; @@ -1116,7 +1116,7 @@ namespace svt return 0; } - //------------------------------------------------------------------------------ + IMPL_LINK_NOARG(EditBrowseBox, ModifyHdl) { if (nCellModifiedEvent) @@ -1125,7 +1125,7 @@ namespace svt return 0; } - //------------------------------------------------------------------------------ + IMPL_LINK_NOARG(EditBrowseBox, CellModifiedHdl) { nCellModifiedEvent = 0; @@ -1133,7 +1133,7 @@ namespace svt return 0; } - //------------------------------------------------------------------------------ + void EditBrowseBox::ColumnResized( sal_uInt16 ) { if (IsEditing()) @@ -1145,7 +1145,7 @@ namespace svt } } - //------------------------------------------------------------------------------ + sal_uInt16 EditBrowseBox::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos, sal_uInt16 nId) { if (nId == BROWSER_INVALIDID) @@ -1173,7 +1173,7 @@ namespace svt return nId; } - //------------------------------------------------------------------------------ + void EditBrowseBox::Resize() { BrowseBox::Resize(); @@ -1195,46 +1195,46 @@ namespace svt ReserveControlArea((sal_uInt16)nX); } - //------------------------------------------------------------------------------ + void EditBrowseBox::ArrangeControls(sal_uInt16&, sal_uInt16) { } - //------------------------------------------------------------------------------ + CellController* EditBrowseBox::GetController(long, sal_uInt16) { return NULL; } - //----------------------------------------------------------------------------- + void EditBrowseBox::ResizeController(CellControllerRef& rController, const Rectangle& rRect) { rController->GetWindow().SetPosSizePixel(rRect.TopLeft(), rRect.GetSize()); } - //------------------------------------------------------------------------------ + void EditBrowseBox::InitController(CellControllerRef&, long, sal_uInt16) { } - //------------------------------------------------------------------------------ + void EditBrowseBox::ReleaseController(CellControllerRef&, long, sal_uInt16) { } - //------------------------------------------------------------------------------ + void EditBrowseBox::CellModified() { } - //------------------------------------------------------------------------------ + sal_Bool EditBrowseBox::SaveModified() { return sal_True; } - //------------------------------------------------------------------------------ + void EditBrowseBox::DoubleClick(const BrowserMouseEvent& rEvt) { // when double clicking on the column, the optimum size will be calculated @@ -1243,7 +1243,7 @@ namespace svt SetColumnWidth(nColId, GetAutoColumnWidth(nColId)); } - //------------------------------------------------------------------------------ + sal_uInt32 EditBrowseBox::GetAutoColumnWidth(sal_uInt16 nColId) { sal_uInt32 nCurColWidth = GetColumnWidth(nColId); @@ -1265,13 +1265,13 @@ namespace svt return nNewColWidth; } - //------------------------------------------------------------------------------ + sal_uInt32 EditBrowseBox::GetTotalCellWidth(long, sal_uInt16) { return 0; } - //------------------------------------------------------------------------------ + void EditBrowseBox::InvalidateHandleColumn() { Rectangle aHdlFieldRect( GetFieldRectPixel( 0, 0 )); @@ -1280,7 +1280,7 @@ namespace svt Invalidate( aInvalidRect ); } - //------------------------------------------------------------------------------ + void EditBrowseBox::PaintTristate(OutputDevice&, const Rectangle& rRect,const TriState& eState,sal_Bool _bEnabled) const { pCheckBoxPaint->GetBox().SetState(eState); @@ -1301,7 +1301,7 @@ namespace svt pCheckBoxPaint->SetParentUpdateMode( true ); } - //------------------------------------------------------------------------------ + void EditBrowseBox::AsynchGetFocus() { if (nStartEvent) @@ -1311,7 +1311,7 @@ namespace svt nStartEvent = Application::PostUserEvent(LINK(this,EditBrowseBox,StartEditHdl)); } - //------------------------------------------------------------------------------ + void EditBrowseBox::SetBrowserFlags(sal_Int32 nFlags) { if (m_nBrowserFlags == nFlags) @@ -1324,12 +1324,12 @@ namespace svt if (RowPicturesChanges) InvalidateStatusCell(GetCurRow()); } - //------------------------------------------------------------------------------ + inline void EditBrowseBox::HideAndDisable(CellControllerRef& rController) { rController->suspend(); } - //------------------------------------------------------------------------------ + inline void EditBrowseBox::EnableAndShow() const { Controller()->resume(); @@ -1337,7 +1337,7 @@ namespace svt //=============================================================================== DBG_NAME(CellController); - //------------------------------------------------------------------------------ + CellController::CellController(Control* pW) :pWindow( pW ) ,bSuspended( true ) @@ -1348,14 +1348,14 @@ namespace svt DBG_ASSERT(!pWindow->IsVisible(), "CellController::CellController: window should not be visible!"); } - //----------------------------------------------------------------------------- + CellController::~CellController() { DBG_DTOR(CellController,NULL); } - //----------------------------------------------------------------------------- + void CellController::suspend( ) { DBG_ASSERT( bSuspended == !GetWindow().IsVisible(), "CellController::suspend: inconsistence!" ); @@ -1368,7 +1368,7 @@ namespace svt } } - //----------------------------------------------------------------------------- + void CellController::resume( ) { DBG_ASSERT( bSuspended == !GetWindow().IsVisible(), "CellController::resume: inconsistence!" ); @@ -1380,24 +1380,24 @@ namespace svt } } - //----------------------------------------------------------------------------- + void CellController::CommitModifications() { // nothing to do in this base class } - //----------------------------------------------------------------------------- + sal_Bool CellController::WantMouseEvent() const { return sal_False; } - //----------------------------------------------------------------------------- + void CellController::SetModified() { } - //----------------------------------------------------------------------------- + sal_Bool CellController::MoveAllowed(const KeyEvent&) const { return sal_True; diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index b5e9b80664c3..89e2405f0b73 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -31,7 +31,7 @@ namespace svt using namespace com::sun::star::uno; using namespace ::com::sun::star::accessibility::AccessibleEventId; -// ----------------------------------------------------------------------------- + Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState) { Reference< XAccessible > xAccessible( GetAccessible() ); @@ -54,17 +54,17 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, } return xReturn; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > EditBrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { return BrowseBox::CreateAccessibleCell( _nRow, _nColumnPos ); } -// ----------------------------------------------------------------------------- + sal_Int32 EditBrowseBox::GetAccessibleControlCount() const { return IsEditing() ? 1 : 0; } -// ----------------------------------------------------------------------------- + void EditBrowseBox::implCreateActiveAccessible( ) { DBG_ASSERT( IsEditing(), "EditBrowseBox::implCreateActiveAccessible: not to be called if we're not editing currently!" ); @@ -90,7 +90,7 @@ void EditBrowseBox::implCreateActiveAccessible( ) } } -// ----------------------------------------------------------------------------- + Reference< XAccessible > EditBrowseBox::CreateAccessibleControl( sal_Int32 #ifdef DBG_UTIL _nIndex @@ -107,12 +107,12 @@ _nIndex return m_aImpl->m_xActiveCell; } -// ----------------------------------------------------------------------------- + Reference<XAccessible > EditBrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow ) { return BrowseBox::CreateAccessibleRowHeader( _nRow ); } -// ----------------------------------------------------------------------------- + void EditBrowseBoxImpl::clearActiveCell() { try @@ -126,13 +126,13 @@ void EditBrowseBoxImpl::clearActiveCell() m_xActiveCell = NULL; } -// ----------------------------------------------------------------------------- + void EditBrowseBox::GrabTableFocus() { if ( aController.Is() ) aController->GetWindow().GrabFocus(); } -//------------------------------------------------------------------------------ + void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) { sal_Bool bFocus = sal_False; @@ -177,7 +177,7 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) } } } -// ----------------------------------------------------------------------------- + Rectangle EditBrowseBox::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 _nIndex) { Rectangle aRect; @@ -190,7 +190,7 @@ Rectangle EditBrowseBox::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nCol } return aRect; } -// ----------------------------------------------------------------------------- + sal_Int32 EditBrowseBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) { sal_Int32 nRet = -1; @@ -203,10 +203,10 @@ sal_Int32 EditBrowseBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumn } return nRet; } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + } // namespace svt -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 986ef274626b..e7389e454ec0 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -117,7 +117,7 @@ namespace : public rtl::Static< ::osl::Mutex, SingletonMutex > {}; } -// ----------------------------------------------------------------------- + // class SvtAccessibilityOptions_Impl --------------------------------------------- SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl() @@ -144,7 +144,7 @@ SvtAccessibilityOptions_Impl::~SvtAccessibilityOptions_Impl() { } -// ----------------------------------------------------------------------- + sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC() { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); @@ -701,7 +701,7 @@ void SvtAccessibilityOptions_Impl::SetPreviewUsesCheckeredBackground(sal_Bool bS } } -// ----------------------------------------------------------------------- + // class SvtAccessibilityOptions -------------------------------------------------- SvtAccessibilityOptions::SvtAccessibilityOptions() @@ -718,7 +718,7 @@ SvtAccessibilityOptions::SvtAccessibilityOptions() //StartListening( *sm_pSingleImplConfig, sal_True ); } -// ----------------------------------------------------------------------- + SvtAccessibilityOptions::~SvtAccessibilityOptions() { @@ -732,7 +732,7 @@ SvtAccessibilityOptions::~SvtAccessibilityOptions() } } -// ----------------------------------------------------------------------- + void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint ) { @@ -744,7 +744,7 @@ void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -// ----------------------------------------------------------------------- + sal_Bool SvtAccessibilityOptions::IsModified() const { @@ -755,7 +755,7 @@ void SvtAccessibilityOptions::Commit() //sm_pSingleImplConfig->Commit(); } -// ----------------------------------------------------------------------- + sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const { @@ -810,7 +810,7 @@ sal_Bool SvtAccessibilityOptions::GetPreviewUsesCheckeredBackground() const return sm_pSingleImplConfig->GetPreviewUsesCheckeredBackground(); } -// ----------------------------------------------------------------------- + void SvtAccessibilityOptions::SetAutoDetectSystemHC(sal_Bool bSet) { sm_pSingleImplConfig->SetAutoDetectSystemHC(bSet); @@ -868,6 +868,6 @@ void SvtAccessibilityOptions::SetPreviewUsesCheckeredBackground(sal_Bool bSet) sm_pSingleImplConfig->SetPreviewUsesCheckeredBackground(bSet); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index e1de6a70bc77..b99d04b1f2cf 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -42,7 +42,7 @@ #include <vcl/settings.hxx> #include <rtl/instance.hxx> -//----------------------------------------------------------------------------- + using namespace utl; using namespace com::sun::star; @@ -360,7 +360,7 @@ IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent ) return 0L; } -// --------------------------------------------------------------------------- + /** updates the font color in the vcl window settings */ void ColorConfig_Impl::ImplUpdateApplicationSettings() @@ -387,7 +387,7 @@ void ColorConfig_Impl::ImplUpdateApplicationSettings() } } -// --------------------------------------------------------------------------- + ColorConfig::ColorConfig() { @@ -600,17 +600,17 @@ void EditableColorConfig::Commit() m_pImpl->Commit(); m_bModified = sal_False; } -// ----------------------------------------------------------------------------- + void EditableColorConfig::DisableBroadcast() { m_pImpl->BlockBroadcasts(true); } -// ----------------------------------------------------------------------------- + void EditableColorConfig::EnableBroadcast() { m_pImpl->BlockBroadcasts(false); } -// ----------------------------------------------------------------------------- + }//namespace svtools diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index ddded1e761ac..3e14d99b7515 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -40,7 +40,7 @@ #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> -//----------------------------------------------------------------------------- + using namespace utl; using namespace com::sun::star; @@ -147,12 +147,12 @@ uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const OUStri } return aNames; } -// ----------------------------------------------------------------------------- + sal_Int32 ExtendedColorConfig_Impl::GetComponentCount() const { return m_aConfigValues.size(); } -// ----------------------------------------------------------------------------- + sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const OUString& _sName) const { sal_Int32 nSize = 0; @@ -163,7 +163,7 @@ sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const OUString& _sNam } return nSize; } -// ----------------------------------------------------------------------------- + ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { TComponents::const_iterator aFind = m_aConfigValues.find(_sName); @@ -176,7 +176,7 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue( } return ExtendedColorConfigValue(); } -// ----------------------------------------------------------------------------- + OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const OUString& _sComponentName) const { OUString sRet; @@ -185,7 +185,7 @@ OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const OUString& _sCom sRet = aFind->second; return sRet; } -// ----------------------------------------------------------------------------- + OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const { OUString sRet; @@ -219,19 +219,19 @@ ExtendedColorConfig_Impl::~ExtendedColorConfig_Impl() // #100822# ::Application::RemoveEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) ); } -// ----------------------------------------------------------------------------- + void ExtendedColorConfig_Impl::DisableBroadcast() { if ( ExtendedColorConfig::m_pImpl ) ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled = sal_False; } -// ----------------------------------------------------------------------------- + void ExtendedColorConfig_Impl::EnableBroadcast() { if ( ExtendedColorConfig::m_pImpl ) ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled = sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast() { return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False; @@ -244,7 +244,7 @@ void lcl_addString(uno::Sequence < OUString >& _rSeq,const OUString& _sAdd) for(;pIter != pEnd;++pIter) *pIter += _sAdd; } -// ----------------------------------------------------------------------------- + void ExtendedColorConfig_Impl::Load(const OUString& rScheme) { m_aComponentDisplayNames.clear(); @@ -333,7 +333,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme) CommitCurrentSchemeName(); } } -// ----------------------------------------------------------------------------- + void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames) { const OUString sColorEntries("/Entries"); @@ -469,7 +469,7 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName() aCurrentVal.getArray()[0] <<= m_sLoadedScheme; PutProperties(aCurrent, aCurrentVal); } -// ----------------------------------------------------------------------------- + sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const OUString& _sSchemeName) { OUString sBase("ExtendedColorScheme/ColorSchemes"); @@ -558,9 +558,9 @@ IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, return 0L; } -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- + + ExtendedColorConfig::ExtendedColorConfig() { @@ -586,27 +586,27 @@ ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const OUString& _sCo { return m_pImpl->GetColorConfigValue(_sComponentName,_sName); } -// ----------------------------------------------------------------------------- + sal_Int32 ExtendedColorConfig::GetComponentCount() const { return m_pImpl->GetComponentCount(); } -// ----------------------------------------------------------------------------- + sal_Int32 ExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const { return m_pImpl->GetComponentColorCount(_sName); } -// ----------------------------------------------------------------------------- + ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { return m_pImpl->GetComponentColorConfigValue(_sName,_nPos); } -// ----------------------------------------------------------------------------- + OUString ExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const { return m_pImpl->GetComponentName(_nPos); } -// ----------------------------------------------------------------------------- + OUString ExtendedColorConfig::GetComponentDisplayName(const OUString& _sComponentName) const { return m_pImpl->GetComponentDisplayName(_sComponentName); @@ -687,32 +687,32 @@ void EditableExtendedColorConfig::Commit() m_pImpl->Commit(); m_bModified = sal_False; } -// ----------------------------------------------------------------------------- + void EditableExtendedColorConfig::DisableBroadcast() { m_pImpl->DisableBroadcast(); } -// ----------------------------------------------------------------------------- + void EditableExtendedColorConfig::EnableBroadcast() { m_pImpl->EnableBroadcast(); } -// ----------------------------------------------------------------------------- + sal_Int32 EditableExtendedColorConfig::GetComponentCount() const { return m_pImpl->GetComponentCount(); } -// ----------------------------------------------------------------------------- + sal_Int32 EditableExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const { return m_pImpl->GetComponentColorCount(_sName); } -// ----------------------------------------------------------------------------- + ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const { return m_pImpl->GetComponentColorConfigValue(_sName,_nPos); } -// ----------------------------------------------------------------------------- + OUString EditableExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const { return m_pImpl->GetComponentName(_nPos); diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 6ca2548cb6aa..a646c17a4a0f 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -121,7 +121,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() } -// ----------------------------------------------------------------------- + SvtHelpOptions_Impl::SvtHelpOptions_Impl() : ConfigItem( OUString( "Office.Common/Help" ) ) @@ -134,7 +134,7 @@ SvtHelpOptions_Impl::SvtHelpOptions_Impl() EnableNotification( aNames ); } -// ----------------------------------------------------------------------- + static int lcl_MapPropertyName( const OUString rCompare, const uno::Sequence< OUString>& aInternalPropertyNames) { @@ -215,7 +215,7 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames) } } -// ----------------------------------------------------------------------- + void SvtHelpOptions_Impl::Commit() { @@ -251,7 +251,7 @@ void SvtHelpOptions_Impl::Commit() PutProperties( aNames, aValues ); } -// ----------------------------------------------------------------------- + void SvtHelpOptions_Impl::Notify( const Sequence<OUString>& aPropertyNames ) { @@ -272,7 +272,7 @@ SvtHelpOptions::SvtHelpOptions() pImp = pOptions; } -// ----------------------------------------------------------------------- + SvtHelpOptions::~SvtHelpOptions() { @@ -306,7 +306,7 @@ bool SvtHelpOptions::IsHelpTips() const return pImp->IsHelpTips(); } -// ----------------------------------------------------------------------- + void SvtHelpOptions::SetWelcomeScreen( sal_Bool b ) { diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 5fff13455a32..caef175e6d6f 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -28,7 +28,7 @@ #include <rtl/instance.hxx> #include <list> -// ----------------------------------------------------------------------- + #define HTMLCFG_UNKNOWN_TAGS 0x01 //#define HTMLCFG_STYLE_SHEETS 0x02 //#define HTMLCFG_NETSCAPE3 0x04 @@ -100,7 +100,7 @@ const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames() } return aNames; } -// ----------------------------------------------------------------------- + SvxHtmlOptions::SvxHtmlOptions() : ConfigItem("Office.Common/Filter/HTML") { @@ -108,7 +108,7 @@ SvxHtmlOptions::SvxHtmlOptions() : Load( GetPropertyNames() ); } -// ----------------------------------------------------------------------- + SvxHtmlOptions::~SvxHtmlOptions() { delete pImp; @@ -189,7 +189,7 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames ) } } -// ----------------------------------------------------------------------- + void SvxHtmlOptions::Commit() { const Sequence<OUString>& aNames = GetPropertyNames(); @@ -255,14 +255,14 @@ void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) CallListeners(); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxHtmlOptions::GetFontSize(sal_uInt16 nPos) const { if(nPos < HTML_FONT_COUNT) return (sal_uInt16)pImp->aFontSizeArr[nPos]; return 0; } -// ----------------------------------------------------------------------- + void SvxHtmlOptions::SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize) { if(nPos < HTML_FONT_COUNT) @@ -272,9 +272,9 @@ void SvxHtmlOptions::SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize) } } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + sal_Bool SvxHtmlOptions::IsImportUnknown() const @@ -282,7 +282,7 @@ sal_Bool SvxHtmlOptions::IsImportUnknown() const return 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS) ; } -// ----------------------------------------------------------------------- + void SvxHtmlOptions::SetImportUnknown(sal_Bool bSet) @@ -294,7 +294,7 @@ void SvxHtmlOptions::SetImportUnknown(sal_Bool bSet) SetModified(); } -// ----------------------------------------------------------------------- + sal_uInt16 SvxHtmlOptions::GetExportMode() const @@ -302,7 +302,7 @@ sal_uInt16 SvxHtmlOptions::GetExportMode() const return (sal_uInt16)pImp->nExportMode; } -// ----------------------------------------------------------------------- + void SvxHtmlOptions::SetExportMode(sal_uInt16 nSet) @@ -315,7 +315,7 @@ void SvxHtmlOptions::SetExportMode(sal_uInt16 nSet) } } -// ----------------------------------------------------------------------- + sal_Bool SvxHtmlOptions::IsStarBasic() const @@ -323,7 +323,7 @@ sal_Bool SvxHtmlOptions::IsStarBasic() const return 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC) ; } -// ----------------------------------------------------------------------- + void SvxHtmlOptions::SetStarBasic(sal_Bool bSet) diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 856125f4a8d2..78c8778aa5b0 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -38,7 +38,7 @@ #include <tools/debug.hxx> namespace svtools { -//----------------------------------------------- + ItemHolder2::ItemHolder2() : ItemHolderMutexBase() { @@ -73,27 +73,27 @@ ItemHolder2::ItemHolder2() #endif } -//----------------------------------------------- + ItemHolder2::~ItemHolder2() { impl_releaseAllItems(); } -//----------------------------------------------- + void ItemHolder2::holdConfigItem(EItem eItem) { static ItemHolder2* pHolder = new ItemHolder2(); pHolder->impl_addItem(eItem); } -//----------------------------------------------- + void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&) throw(css::uno::RuntimeException) { impl_releaseAllItems(); } -//----------------------------------------------- + void ItemHolder2::impl_addItem(EItem eItem) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -115,7 +115,7 @@ void ItemHolder2::impl_addItem(EItem eItem) m_lItems.push_back(aNewItem); } -//----------------------------------------------- + void ItemHolder2::impl_releaseAllItems() { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -131,7 +131,7 @@ void ItemHolder2::impl_releaseAllItems() m_lItems.clear(); } -//----------------------------------------------- + void ItemHolder2::impl_newItem(TItemInfo& rItem) { switch(rItem.eItem) @@ -178,7 +178,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) } } -//----------------------------------------------- + void ItemHolder2::impl_deleteItem(TItemInfo& rItem) { if (rItem.pItem) diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index baed68e798c1..05c482bc7088 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -31,9 +31,9 @@ #include <list> -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using namespace ::utl ; using namespace ::rtl ; @@ -59,15 +59,15 @@ using namespace ::com::sun::star::uno ; #include <tools/link.hxx> -//_________________________________________________________________________________________________________________ + // private declarations! -//_________________________________________________________________________________________________________________ + class SvtMenuOptions_Impl : public ConfigItem { - //------------------------------------------------------------------------------------------------------------- + // private member - //------------------------------------------------------------------------------------------------------------- + private: ::std::list<Link> aList; @@ -75,15 +75,15 @@ class SvtMenuOptions_Impl : public ConfigItem sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section sal_Int16 m_nMenuIcons ; /// cache "MenuIcons" of Menu section - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------------------------------------------- + // constructor / destructor - //--------------------------------------------------------------------------------------------------------- + SvtMenuOptions_Impl(); ~SvtMenuOptions_Impl(); @@ -91,9 +91,9 @@ class SvtMenuOptions_Impl : public ConfigItem void AddListenerLink( const Link& rLink ); void RemoveListenerLink( const Link& rLink ); - //--------------------------------------------------------------------------------------------------------- + // overloaded methods of baseclass - //--------------------------------------------------------------------------------------------------------- + /*-****************************************************************************************************//** @short called for notify of configmanager @@ -126,9 +126,9 @@ class SvtMenuOptions_Impl : public ConfigItem virtual void Commit(); - //--------------------------------------------------------------------------------------------------------- + // public interface - //--------------------------------------------------------------------------------------------------------- + /*-****************************************************************************************************//** @short access method to get internal values @@ -179,9 +179,9 @@ class SvtMenuOptions_Impl : public ConfigItem Commit(); } - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 7ace27c351a7..dc3c390bc795 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -133,9 +133,9 @@ class SvtMiscOptions_Impl : public ConfigItem virtual void Commit(); - //--------------------------------------------------------------------------------------------------------- + // public interface - //--------------------------------------------------------------------------------------------------------- + inline sal_Bool UseSystemFileDialog() const { return m_bUseSystemFileDialog; } @@ -243,9 +243,9 @@ class SvtMiscOptions_Impl : public ConfigItem void RemoveListenerLink( const Link& rLink ); void CallListeners(); - //------------------------------------------------------------------------------------------------------------- + // private methods - //------------------------------------------------------------------------------------------------------------- + private: diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index e2cfa0edddbb..173bfbf43a40 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -32,9 +32,9 @@ #include <vcl/settings.hxx> #include <rtl/instance.hxx> -//_________________________________________________________________________________________________________________ + // namespaces -//_________________________________________________________________________________________________________________ + using namespace ::utl ; using namespace ::rtl ; @@ -163,23 +163,23 @@ class SvtOptionsDrawinglayer_Impl : public ConfigItem { public: -//--------------------------------------------------------------------------------------------------------- + // constructor / destructor -//--------------------------------------------------------------------------------------------------------- + SvtOptionsDrawinglayer_Impl(); ~SvtOptionsDrawinglayer_Impl(); -//--------------------------------------------------------------------------------------------------------- + // overloaded methods of baseclass -//--------------------------------------------------------------------------------------------------------- + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); -//--------------------------------------------------------------------------------------------------------- + // public interface -//--------------------------------------------------------------------------------------------------------- + sal_Bool IsOverlayBuffer() const; sal_Bool IsPaintBuffer() const; @@ -227,17 +227,17 @@ public: void SetTransparentSelection( sal_Bool bState ); void SetTransparentSelectionPercent( sal_uInt16 nPercent ); -//------------------------------------------------------------------------------------------------------------- + // private methods -//------------------------------------------------------------------------------------------------------------- + private: static Sequence< OUString > impl_GetPropertyNames(); -//------------------------------------------------------------------------------------------------------------- + // private member -//------------------------------------------------------------------------------------------------------------- + private: diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index f75866f38cc5..53fb5ef07cc8 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -100,9 +100,9 @@ public: void SetConvertToGreyscales( sal_Bool bState ) ; void SetPDFAsStandardPrintJobFormat( sal_Bool bState ) ; -//------------------------------------------------------------------------------------------------------------- + // private API -//------------------------------------------------------------------------------------------------------------- + private: void impl_setValue (const OUString& sProp, @@ -110,9 +110,9 @@ private: void impl_setValue (const OUString& sProp, ::sal_Int16 nNew ); -//------------------------------------------------------------------------------------------------------------- + // private member -//------------------------------------------------------------------------------------------------------------- + private: css::uno::Reference< css::container::XNameAccess > m_xCfg; diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index 86ed9a82ec7b..bdac39865c5d 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -18,10 +18,10 @@ */ -//_________________________________________________________________________________________________________________ + // switches // use it to enable test scenarios -//_________________________________________________________________________________________________________________ + #define TEST_DYNAMICMENUOPTIONS @@ -83,15 +83,15 @@ class TestApplication : public Application }; // class TestApplication -//_________________________________________________________________________________________________________________ + // global variables -//_________________________________________________________________________________________________________________ + TestApplication aTestApplication ; -//_________________________________________________________________________________________________________________ + // main -//_________________________________________________________________________________________________________________ + void TestApplication::Main() { diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index c07f55921f0e..5593be346927 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -79,7 +79,7 @@ namespace svt //==================================================================== //= FileViewContentEnumerator //==================================================================== - //-------------------------------------------------------------------- + FileViewContentEnumerator::FileViewContentEnumerator( const Reference< XCommandEnvironment >& _rxCommandEnv, ContentData& _rContentToFill, ::osl::Mutex& _rContentMutex, @@ -94,12 +94,12 @@ namespace svt { } - //-------------------------------------------------------------------- + FileViewContentEnumerator::~FileViewContentEnumerator() { } - //-------------------------------------------------------------------- + void FileViewContentEnumerator::cancel() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -110,7 +110,7 @@ namespace svt m_aFolder.sURL = ""; } - //-------------------------------------------------------------------- + EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync( const FolderDescriptor& _rFolder, const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) @@ -124,7 +124,7 @@ namespace svt return enumerateFolderContent(); } - //-------------------------------------------------------------------- + void FileViewContentEnumerator::enumerateFolderContent( const FolderDescriptor& _rFolder, IEnumerationResultHandler* _pResultHandler ) { @@ -142,7 +142,7 @@ namespace svt // atexit handlers } - //-------------------------------------------------------------------- + EnumerationResult FileViewContentEnumerator::enumerateFolderContent() { EnumerationResult eResult = ERROR; @@ -349,7 +349,7 @@ namespace svt return eResult; } - //-------------------------------------------------------------------- + sal_Bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL ) { @@ -364,7 +364,7 @@ namespace svt return false; } - //-------------------------------------------------------------------- + sal_Bool FileViewContentEnumerator::implGetDocTitle( const OUString& _rTargetURL, OUString& _rRet ) const { sal_Bool bRet = sal_False; @@ -398,7 +398,7 @@ namespace svt return bRet; } - //-------------------------------------------------------------------- + void FileViewContentEnumerator::execute() { enumerateFolderContent(); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 4dc16d761463..9e525f3ad1e5 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -126,7 +126,7 @@ namespace virtual void SAL_CALL onShot(); }; - //-------------------------------------------------------------------- + void SAL_CALL CallbackTimer::onShot() { OSL_ENSURE( m_pTimeoutHandler, "CallbackTimer::onShot: nobody interested in?" ); @@ -137,7 +137,7 @@ namespace } -// ----------------------------------------------------------------------- + void FilterMatch::createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters) { @@ -627,9 +627,9 @@ OUString CreateExactSizeText( sal_Int64 nSize ) return aSizeStr; } -// ----------------------------------------------------------------------- + // class ViewTabListBox_Impl --------------------------------------------- -// ----------------------------------------------------------------------- + ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, SvtFileView_Impl* pParent, @@ -698,7 +698,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, EnableContextMenuHandling(); } -// ----------------------------------------------------------------------- + ViewTabListBox_Impl::~ViewTabListBox_Impl() { @@ -707,7 +707,7 @@ ViewTabListBox_Impl::~ViewTabListBox_Impl() delete mpHeaderBar; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl) { @@ -719,7 +719,7 @@ IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl) return 0; } -// ----------------------------------------------------------------------- + void ViewTabListBox_Impl::Resize() { @@ -746,7 +746,7 @@ void ViewTabListBox_Impl::Resize() } } -// ----------------------------------------------------------------------- + void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) { @@ -783,7 +783,7 @@ void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) } } -// ----------------------------------------------------------------------- + PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void ) { @@ -873,7 +873,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void ) return NULL; } -// ----------------------------------------------------------------------- + void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { @@ -889,7 +889,7 @@ void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEn } } -// ----------------------------------------------------------------------- + void ViewTabListBox_Impl::ClearAll() { @@ -898,7 +898,7 @@ void ViewTabListBox_Impl::ClearAll() Clear(); } -// ----------------------------------------------------------------------- + void ViewTabListBox_Impl::DeleteEntries() { short eResult = svtools::QUERYDELETE_YES; @@ -965,7 +965,7 @@ void ViewTabListBox_Impl::DeleteEntries() } } -// ----------------------------------------------------------------------- + sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { @@ -1024,7 +1024,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, return bRet; } -// ----------------------------------------------------------------------- + void ViewTabListBox_Impl::DoQuickSearch( const sal_Unicode& rChar ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1061,7 +1061,7 @@ void ViewTabListBox_Impl::DoQuickSearch( const sal_Unicode& rChar ) maResetQuickSearch.Start(); } -// ----------------------------------------------------------------------- + sal_Bool ViewTabListBox_Impl::DoubleClickHdl() { SvHeaderTabListBox::DoubleClickHdl(); @@ -1103,7 +1103,7 @@ OUString ViewTabListBox_Impl::GetAccessibleObjectDescription( ::svt::AccessibleB return sRet; } -// ----------------------------------------------------------------------- + sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent ) { sal_Bool bRet = sal_True; @@ -1130,9 +1130,9 @@ sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent ) -// ----------------------------------------------------------------------- + // class SvtFileView ----------------------------------------------------- -// ----------------------------------------------------------------------- + SvtFileView::SvtFileView( Window* pParent, const ResId& rResId, sal_Bool bOnlyFolder, sal_Bool bMultiSelection ) : @@ -1177,7 +1177,7 @@ SvtFileView::SvtFileView( Window* pParent, const ResId& rResId, sal_uInt8 nFlags pHeaderBar->SetEndDragHdl( LINK( this, SvtFileView, HeaderEndDrag_Impl ) ); } -// ----------------------------------------------------------------------- + SvtFileView::~SvtFileView() { @@ -1187,7 +1187,7 @@ SvtFileView::~SvtFileView() delete pTemp; } -// ----------------------------------------------------------------------- + OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) const { @@ -1197,7 +1197,7 @@ OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) const return aURL; } -// ----------------------------------------------------------------------- + OUString SvtFileView::GetCurrentURL() const { @@ -1207,7 +1207,7 @@ OUString SvtFileView::GetCurrentURL() const aURL = ( (SvtContentEntry*)pEntry->GetUserData() )->maURL; return aURL; } -// ----------------------------------------------------------------------------- + void SvtFileView::CreatedFolder( const OUString& rUrl, const OUString& rNewFolder ) { @@ -1218,7 +1218,7 @@ void SvtFileView::CreatedFolder( const OUString& rUrl, const OUString& rNewFolde mpImp->mpView->MakeVisible( pEntry ); } -// ----------------------------------------------------------------------- + FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDescriptor ) { @@ -1231,7 +1231,7 @@ FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDesc return eResult; } -// ----------------------------------------------------------------------- + sal_Bool SvtFileView::GetParentURL( OUString& rParentURL ) const { @@ -1259,21 +1259,21 @@ sal_Bool SvtFileView::GetParentURL( OUString& rParentURL ) const return bRet; } -// ----------------------------------------------------------------------- + const OString& SvtFileView::GetHelpId( ) const { return mpImp->mpView->GetHelpId( ); } -// ----------------------------------------------------------------------- + void SvtFileView::SetHelpId( const OString& rHelpId ) { mpImp->mpView->SetHelpId( rHelpId ); } -// ----------------------------------------------------------------------- + void SvtFileView::SetSizePixel( const Size& rNewSize ) { @@ -1281,7 +1281,7 @@ void SvtFileView::SetSizePixel( const Size& rNewSize ) mpImp->mpView->SetSizePixel( rNewSize ); } -// ----------------------------------------------------------------------- + void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { @@ -1289,7 +1289,7 @@ void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SetSizePixel( rNewSize ); } -// ----------------------------------------------------------------------------- + sal_Bool SvtFileView::Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, const OUString& rFilter ) { WaitObject aWaitCursor( this ); @@ -1311,7 +1311,7 @@ sal_Bool SvtFileView::Initialize( const ::com::sun::star::uno::Reference< ::com: return sal_True; } -// ----------------------------------------------------------------------- + FileViewResult SvtFileView::Initialize( const OUString& rURL, const OUString& rFilter, @@ -1342,7 +1342,7 @@ FileViewResult SvtFileView::Initialize( return eFailure; } -// ----------------------------------------------------------------------- + FileViewResult SvtFileView::Initialize( const OUString& rURL, const OUString& rFilter, @@ -1351,9 +1351,9 @@ FileViewResult SvtFileView::Initialize( return Initialize( rURL, rFilter, pAsyncDescriptor, ::com::sun::star::uno::Sequence< OUString >()); } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + sal_Bool SvtFileView::Initialize( const Sequence< OUString >& aContents ) { WaitObject aWaitCursor( this ); @@ -1373,7 +1373,7 @@ sal_Bool SvtFileView::Initialize( const Sequence< OUString >& aContents ) return sal_True; } -// ----------------------------------------------------------------------- + FileViewResult SvtFileView::ExecuteFilter( const OUString& rFilter, const FileViewAsyncAction* pAsyncDescriptor ) { @@ -1385,21 +1385,21 @@ FileViewResult SvtFileView::ExecuteFilter( const OUString& rFilter, const FileVi return eResult; } -// ----------------------------------------------------------------------- + void SvtFileView::CancelRunningAsyncAction() { mpImp->CancelRunningAsyncAction(); } -// ----------------------------------------------------------------------- + void SvtFileView::SetNoSelection() { mpImp->mpView->SelectAll( sal_False ); } -// ----------------------------------------------------------------------- + void SvtFileView::GetFocus() { @@ -1408,74 +1408,74 @@ void SvtFileView::GetFocus() mpImp->mpView->GrabFocus(); } -// ----------------------------------------------------------------------- + void SvtFileView::SetSelectHdl( const Link& rHdl ) { mpImp->SetSelectHandler( rHdl ); } -// ----------------------------------------------------------------------- + void SvtFileView::SetDoubleClickHdl( const Link& rHdl ) { mpImp->mpView->SetDoubleClickHdl( rHdl ); } -// ----------------------------------------------------------------------- + sal_uLong SvtFileView::GetSelectionCount() const { return mpImp->mpView->GetSelectionCount(); } -// ----------------------------------------------------------------------- + SvTreeListEntry* SvtFileView::FirstSelected() const { return mpImp->mpView->FirstSelected(); } -// ----------------------------------------------------------------------- + SvTreeListEntry* SvtFileView::NextSelected( SvTreeListEntry* pEntry ) const { return mpImp->mpView->NextSelected( pEntry ); } -// ----------------------------------------------------------------------- + void SvtFileView::EnableAutoResize() { mpImp->mpView->EnableAutoResize(); } -// ----------------------------------------------------------------------- + void SvtFileView::SetFocus() { mpImp->mpView->GrabFocus(); } -// ----------------------------------------------------------------------- + const OUString& SvtFileView::GetViewURL() const { return mpImp->maViewURL; } -// ----------------------------------------------------------------------- + void SvtFileView::SetOpenDoneHdl( const Link& rHdl ) { mpImp->maOpenDoneLink = rHdl; } -// ----------------------------------------------------------------------- + void SvtFileView::EnableContextMenu( sal_Bool bEnable ) { mpImp->EnableContextMenu( bEnable ); } -// ----------------------------------------------------------------------- + void SvtFileView::EnableDelete( sal_Bool bEnable ) { mpImp->EnableDelete( bEnable ); @@ -1486,13 +1486,13 @@ void SvtFileView::EnableNameReplacing( sal_Bool bEnable ) mpImp->EnableNameReplacing( bEnable ); } -// ----------------------------------------------------------------------- + void SvtFileView::EndInplaceEditing( bool _bCancel ) { return mpImp->EndEditing( _bCancel ); } -// ----------------------------------------------------------------------- + IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar ) { DBG_ASSERT( pBar, "no headerbar" ); @@ -1535,7 +1535,7 @@ IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar ) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar ) { if ( !pBar->IsItemMode() ) @@ -1556,7 +1556,7 @@ IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar ) return 0; } -// ----------------------------------------------------------------------- + OUString SvtFileView::GetConfigString() const { OUString sRet; @@ -1585,7 +1585,7 @@ OUString SvtFileView::GetConfigString() const return sRet; } -// ----------------------------------------------------------------------- + void SvtFileView::SetConfigString( const OUString& rCfgStr ) { HeaderBar* pBar = mpImp->mpView->GetHeaderBar(); @@ -1618,7 +1618,7 @@ void SvtFileView::SetConfigString( const OUString& rCfgStr ) HeaderEndDrag_Impl( pBar ); } -// ----------------------------------------------------------------------- + void SvtFileView::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == STATE_CHANGE_ENABLE ) @@ -1626,9 +1626,9 @@ void SvtFileView::StateChanged( StateChangedType nStateChange ) Control::StateChanged( nStateChange ); } -// ----------------------------------------------------------------------- + // class NameTranslator_Impl -// ----------------------------------------------------------------------- + NameTranslator_Impl::NameTranslator_Impl( const INetURLObject& rActualFolder ) { @@ -1679,9 +1679,9 @@ const OUString* NameTranslator_Impl::GetTransTableFileName() const return mpActFolder? &mpActFolder->GetTransTableFileName() : NULL; } -// ----------------------------------------------------------------------- + // class SvtFileView_Impl -// ----------------------------------------------------------------------- + SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommandEnvironment > xEnv, sal_Int16 nFlags, sal_Bool bOnlyFolder ) @@ -1706,7 +1706,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand mpView->EnableCellFocus(); } -// ----------------------------------------------------------------------- + SvtFileView_Impl::~SvtFileView_Impl() { Clear(); @@ -1717,7 +1717,7 @@ SvtFileView_Impl::~SvtFileView_Impl() delete pTemp; } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::Clear() { ::osl::MutexGuard aGuard( maMutex ); @@ -1733,7 +1733,7 @@ void SvtFileView_Impl::Clear() DELETEZ( mpNameTrans ); } -// ----------------------------------------------------------------------- + FileViewResult SvtFileView_Impl::GetFolderContent_Impl( const OUString& rFolder, const FileViewAsyncAction* pAsyncDescriptor, @@ -1752,7 +1752,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rBlackList ); } -// ----------------------------------------------------------------------- + FileViewResult SvtFileView_Impl::GetFolderContent_Impl( const FolderDescriptor& _rFolder, const FileViewAsyncAction* pAsyncDescriptor, @@ -1853,7 +1853,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( return eFailure; } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter ) { sal_Bool bHideTransFile = mbReplaceNames && mpNameTrans; @@ -1948,13 +1948,13 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter ) while ( aContentLoop != maContent.end() ); } -// ----------------------------------------------------------------------- + IMPL_LINK( SvtFileView_Impl, SelectionMultiplexer, void*, _pSource ) { return mnSuspendSelectCallback ? 0L : m_aSelectHandler.Call( _pSource ); } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::SetSelectHandler( const Link& _rHdl ) { m_aSelectHandler = _rHdl; @@ -1966,7 +1966,7 @@ void SvtFileView_Impl::SetSelectHandler( const Link& _rHdl ) mpView->SetSelectHdl( aMasterHandler ); } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::InitSelection() { mpView->SelectAll( sal_False ); @@ -1975,7 +1975,7 @@ void SvtFileView_Impl::InitSelection() mpView->SetCursor( pFirst, sal_True ); } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::OpenFolder_Impl() { ::osl::MutexGuard aGuard( maMutex ); @@ -2009,7 +2009,7 @@ void SvtFileView_Impl::OpenFolder_Impl() ResetCursor(); } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::ResetCursor() { // deselect @@ -2021,7 +2021,7 @@ void SvtFileView_Impl::ResetCursor() mpView->Update(); } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::CancelRunningAsyncAction() { DBG_TESTSOLARMUTEX(); @@ -2039,7 +2039,7 @@ void SvtFileView_Impl::CancelRunningAsyncAction() m_pCancelAsyncTimer = NULL; } -//----------------------------------------------------------------------- + void SvtFileView_Impl::onTimeout( CallbackTimer* ) { SolarMutexGuard aSolarGuard; @@ -2057,7 +2057,7 @@ void SvtFileView_Impl::onTimeout( CallbackTimer* ) } } -//----------------------------------------------------------------------- + void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult eResult ) { SolarMutexGuard aSolarGuard; @@ -2087,7 +2087,7 @@ void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult eResult ) } } -//----------------------------------------------------------------------- + void SvtFileView_Impl::implEnumerationSuccess() { FilterFolderContent_Impl( maCurrentFilter ); @@ -2097,7 +2097,7 @@ void SvtFileView_Impl::implEnumerationSuccess() maOpenDoneLink.Call( mpAntiImpl ); } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::ReplaceTabWithString( OUString& aValue ) { OUString aTab( "\t" ); @@ -2108,7 +2108,7 @@ void SvtFileView_Impl::ReplaceTabWithString( OUString& aValue ) aValue = aValue.replaceAt( iPos, 1, aTabString ); } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::CreateDisplayText_Impl() { ::osl::MutexGuard aGuard( maMutex ); @@ -2156,7 +2156,7 @@ void SvtFileView_Impl::CreateDisplayText_Impl() } } -// ----------------------------------------------------------------------- + // this function converts the sequence of strings into a vector of SortingData // the string should have the form : // title \t type \t size \t date \t target url \t is folder \t image url @@ -2244,7 +2244,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList ) } } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::Resort_Impl( sal_Int16 nColumn, sal_Bool bAscending ) { ::osl::MutexGuard aGuard( maMutex ); @@ -2283,7 +2283,7 @@ void SvtFileView_Impl::Resort_Impl( sal_Int16 nColumn, sal_Bool bAscending ) mbIsFirstResort = sal_False; } -// ----------------------------------------------------------------------- + static sal_Bool gbAscending = sal_True; static sal_Int16 gnColumn = COLUMN_TITLE; static const CollatorWrapper* pCollatorWrapper = NULL; @@ -2366,7 +2366,7 @@ sal_Bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl return gbAscending ? bRet : !bRet; } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::SortFolderContent_Impl() { ::osl::MutexGuard aGuard( maMutex ); @@ -2385,7 +2385,7 @@ void SvtFileView_Impl::SortFolderContent_Impl() } } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::EntryRemoved( const OUString& rURL ) { ::osl::MutexGuard aGuard( maMutex ); @@ -2402,7 +2402,7 @@ void SvtFileView_Impl::EntryRemoved( const OUString& rURL ) } } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::EntryRenamed( OUString& rURL, const OUString& rTitle ) { @@ -2432,7 +2432,7 @@ void SvtFileView_Impl::EntryRenamed( OUString& rURL, } } -// ----------------------------------------------------------------------- + OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& rTitle ) { ::osl::MutexGuard aGuard( maMutex ); @@ -2473,7 +2473,7 @@ OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& return aValue; } -// ----------------------------------------------------------------------- + sal_uLong SvtFileView_Impl::GetEntryPos( const OUString& rURL ) { ::osl::MutexGuard aGuard( maMutex ); @@ -2491,7 +2491,7 @@ sal_uLong SvtFileView_Impl::GetEntryPos( const OUString& rURL ) return nPos; } -// ----------------------------------------------------------------------- + sal_Bool SvtFileView_Impl::SearchNextEntry( sal_uInt32& nIndex, const OUString& rTitle, sal_Bool bWrapAround ) { ::osl::MutexGuard aGuard( maMutex ); @@ -2521,7 +2521,7 @@ sal_Bool SvtFileView_Impl::SearchNextEntry( sal_uInt32& nIndex, const OUString& return sal_False; } -// ----------------------------------------------------------------------- + void SvtFileView_Impl::SetActualFolder( const INetURLObject& rActualFolder ) { if( mbReplaceNames ) diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 442141f1c3eb..4cf327205957 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -54,7 +54,7 @@ OUString SvxIconChoiceCtrlEntry::GetDisplayText() const return MnemonicGenerator::EraseAllMnemonicChars( aText ); } -// ---------------------------------------------------------------------------- + SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& rInfo ) : aColText( rInfo.aColText ), aColImage( rInfo.aColImage ) diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index ff8b5944277a..a0f54c0beb0f 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -3395,7 +3395,7 @@ void SvImpLBox::ShowFocusRect( const SvTreeListEntry* pEntry ) } } -// ----------------------------------------------------------------------- + void SvImpLBox::implInitDefaultNodeImages() { if ( s_pDefCollapsed ) @@ -3406,28 +3406,28 @@ void SvImpLBox::implInitDefaultNodeImages() s_pDefExpanded = new Image( SvtResId( RID_IMG_TREENODE_EXPANDED ) ); } -// ----------------------------------------------------------------------- + const Image& SvImpLBox::GetDefaultExpandedNodeImage( ) { implInitDefaultNodeImages(); return *s_pDefExpanded; } -// ----------------------------------------------------------------------- + const Image& SvImpLBox::GetDefaultCollapsedNodeImage( ) { implInitDefaultNodeImages(); return *s_pDefCollapsed; } -// ----------------------------------------------------------------------- + void SvImpLBox::CallEventListeners( sal_uLong nEvent, void* pData ) { if ( pView ) pView->CallImplEventListeners( nEvent, pData); } -// ----------------------------------------------------------------------- + bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos ) { @@ -3443,7 +3443,7 @@ bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos ) return bRet; } -// ----------------------------------------------------------------------- + bool SvImpLBox::IsSelectable( const SvTreeListEntry* pEntry ) { diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index feee0a46975f..5fc3f2724f81 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -526,14 +526,14 @@ SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, WinBits nWinStyle ) : { } -// ----------------------------------------------------------------------- + SvHeaderTabListBox::~SvHeaderTabListBox() { delete m_pImpl; } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::Paint( const Rectangle& rRect ) { @@ -545,7 +545,7 @@ void SvHeaderTabListBox::Paint( const Rectangle& rRect ) SvTabListBox::Paint( rRect ); } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar ) { @@ -556,7 +556,7 @@ void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar ) m_pImpl->m_pHeaderBar->SetCreateAccessibleHdl( LINK( this, SvHeaderTabListBox, CreateAccessibleHdl_Impl ) ); } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const { @@ -572,7 +572,7 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 return ( eState == SV_BUTTON_CHECKED ); } -// ----------------------------------------------------------------------- + SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( const OUString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) @@ -582,7 +582,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( return pEntry; } -// ----------------------------------------------------------------------- + SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( const OUString& rStr, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) @@ -592,7 +592,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( return pEntry; } -// ----------------------------------------------------------------------- + SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( const OUString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, @@ -604,7 +604,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn( return pEntry; } -// ----------------------------------------------------------------------- + sal_uLong SvHeaderTabListBox::Insert( SvTreeListEntry* pEnt, SvTreeListEntry* pPar, sal_uLong nPos ) @@ -614,7 +614,7 @@ sal_uLong SvHeaderTabListBox::Insert( return n; } -// ----------------------------------------------------------------------- + sal_uLong SvHeaderTabListBox::Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos ) { @@ -623,7 +623,7 @@ sal_uLong SvHeaderTabListBox::Insert( SvTreeListEntry* pEntry, sal_uLong nRootPo return nPos; } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::RemoveEntry( SvTreeListEntry* _pEntry ) { @@ -631,7 +631,7 @@ void SvHeaderTabListBox::RemoveEntry( SvTreeListEntry* _pEntry ) m_aAccessibleChildren.clear(); } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::Clear() { @@ -639,7 +639,7 @@ void SvHeaderTabListBox::Clear() m_aAccessibleChildren.clear(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl) { @@ -647,7 +647,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) { @@ -666,7 +666,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::RecalculateAccessibleChildren() { @@ -682,7 +682,7 @@ void SvHeaderTabListBox::RecalculateAccessibleChildren() } } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ) { @@ -709,17 +709,17 @@ sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, Tr return bRet; } -// ----------------------------------------------------------------------- + long SvHeaderTabListBox::GetRowCount() const { return GetEntryCount(); } -// ----------------------------------------------------------------------- + sal_uInt16 SvHeaderTabListBox::GetColumnCount() const { return m_pImpl->m_pHeaderBar->GetItemCount(); } -// ----------------------------------------------------------------------- + sal_Int32 SvHeaderTabListBox::GetCurrRow() const { sal_Int32 nRet = -1; @@ -739,33 +739,33 @@ sal_Int32 SvHeaderTabListBox::GetCurrRow() const return nRet; } -// ----------------------------------------------------------------------- + sal_uInt16 SvHeaderTabListBox::GetCurrColumn() const { sal_uInt16 nPos = GetCurrentTabPos() - 1; return nPos; } -// ----------------------------------------------------------------------- + OUString SvHeaderTabListBox::GetRowDescription( sal_Int32 _nRow ) const { return OUString( GetEntryText( _nRow ) ); } -// ----------------------------------------------------------------------- + OUString SvHeaderTabListBox::GetColumnDescription( sal_uInt16 _nColumn ) const { return OUString( m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ) ); } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::HasRowHeader() const { return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::IsCellFocusable() const { return IsCellFocusEnabled(); } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) { sal_Bool bRet = ( IsCellFocusEnabled() == sal_True ); @@ -778,72 +778,72 @@ sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) } return bRet; } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::SetNoSelection() { SvTreeListBox::SelectAll(false); } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::SelectAll() { SvTreeListBox::SelectAll(true); } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::SelectAll( sal_Bool bSelect, sal_Bool bPaint ) { // overwritten just to disambiguate the SelectAll() from the base' class SelectAll( BOOl, sal_Bool ) SvTabListBox::SelectAll( bSelect, bPaint ); } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::SelectRow( long _nRow, sal_Bool _bSelect, sal_Bool ) { Select( GetEntry( _nRow ), _bSelect ); } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::SelectColumn( sal_uInt16, sal_Bool ) { } -// ----------------------------------------------------------------------- + sal_Int32 SvHeaderTabListBox::GetSelectedRowCount() const { return GetSelectionCount(); } -// ----------------------------------------------------------------------- + sal_Int32 SvHeaderTabListBox::GetSelectedColumnCount() const { return 0; } -// ----------------------------------------------------------------------- + bool SvHeaderTabListBox::IsRowSelected( long _nRow ) const { SvTreeListEntry* pEntry = GetEntry( _nRow ); return ( pEntry && IsSelected( pEntry ) ); } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::IsColumnSelected( long ) const { return sal_False; } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& ) const { } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& ) const { } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const { return sal_True; } -// ----------------------------------------------------------------------- + OUString SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const { return GetTabEntryText(_nRow, _nColumnPos); } -// ----------------------------------------------------------------------- + Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen ) { Rectangle aRect; @@ -857,7 +857,7 @@ Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _ } return aRect; } -// ----------------------------------------------------------------------- + Rectangle SvHeaderTabListBox::calcTableRect( sal_Bool _bOnScreen ) { Window* pParent = NULL; @@ -867,7 +867,7 @@ Rectangle SvHeaderTabListBox::calcTableRect( sal_Bool _bOnScreen ) Rectangle aRect( GetWindowExtentsRelative( pParent ) ); return aRect; } -// ----------------------------------------------------------------------- + Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_Bool _bIsHeader, sal_Bool _bOnScreen ) { DBG_ASSERT( !_bIsHeader || 0 == _nRow, "invalid parameters" ); @@ -892,7 +892,7 @@ Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 return aRect; } -// ----------------------------------------------------------------------- + Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { OSL_ENSURE( m_pAccessible, "Invalid call: Accessible is null" ); @@ -933,13 +933,13 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR return xChild; } -// ----------------------------------------------------------------------- + Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleRowHeader( sal_Int32 ) { Reference< XAccessible > xHeader; return xHeader; } -// ----------------------------------------------------------------------- + Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_uInt16 _nColumn ) { // first call? -> initial list @@ -968,38 +968,38 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u return xChild; } -// ----------------------------------------------------------------------- + sal_Int32 SvHeaderTabListBox::GetAccessibleControlCount() const { return -1; } -// ----------------------------------------------------------------------- + Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleControl( sal_Int32 ) { Reference< XAccessible > xControl; return xControl; } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::ConvertPointToControlIndex( sal_Int32&, const Point& ) { return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::ConvertPointToCellAddress( sal_Int32&, sal_uInt16&, const Point& ) { return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::ConvertPointToRowHeader( sal_Int32&, const Point& ) { return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Point& ) { return sal_False; } -// ----------------------------------------------------------------------- + OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const { OUString aRetText; @@ -1047,7 +1047,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBox } return aRetText; } -// ----------------------------------------------------------------------- + OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const { OUString aRetText; @@ -1075,7 +1075,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBr return aRetText; } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const { switch( _eType ) @@ -1131,7 +1131,7 @@ void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper break; } } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const { _rStateSet.AddState( AccessibleStateType::SELECTABLE ); @@ -1152,42 +1152,42 @@ void SvHeaderTabListBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSe if ( IsEnabled() ) _rStateSet.AddState( AccessibleStateType::ENABLED ); } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::GrabTableFocus() { GrabFocus(); } -// ----------------------------------------------------------------------- + sal_Bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) { return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector ); } -// ----------------------------------------------------------------------- + Rectangle SvHeaderTabListBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } -// ----------------------------------------------------------------------- + void SvHeaderTabListBox::GrabFocus() { Control::GrabFocus(); } -// ----------------------------------------------------------------------- + Reference< XAccessible > SvHeaderTabListBox::GetAccessible( sal_Bool bCreate ) { return Control::GetAccessible( bCreate ); } -// ----------------------------------------------------------------------- + Window* SvHeaderTabListBox::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } -// ----------------------------------------------------------------------- + Window* SvHeaderTabListBox::GetWindowInstance() { return this; } -// ----------------------------------------------------------------------- + Reference< XAccessible > SvHeaderTabListBox::CreateAccessible() { Window* pParent = GetAccessibleParentWindow(); @@ -1208,13 +1208,13 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessible() } return xAccessible; } -// ----------------------------------------------------------------------------- + Rectangle SvHeaderTabListBox::GetFieldCharacterBounds(sal_Int32,sal_Int32,sal_Int32) { Rectangle aRect; return aRect; } -// ----------------------------------------------------------------------------- + sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) { OUString sText = GetAccessibleCellText( _nRow, static_cast< sal_uInt16 >( _nColumnPos ) ); @@ -1230,7 +1230,7 @@ sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nC return -1; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 7fda4016df9f..9349a3fce4e8 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -572,7 +572,7 @@ SvtDocInfoTable_Impl::SvtDocInfoTable_Impl() : { } -// ----------------------------------------------------------------------- + OUString SvtDocInfoTable_Impl::GetString( long nId ) const { @@ -837,7 +837,7 @@ SvtTemplateWindow::SvtTemplateWindow( Window* pParent ) : Application::PostUserEvent( LINK( this, SvtTemplateWindow, ResizeHdl_Impl ) ); } -// ------------------------------------------------------------------------ + SvtTemplateWindow::~SvtTemplateWindow() { @@ -855,7 +855,7 @@ SvtTemplateWindow::~SvtTemplateWindow() } } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtTemplateWindow , IconClickHdl_Impl) { @@ -871,7 +871,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , IconClickHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtTemplateWindow , FileSelectHdl_Impl) { @@ -879,7 +879,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , FileSelectHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtTemplateWindow , FileDblClickHdl_Impl) { @@ -898,7 +898,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , FileDblClickHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtTemplateWindow , NewFolderHdl_Impl) { @@ -913,7 +913,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , NewFolderHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtTemplateWindow , TimeoutHdl_Impl) { @@ -935,7 +935,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , TimeoutHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK ( SvtTemplateWindow , ClickHdl_Impl, ToolBox *, pToolBox ) { @@ -943,7 +943,7 @@ IMPL_LINK ( SvtTemplateWindow , ClickHdl_Impl, ToolBox *, pToolBox ) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtTemplateWindow , ResizeHdl_Impl) { @@ -951,7 +951,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , ResizeHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::PrintFile( const OUString& rURL ) { @@ -974,7 +974,7 @@ void SvtTemplateWindow::PrintFile( const OUString& rURL ) } } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::AppendHistoryURL( const OUString& rURL, sal_uLong nGroup ) { @@ -995,7 +995,7 @@ void SvtTemplateWindow::AppendHistoryURL( const OUString& rURL, sal_uLong nGroup } } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::OpenHistory() { @@ -1009,7 +1009,7 @@ void SvtTemplateWindow::OpenHistory() delete pEntry; } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::DoAction( sal_uInt16 nAction ) { @@ -1047,7 +1047,7 @@ void SvtTemplateWindow::DoAction( sal_uInt16 nAction ) } } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::InitToolBoxes() { @@ -1076,7 +1076,7 @@ void SvtTemplateWindow::InitToolBoxes() aFrameWinTB.SetClickHdl( aLink ); } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::InitToolBoxImages() { @@ -1101,14 +1101,14 @@ void SvtTemplateWindow::InitToolBoxImages() : IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL ) ) ); } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::UpdateIcons() { pIconWin->UpdateIcons(); } -// ------------------------------------------------------------------------ + bool SvtTemplateWindow::PreNotify( NotifyEvent& rNEvt ) { @@ -1134,7 +1134,7 @@ bool SvtTemplateWindow::PreNotify( NotifyEvent& rNEvt ) return nRet || Window::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------------- + void SvtTemplateWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1152,7 +1152,7 @@ void SvtTemplateWindow::DataChanged( const DataChangedEvent& rDCEvt ) InitToolBoxImages(); } } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::Resize() { @@ -1184,14 +1184,14 @@ void SvtTemplateWindow::Resize() aSplitWin.SetPosSizePixel( Point( 0, nToolBoxHeight ), aSize ); } -// ------------------------------------------------------------------------ + OUString SvtTemplateWindow::GetSelectedFile() const { return pFileWin->GetSelectedFile(); } -// ------------------------------------------------------------------------ + sal_Bool SvtTemplateWindow::IsFileSelected() const { @@ -1200,7 +1200,7 @@ sal_Bool SvtTemplateWindow::IsFileSelected() const return bRet; } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::OpenFile( sal_Bool bNotAsTemplate ) { @@ -1209,7 +1209,7 @@ void SvtTemplateWindow::OpenFile( sal_Bool bNotAsTemplate ) pFrameWin->OpenFile( aURL, sal_False, pFileWin->IsTemplateFolder(), !bNotAsTemplate ); } -// ------------------------------------------------------------------------ + OUString SvtTemplateWindow::GetFolderTitle() const { @@ -1222,7 +1222,7 @@ OUString SvtTemplateWindow::GetFolderTitle() const return sTitle; } -// ------------------------------------------------------------------------ + OUString SvtTemplateWindow::GetFolderURL() const { @@ -1230,7 +1230,7 @@ OUString SvtTemplateWindow::GetFolderURL() const } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::SetFocus( sal_Bool bIconWin ) { @@ -1240,14 +1240,14 @@ void SvtTemplateWindow::SetFocus( sal_Bool bIconWin ) pFileWin->SetFocus(); } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::OpenTemplateRoot() { pFileWin->OpenFolder( pIconWin->GetTemplateRootURL() ); } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::SetPrevLevelButtonState( const OUString& rURL ) { @@ -1261,7 +1261,7 @@ void SvtTemplateWindow::SetPrevLevelButtonState( const OUString& rURL ) aFileViewTB.EnableItem( TI_DOCTEMPLATE_PREV, bEnable ); } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::ClearHistory() { @@ -1273,7 +1273,7 @@ void SvtTemplateWindow::ClearHistory() } } -// ------------------------------------------------------------------------ + long SvtTemplateWindow::CalcHeight() const { @@ -1286,7 +1286,7 @@ long SvtTemplateWindow::CalcHeight() const return nHeight; } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::ReadViewSettings() { @@ -1339,7 +1339,7 @@ void SvtTemplateWindow::ReadViewSettings() IconClickHdl_Impl( NULL ); } -// ------------------------------------------------------------------------ + void SvtTemplateWindow::WriteViewSettings() { @@ -1408,7 +1408,7 @@ SvtDocumentTemplateDialog::SvtDocumentTemplateDialog( Window* pParent ) : InitImpl( ); } -// ------------------------------------------------------------------------ + void SvtDocumentTemplateDialog::InitImpl( ) { @@ -1501,14 +1501,14 @@ void SvtDocumentTemplateDialog::InitImpl( ) UpdateHdl_Impl( NULL ); } -// ------------------------------------------------------------------------ + SvtDocumentTemplateDialog::~SvtDocumentTemplateDialog() { delete pImpl; } -// ------------------------------------------------------------------------ + sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const { @@ -1524,7 +1524,7 @@ sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const return bEnable; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SelectHdl_Impl) { @@ -1533,7 +1533,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SelectHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtDocumentTemplateDialog , DoubleClickHdl_Impl) { @@ -1544,7 +1544,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , DoubleClickHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtDocumentTemplateDialog , NewFolderHdl_Impl) { @@ -1557,7 +1557,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , NewFolderHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SendFocusHdl_Impl) { @@ -1576,7 +1576,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SendFocusHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK ( SvtDocumentTemplateDialog , OKHdl_Impl, PushButton *, pBtn ) { @@ -1590,7 +1590,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , OKHdl_Impl, PushButton *, pBtn ) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtDocumentTemplateDialog , OrganizerHdl_Impl) { @@ -1645,7 +1645,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog, PackageHdl_Impl) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource ) { @@ -1680,7 +1680,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource ) return 0; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl) { diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index a222fb42dfc6..32c5bd810ed2 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -24,7 +24,7 @@ #include <vcl/timer.hxx> #include <vcl/svapp.hxx> -//-------------------------------------------------------------------- + namespace svtools { void AsynchronLink::CreateMutex() diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index f9589b89bd4c..4f464caabe88 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -72,7 +72,7 @@ static void ImplCalendarSelectDate( IntDateSet* pTable, const Date& rDate, sal_B pTable->erase( rDate.GetDate() ); } -// ----------------------------------------------------------------------- + static void ImplCalendarSelectDateRange( IntDateSet* pTable, const Date& rStartDate, @@ -112,7 +112,7 @@ static void ImplCalendarSelectDateRange( IntDateSet* pTable, } } -// ----------------------------------------------------------------------- + static void ImplCalendarUnSelectDateRange( IntDateSet* pTable, IntDateSet* pOldTable, @@ -150,7 +150,7 @@ static void ImplCalendarUnSelectDateRange( IntDateSet* pTable, } } -// ----------------------------------------------------------------------- + inline void ImplCalendarClearSelectDate( IntDateSet* pTable ) { @@ -225,7 +225,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) ImplInitSettings(); } -// ----------------------------------------------------------------------- + void Calendar::ImplInitSettings() { @@ -236,7 +236,7 @@ void Calendar::ImplInitSettings() SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) ); } -// ----------------------------------------------------------------------- + Calendar::Calendar( Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle & (WB_TABSTOP | WB_GROUP | WB_BORDER | WB_3DLOOK | WB_RANGESELECT | WB_MULTISELECT) ), @@ -253,7 +253,7 @@ Calendar::Calendar( Window* pParent, WinBits nWinStyle ) : ImplInit( nWinStyle ); } -// ----------------------------------------------------------------------- + Calendar::~Calendar() { @@ -266,7 +266,7 @@ Calendar::~Calendar() delete mpRestoreSelectTable; } -// ----------------------------------------------------------------------- + DayOfWeek Calendar::ImplGetWeekStart() const { @@ -303,7 +303,7 @@ DayOfWeek Calendar::ImplGetWeekStart() const return eDay; } -// ----------------------------------------------------------------------- + void Calendar::ImplGetWeekFont( Font& rFont ) const { @@ -315,7 +315,7 @@ void Calendar::ImplGetWeekFont( Font& rFont ) const rFont.SetWeight( WEIGHT_NORMAL ); } -// ----------------------------------------------------------------------- + void Calendar::ImplFormat() { @@ -494,7 +494,7 @@ void Calendar::ImplFormat() mbFormat = sal_False; } -// ----------------------------------------------------------------------- + sal_uInt16 Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const { @@ -625,7 +625,7 @@ sal_uInt16 Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const return 0; } -// ----------------------------------------------------------------------- + static void ImplDrawSpinArrow( OutputDevice* pDev, const Rectangle& rRect, sal_Bool bPrev ) @@ -671,7 +671,7 @@ static void ImplDrawSpinArrow( OutputDevice* pDev, const Rectangle& rRect, } } -// ----------------------------------------------------------------------- + void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext ) { @@ -700,7 +700,7 @@ void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext ) } } -// ----------------------------------------------------------------------- + void Calendar::ImplDrawDate( long nX, long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, @@ -799,7 +799,7 @@ void Calendar::ImplDrawDate( long nX, long nY, SetFont( aOldFont ); } -// ----------------------------------------------------------------------- + void Calendar::ImplDraw( sal_Bool bPaint ) { @@ -1042,7 +1042,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) ImplDrawSpin(); } -// ----------------------------------------------------------------------- + void Calendar::ImplUpdateDate( const Date& rDate ) { @@ -1059,7 +1059,7 @@ void Calendar::ImplUpdateDate( const Date& rDate ) } } -// ----------------------------------------------------------------------- + void Calendar::ImplUpdateSelection( IntDateSet* pOld ) { @@ -1086,7 +1086,7 @@ void Calendar::ImplUpdateSelection( IntDateSet* pOld ) } } -// ----------------------------------------------------------------------- + void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, sal_Bool bMove, sal_Bool bExpand, sal_Bool bExtended ) @@ -1199,7 +1199,7 @@ void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, delete pOldSel; } -// ----------------------------------------------------------------------- + void Calendar::ImplUpdate( sal_Bool bCalcNew ) { @@ -1225,7 +1225,7 @@ void Calendar::ImplUpdate( sal_Bool bCalcNew ) mbFormat = sal_True; } -// ----------------------------------------------------------------------- + void Calendar::ImplInvertDropPos() { @@ -1235,7 +1235,7 @@ void Calendar::ImplInvertDropPos() Invert( aRect ); } -// ----------------------------------------------------------------------- + void Calendar::ImplScroll( sal_Bool bPrev ) { @@ -1252,7 +1252,7 @@ void Calendar::ImplScroll( sal_Bool bPrev ) mbDirect = sal_False; } -// ----------------------------------------------------------------------- + void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) { @@ -1317,7 +1317,7 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) } } -// ----------------------------------------------------------------------- + void Calendar::ImplTracking( const Point& rPos, sal_Bool bRepeat ) { @@ -1340,7 +1340,7 @@ void Calendar::ImplTracking( const Point& rPos, sal_Bool bRepeat ) ImplMouseSelect( aTempDate, nHitTest, sal_True, sal_False, sal_False ); } -// ----------------------------------------------------------------------- + void Calendar::ImplEndTracking( sal_Bool bCancel ) { @@ -1408,7 +1408,7 @@ void Calendar::ImplEndTracking( sal_Bool bCancel ) } } -// ----------------------------------------------------------------------- + IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG ) { @@ -1423,7 +1423,7 @@ IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG ) return 0; } -// ----------------------------------------------------------------------- + void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -1486,7 +1486,7 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) Control::MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void Calendar::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -1496,7 +1496,7 @@ void Calendar::MouseButtonUp( const MouseEvent& rMEvt ) Control::MouseButtonUp( rMEvt ); } -// ----------------------------------------------------------------------- + void Calendar::MouseMove( const MouseEvent& rMEvt ) { @@ -1506,7 +1506,7 @@ void Calendar::MouseMove( const MouseEvent& rMEvt ) Control::MouseMove( rMEvt ); } -// ----------------------------------------------------------------------- + void Calendar::Tracking( const TrackingEvent& rTEvt ) { @@ -1518,7 +1518,7 @@ void Calendar::Tracking( const TrackingEvent& rTEvt ) ImplTracking( aMousePos, rTEvt.IsTrackingRepeat() ); } -// ----------------------------------------------------------------------- + void Calendar::KeyInput( const KeyEvent& rKEvt ) { @@ -1636,14 +1636,14 @@ void Calendar::KeyInput( const KeyEvent& rKEvt ) } } -// ----------------------------------------------------------------------- + void Calendar::Paint( const Rectangle& ) { ImplDraw( sal_True ); } -// ----------------------------------------------------------------------- + void Calendar::GetFocus() { @@ -1651,7 +1651,7 @@ void Calendar::GetFocus() Control::GetFocus(); } -// ----------------------------------------------------------------------- + void Calendar::LoseFocus() { @@ -1659,7 +1659,7 @@ void Calendar::LoseFocus() Control::LoseFocus(); } -// ----------------------------------------------------------------------- + void Calendar::Resize() { @@ -1667,7 +1667,7 @@ void Calendar::Resize() Control::Resize(); } -// ----------------------------------------------------------------------- + void Calendar::RequestHelp( const HelpEvent& rHEvt ) { @@ -1716,7 +1716,7 @@ void Calendar::RequestHelp( const HelpEvent& rHEvt ) Control::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + void Calendar::Command( const CommandEvent& rCEvt ) { @@ -1763,7 +1763,7 @@ void Calendar::Command( const CommandEvent& rCEvt ) Control::Command( rCEvt ); } -// ----------------------------------------------------------------------- + void Calendar::StateChanged( StateChangedType nType ) { @@ -1773,7 +1773,7 @@ void Calendar::StateChanged( StateChangedType nType ) ImplFormat(); } -// ----------------------------------------------------------------------- + void Calendar::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1789,42 +1789,42 @@ void Calendar::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void Calendar::SelectionChanging() { maSelectionChangingHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Calendar::DateRangeChanged() { maDateRangeChangedHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Calendar::RequestDateInfo() { maRequestDateInfoHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Calendar::DoubleClick() { maDoubleClickHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Calendar::Select() { maSelectHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Calendar::SelectDate( const Date& rDate, sal_Bool bSelect ) { @@ -1847,7 +1847,7 @@ void Calendar::SelectDate( const Date& rDate, sal_Bool bSelect ) } } -// ----------------------------------------------------------------------- + void Calendar::SetNoSelection() { @@ -1867,14 +1867,14 @@ void Calendar::SetNoSelection() } } -// ----------------------------------------------------------------------- + sal_Bool Calendar::IsDateSelected( const Date& rDate ) const { return mpSelectTable->find( rDate.GetDate() ) != mpSelectTable->end(); } -// ----------------------------------------------------------------------- + Date Calendar::GetFirstSelectedDate() const { @@ -1887,7 +1887,7 @@ Date Calendar::GetFirstSelectedDate() const } } -// ----------------------------------------------------------------------- + void Calendar::SetCurDate( const Date& rNewDate ) { @@ -1945,7 +1945,7 @@ void Calendar::SetCurDate( const Date& rNewDate ) } } -// ----------------------------------------------------------------------- + void Calendar::SetFirstDate( const Date& rNewFirstDate ) { @@ -1957,7 +1957,7 @@ void Calendar::SetFirstDate( const Date& rNewFirstDate ) } } -// ----------------------------------------------------------------------- + Date Calendar::GetFirstMonth() const { @@ -1972,7 +1972,7 @@ Date Calendar::GetFirstMonth() const return maFirstDate; } -// ----------------------------------------------------------------------- + Date Calendar::GetLastMonth() const { @@ -1984,7 +1984,7 @@ Date Calendar::GetLastMonth() const return aDate; } -// ----------------------------------------------------------------------- + sal_uInt16 Calendar::GetMonthCount() const { @@ -1994,7 +1994,7 @@ sal_uInt16 Calendar::GetMonthCount() const return (sal_uInt16)(mnMonthPerLine*mnLines); } -// ----------------------------------------------------------------------- + sal_Bool Calendar::GetDate( const Point& rPos, Date& rDate ) const { @@ -2009,7 +2009,7 @@ sal_Bool Calendar::GetDate( const Point& rPos, Date& rDate ) const return sal_False; } -// ----------------------------------------------------------------------- + Rectangle Calendar::GetDateRect( const Date& rDate ) const { @@ -2111,7 +2111,7 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const return aRect; } -// ----------------------------------------------------------------------- + void Calendar::StartSelection() { @@ -2123,7 +2123,7 @@ void Calendar::StartSelection() mbSelection = sal_True; } -// ----------------------------------------------------------------------- + void Calendar::EndSelection() { @@ -2141,7 +2141,7 @@ void Calendar::EndSelection() } } -// ----------------------------------------------------------------------- + Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, long nCalcLines ) const @@ -2225,7 +2225,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ); }; -// ----------------------------------------------------------------------- + ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) : FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) @@ -2236,7 +2236,7 @@ ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) : mpFixedLine = NULL; } -// ----------------------------------------------------------------------- + ImplCFieldFloatWin::~ImplCFieldFloatWin() { @@ -2245,7 +2245,7 @@ ImplCFieldFloatWin::~ImplCFieldFloatWin() delete mpFixedLine; } -// ----------------------------------------------------------------------- + PushButton* ImplCFieldFloatWin::EnableTodayBtn( sal_Bool bEnable ) { @@ -2277,7 +2277,7 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( sal_Bool bEnable ) return mpTodayBtn; } -// ----------------------------------------------------------------------- + PushButton* ImplCFieldFloatWin::EnableNoneBtn( sal_Bool bEnable ) { @@ -2309,7 +2309,7 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( sal_Bool bEnable ) return mpNoneBtn; } -// ----------------------------------------------------------------------- + void ImplCFieldFloatWin::ArrangeButtons() { @@ -2375,7 +2375,7 @@ void ImplCFieldFloatWin::ArrangeButtons() } } -// ----------------------------------------------------------------------- + bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt ) { @@ -2402,7 +2402,7 @@ CalendarField::CalendarField( Window* pParent, WinBits nWinStyle ) : mbNone = sal_False; } -// ----------------------------------------------------------------------- + CalendarField::~CalendarField() { @@ -2413,7 +2413,7 @@ CalendarField::~CalendarField() } } -// ----------------------------------------------------------------------- + IMPL_LINK( CalendarField, ImplSelectHdl, Calendar*, pCalendar ) { @@ -2434,7 +2434,7 @@ IMPL_LINK( CalendarField, ImplSelectHdl, Calendar*, pCalendar ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn ) { @@ -2466,7 +2466,7 @@ IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl) { @@ -2476,14 +2476,14 @@ IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl) return 0; } -// ----------------------------------------------------------------------- + void CalendarField::Select() { maSelectHdl.Call( this ); } -// ----------------------------------------------------------------------- + bool CalendarField::ShowDropDown( sal_Bool bShow ) { @@ -2533,14 +2533,14 @@ bool CalendarField::ShowDropDown( sal_Bool bShow ) return true; } -// ----------------------------------------------------------------------- + Calendar* CalendarField::CreateCalendar( Window* pParent ) { return new Calendar( pParent, mnCalendarStyle | WB_TABSTOP ); } -// ----------------------------------------------------------------------- + Calendar* CalendarField::GetCalendar() { @@ -2556,7 +2556,7 @@ Calendar* CalendarField::GetCalendar() return mpCalendar; } -// ----------------------------------------------------------------------- + void CalendarField::StateChanged( StateChangedType nStateChange ) { diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index cc2d73062955..c845b22657dc 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -22,11 +22,11 @@ #include <svtools/svtools.hrc> #include <svtools/collatorres.hxx> -// ------------------------------------------------------------------------- + // // wrapper for locale specific translations data of collator algorithm // -// ------------------------------------------------------------------------- + class CollatorResourceData { @@ -54,11 +54,11 @@ class CollatorResourceData } }; -// ------------------------------------------------------------------------- + // // implementation of the collator-algorithm-name translation // -// ------------------------------------------------------------------------- + #define COLLATOR_RESOURCE_COUNT (STR_SVT_COLLATE_END - STR_SVT_COLLATE_START + 1) diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 5997da3ed221..3755003788db 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -66,9 +66,9 @@ using namespace ::com::sun::star; // ColorListBox // ======================================================================== -// -------------------- + // - ImplColorListData - -// -------------------- + class ImplColorListData { @@ -80,7 +80,7 @@ public: ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = sal_True; } }; -// ----------------------------------------------------------------------- + void ColorListBox::ImplInit() { @@ -92,7 +92,7 @@ void ColorListBox::ImplInit() SetUserItemSize( aImageSize ); } -// ----------------------------------------------------------------------- + void ColorListBox::ImplDestroyColorEntries() { @@ -101,7 +101,7 @@ void ColorListBox::ImplDestroyColorEntries() pColorList->clear(); } -// ----------------------------------------------------------------------- + ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) : ListBox( pParent, nWinStyle ) @@ -110,7 +110,7 @@ ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) : SetEdgeBlending(true); } -// ----------------------------------------------------------------------- + ColorListBox::ColorListBox( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) @@ -131,7 +131,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorListBox(Window *pParen return pListBox; } -// ----------------------------------------------------------------------- + ColorListBox::~ColorListBox() { @@ -139,7 +139,7 @@ ColorListBox::~ColorListBox() delete pColorList; } -// ----------------------------------------------------------------------- + sal_uInt16 ColorListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos ) { @@ -162,7 +162,7 @@ sal_uInt16 ColorListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos ) return nPos; } -// ----------------------------------------------------------------------- + sal_uInt16 ColorListBox::InsertEntry( const Color& rColor, const OUString& rStr, sal_uInt16 nPos ) @@ -186,7 +186,7 @@ sal_uInt16 ColorListBox::InsertEntry( const Color& rColor, const OUString& rStr, return nPos; } -// ----------------------------------------------------------------------- + void ColorListBox::InsertAutomaticEntryColor(const Color &rColor) { @@ -194,7 +194,7 @@ void ColorListBox::InsertAutomaticEntryColor(const Color &rColor) InsertEntry( rColor, SVT_RESSTR(STR_SVT_AUTOMATIC_COLOR), 0 ); } -// ----------------------------------------------------------------------- + void ColorListBox::RemoveEntry( sal_uInt16 nPos ) { @@ -208,7 +208,7 @@ void ColorListBox::RemoveEntry( sal_uInt16 nPos ) } } -// ----------------------------------------------------------------------- + void ColorListBox::Clear() { @@ -216,7 +216,7 @@ void ColorListBox::Clear() ListBox::Clear(); } -// ----------------------------------------------------------------------- + void ColorListBox::CopyEntries( const ColorListBox& rBox ) { @@ -245,7 +245,7 @@ void ColorListBox::CopyEntries( const ColorListBox& rBox ) } } -// ----------------------------------------------------------------------- + sal_uInt16 ColorListBox::GetEntryPos( const Color& rColor ) const { @@ -258,7 +258,7 @@ sal_uInt16 ColorListBox::GetEntryPos( const Color& rColor ) const return LISTBOX_ENTRY_NOTFOUND; } -// ----------------------------------------------------------------------- + Color ColorListBox::GetEntryColor( sal_uInt16 nPos ) const { @@ -269,7 +269,7 @@ Color ColorListBox::GetEntryColor( sal_uInt16 nPos ) const return aColor; } -// ----------------------------------------------------------------------- + void ColorListBox::UserDraw( const UserDrawEvent& rUDEvt ) { @@ -547,7 +547,7 @@ sal_uInt16 ImpLineListData::GetStyle( ) return m_nStyle; } -// ----------------------------------------------------------------------- + void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, sal_uInt16 nDashing ) { @@ -735,7 +735,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, } } -// ----------------------------------------------------------------------- + void LineListBox::ImplInit() { @@ -751,7 +751,7 @@ void LineListBox::ImplInit() UpdatePaintLineColor(); } -// ----------------------------------------------------------------------- + LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) : ListBox( pParent, nWinStyle ), @@ -775,7 +775,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineListBox(Window *pParent return pListBox; } -// ----------------------------------------------------------------------- + LineListBox::~LineListBox() { @@ -820,7 +820,7 @@ void LineListBox::SelectEntry( sal_uInt16 nStyle, sal_Bool bSelect ) ListBox::SelectEntryPos( nPos, bSelect ); } -// ----------------------------------------------------------------------- + sal_uInt16 LineListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos ) { @@ -837,7 +837,7 @@ sal_uInt16 LineListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos ) return nPos; } -// ----------------------------------------------------------------------- + void LineListBox::InsertEntry( BorderWidthImpl aWidthImpl, sal_uInt16 nStyle, long nMinWidth, @@ -848,7 +848,7 @@ void LineListBox::InsertEntry( pLineList->push_back( pData ); } -// ----------------------------------------------------------------------- + void LineListBox::RemoveEntry( sal_uInt16 nPos ) { @@ -862,7 +862,7 @@ void LineListBox::RemoveEntry( sal_uInt16 nPos ) } } -// ----------------------------------------------------------------------- + void LineListBox::Clear() { @@ -876,7 +876,7 @@ void LineListBox::Clear() ListBox::Clear(); } -// ----------------------------------------------------------------------- + sal_uInt16 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const { @@ -896,7 +896,7 @@ sal_uInt16 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const return LISTBOX_ENTRY_NOTFOUND; } -// ----------------------------------------------------------------------- + sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const { @@ -904,7 +904,7 @@ sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE; } -// ----------------------------------------------------------------------- + sal_Bool LineListBox::UpdatePaintLineColor( void ) { @@ -964,7 +964,7 @@ void LineListBox::UpdateEntries( long nOldWidth ) Invalidate(); } -// ----------------------------------------------------------------------- + Color LineListBox::GetColorLine1( sal_uInt16 nPos ) { @@ -1002,7 +1002,7 @@ Color LineListBox::GetColorDist( sal_uInt16 nPos ) return rResult; } -// ----------------------------------------------------------------------- + void LineListBox::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1025,7 +1025,7 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : InitFontMRUEntriesFile(); } -// ------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap) { @@ -1039,7 +1039,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent return pListBox; } -// ------------------------------------------------------------------- + FontNameBox::~FontNameBox() { @@ -1047,7 +1047,7 @@ FontNameBox::~FontNameBox() ImplDestroyFontList(); } -// ------------------------------------------------------------------- + void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) const { @@ -1072,7 +1072,7 @@ void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico aStream.WriteLine( OString() ); } -// ------------------------------------------------------------------- + void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) { @@ -1095,7 +1095,7 @@ void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico SetMRUEntries( aEntries, cSep ); } -// ------------------------------------------------------------------ + void FontNameBox::InitFontMRUEntriesFile() { @@ -1109,14 +1109,14 @@ void FontNameBox::InitFontMRUEntriesFile() } } -// ------------------------------------------------------------------- + void FontNameBox::ImplDestroyFontList() { delete mpFontList; } -// ------------------------------------------------------------------- + void FontNameBox::Fill( const FontList* pList ) { @@ -1159,7 +1159,7 @@ void FontNameBox::Fill( const FontList* pList ) SetText( aOldText ); } -// ------------------------------------------------------------------- + void FontNameBox::EnableWYSIWYG( sal_Bool bEnable ) { @@ -1171,7 +1171,7 @@ void FontNameBox::EnableWYSIWYG( sal_Bool bEnable ) } } -// ------------------------------------------------------------------- + void FontNameBox::ImplCalcUserItemSize() { @@ -1213,7 +1213,7 @@ namespace } } -// ------------------------------------------------------------------- + void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) { @@ -1451,7 +1451,7 @@ FontStyleBox::~FontStyleBox() { } -// ------------------------------------------------------------------- + void FontStyleBox::Select() { @@ -1460,7 +1460,7 @@ void FontStyleBox::Select() ComboBox::Select(); } -// ------------------------------------------------------------------- + void FontStyleBox::LoseFocus() { @@ -1469,7 +1469,7 @@ void FontStyleBox::LoseFocus() ComboBox::LoseFocus(); } -// ------------------------------------------------------------------- + void FontStyleBox::Modify() { @@ -1496,7 +1496,7 @@ void FontStyleBox::Modify() ComboBox::Modify(); } -// ------------------------------------------------------------------- + void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) { @@ -1659,13 +1659,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontSizeBox(Window *pParent return pListBox; } -// ----------------------------------------------------------------------- + FontSizeBox::~FontSizeBox() { } -// ----------------------------------------------------------------------- + void FontSizeBox::ImplInit() { @@ -1684,7 +1684,7 @@ void FontSizeBox::ImplInit() SetProminentEntryType( PROMINENT_MIDDLE ); } -// ----------------------------------------------------------------------- + void FontSizeBox::Reformat() { @@ -1702,7 +1702,7 @@ void FontSizeBox::Reformat() MetricBox::Reformat(); } -// ----------------------------------------------------------------------- + void FontSizeBox::Modify() { @@ -1756,7 +1756,7 @@ void FontSizeBox::Modify() } } -// ----------------------------------------------------------------------- + void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList ) { @@ -1846,7 +1846,7 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList ) SetSelection( aSelection ); } -// ----------------------------------------------------------------------- + void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt16 nStep ) { @@ -1857,7 +1857,7 @@ void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt SetUnit( FUNIT_POINT ); } -// ----------------------------------------------------------------------- + void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep ) { @@ -1868,7 +1868,7 @@ void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep ) SetUnit( FUNIT_POINT ); } -// ----------------------------------------------------------------------- + void FontSizeBox::SetRelative( sal_Bool bNewRelative ) { @@ -1931,7 +1931,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) } } -// ----------------------------------------------------------------------- + OUString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const { @@ -1941,7 +1941,7 @@ OUString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const return sRet; } -// ----------------------------------------------------------------------- + void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) { @@ -1965,14 +1965,14 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) MetricBox::SetValue( nNewValue, eInUnit ); } -// ----------------------------------------------------------------------- + void FontSizeBox::SetValue( sal_Int64 nNewValue ) { SetValue( nNewValue, FUNIT_NONE ); } -// ----------------------------------------------------------------------- + sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const { @@ -1991,7 +1991,7 @@ sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const return nRetValue; } -// ----------------------------------------------------------------------- + sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const { @@ -2006,7 +2006,7 @@ sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const return MetricBox::GetValue( eOutUnit ); } -// ----------------------------------------------------------------------- + sal_Int64 FontSizeBox::GetValue() const { diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index e3bb7a8ec889..5991af8378a3 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -71,9 +71,9 @@ static const sal_IntPtr aStdSizeAry[] = // ======================================================================= -// ----------------------------- + // - class ImplFontListFonInfo - -// ----------------------------- + class ImplFontListFontInfo : public FontInfo { @@ -94,9 +94,9 @@ public: OutputDevice* GetDevice() const { return mpDevice; } }; -// ------------------------------ + // - class ImplFontListNameInfo - -// ------------------------------ + class ImplFontListNameInfo { @@ -152,7 +152,7 @@ static OUString ImplMakeSearchString(const OUString& rStr) return rStr.toAsciiLowerCase(); } -// ----------------------------------------------------------------------- + static OUString ImplMakeSearchStringFromName(const OUString& rStr) { @@ -164,7 +164,7 @@ static OUString ImplMakeSearchStringFromName(const OUString& rStr) return ImplMakeSearchString(rStr.getToken( 0, ';' )); } -// ----------------------------------------------------------------------- + ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong* pIndex) const { @@ -371,7 +371,7 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, sal_Bool bAll ImplInsertFonts( pDevice2, bAll, !bCompareWindow ); } -// ----------------------------------------------------------------------- + FontList::~FontList() { @@ -392,7 +392,7 @@ FontList::~FontList() } } } -// ----------------------------------------------------------------------- + FontList* FontList::Clone() const { FontList* pReturn = new FontList( @@ -400,7 +400,7 @@ FontList* FontList::Clone() const return pReturn; } -// ----------------------------------------------------------------------- + const OUString& FontList::GetStyleName(FontWeight eWeight, FontItalic eItalic) const { @@ -441,7 +441,7 @@ const OUString& FontList::GetStyleName(FontWeight eWeight, FontItalic eItalic) c } } -// ----------------------------------------------------------------------- + OUString FontList::GetStyleName(const FontInfo& rInfo) const { @@ -494,7 +494,7 @@ OUString FontList::GetStyleName(const FontInfo& rInfo) const return aStyleName; } -// ----------------------------------------------------------------------- + OUString FontList::GetFontMapText( const FontInfo& rInfo ) const { @@ -675,7 +675,7 @@ FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const return aInfo; } -// ----------------------------------------------------------------------- + FontInfo FontList::Get(const OUString& rName, FontWeight eWeight, FontItalic eItalic) const @@ -713,14 +713,14 @@ FontInfo FontList::Get(const OUString& rName, return aInfo; } -// ----------------------------------------------------------------------- + sal_Bool FontList::IsAvailable(const OUString& rName) const { return (ImplFindByName( rName ) != 0); } -// ----------------------------------------------------------------------- + const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const { @@ -729,7 +729,7 @@ const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const return *(maEntries[nFont].mpFirst); } -// ----------------------------------------------------------------------- + sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const { @@ -740,7 +740,7 @@ sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const return (sal_Handle)pData->mpFirst; } -// ----------------------------------------------------------------------- + sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const { @@ -748,7 +748,7 @@ sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const return (sal_Handle)(pInfo->mpNext); } -// ----------------------------------------------------------------------- + const FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const { @@ -756,7 +756,7 @@ const FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const return *pInfo; } -// ----------------------------------------------------------------------- + const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const { @@ -806,7 +806,7 @@ const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const return mpSizeAry; } -// ----------------------------------------------------------------------- + const sal_IntPtr* FontList::GetStdSizeAry() { @@ -815,9 +815,9 @@ const sal_IntPtr* FontList::GetStdSizeAry() // ======================================================================= -// --------------------------------- + // - FontSizeNames & FsizeNameItem - -// --------------------------------- + struct ImplFSNameItem { @@ -825,7 +825,7 @@ struct ImplFSNameItem const char* mszUtf8Name; }; -//------------------------------------------------------------------------ + static const ImplFSNameItem aImplSimplifiedChinese[] = { @@ -847,7 +847,7 @@ static const ImplFSNameItem aImplSimplifiedChinese[] = { 420, "\xe5\x88\x9d\xe5\x8f\xb7" } }; -//------------------------------------------------------------------------ + FontSizeNames::FontSizeNames( LanguageType eLanguage ) { @@ -869,7 +869,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage ) } } -//------------------------------------------------------------------------ + long FontSizeNames::Name2Size( const OUString& rName ) const { @@ -887,7 +887,7 @@ long FontSizeNames::Name2Size( const OUString& rName ) const return 0; } -//------------------------------------------------------------------------ + OUString FontSizeNames::Size2Name( long nValue ) const { @@ -911,7 +911,7 @@ OUString FontSizeNames::Size2Name( long nValue ) const return aStr; } -//------------------------------------------------------------------------ + OUString FontSizeNames::GetIndexName( sal_uLong nIndex ) const { @@ -923,7 +923,7 @@ OUString FontSizeNames::GetIndexName( sal_uLong nIndex ) const return aStr; } -//------------------------------------------------------------------------ + long FontSizeNames::GetIndexSize( sal_uLong nIndex ) const { diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 75c38696eb86..810b17b3ba33 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -53,7 +53,7 @@ FileControl::FileControl( Window* pParent, WinBits nStyle, FileControlMode nFlag SetStyle( ImplInitStyle( GetStyle() ) ); } -// ----------------------------------------------------------------------- + WinBits FileControl::ImplInitStyle( WinBits nStyle ) { @@ -82,13 +82,13 @@ WinBits FileControl::ImplInitStyle( WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------------- + FileControl::~FileControl() { } -// ----------------------------------------------------------------------- + void FileControl::SetText( const OUString& rStr ) { @@ -97,14 +97,14 @@ void FileControl::SetText( const OUString& rStr ) Resize(); } -// ----------------------------------------------------------------------- + OUString FileControl::GetText() const { return maEdit.GetText(); } -// ----------------------------------------------------------------------- + void FileControl::StateChanged( StateChangedType nType ) { @@ -144,7 +144,7 @@ void FileControl::StateChanged( StateChangedType nType ) Window::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void FileControl::Resize() { @@ -180,7 +180,7 @@ void FileControl::Resize() mnInternalFlags &= ~FILECTRL_INRESIZE; //InResize = sal_False } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FileControl, ButtonHdl) { @@ -189,14 +189,14 @@ IMPL_LINK_NOARG(FileControl, ButtonHdl) return 0; } -// ----------------------------------------------------------------------- + void FileControl::GetFocus() { maEdit.GrabFocus(); } -// ----------------------------------------------------------------------- + void FileControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index 7b3c794fd78c..06e599189242 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -29,14 +29,14 @@ namespace svt //===================================================================== //= FileURLBox //===================================================================== - //--------------------------------------------------------------------- + FileURLBox::FileURLBox( Window* _pParent, WinBits _nStyle ) :SvtURLBox( _pParent, _nStyle, INET_PROT_FILE ) { DisableHistory(); } - //--------------------------------------------------------------------- + void FileURLBox::DisplayURL( const OUString& _rURL ) { OUString sOldText = GetText(); @@ -51,7 +51,7 @@ namespace svt UpdatePickList(); } - //--------------------------------------------------------------------- + bool FileURLBox::PreNotify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) @@ -73,7 +73,7 @@ namespace svt return SvtURLBox::PreNotify(_rNEvt); } - //--------------------------------------------------------------------- + bool FileURLBox::Notify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 7df2ec124bf0..91adad683423 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -101,7 +101,7 @@ void HeaderBar::ImplInit( WinBits nWinStyle ) ImplInitSettings( sal_True, sal_True, sal_True ); } -// ----------------------------------------------------------------------- + HeaderBar::HeaderBar( Window* pParent, WinBits nWinStyle ) : Window( pParent, nWinStyle & WB_3DLOOK ) @@ -110,7 +110,7 @@ HeaderBar::HeaderBar( Window* pParent, WinBits nWinStyle ) : SetSizePixel( CalcWindowSizePixel() ); } -// ----------------------------------------------------------------------- + HeaderBar::~HeaderBar() { @@ -122,7 +122,7 @@ HeaderBar::~HeaderBar() delete mpItemList; } -// ----------------------------------------------------------------------- + void HeaderBar::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) @@ -160,7 +160,7 @@ void HeaderBar::ImplInitSettings( sal_Bool bFont, } } -// ----------------------------------------------------------------------- + long HeaderBar::ImplGetItemPos( sal_uInt16 nPos ) const { @@ -170,7 +170,7 @@ long HeaderBar::ImplGetItemPos( sal_uInt16 nPos ) const return nX; } -// ----------------------------------------------------------------------- + Rectangle HeaderBar::ImplGetItemRect( sal_uInt16 nPos ) const { @@ -182,7 +182,7 @@ Rectangle HeaderBar::ImplGetItemRect( sal_uInt16 nPos ) const return aRect; } -// ----------------------------------------------------------------------- + sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const @@ -247,7 +247,7 @@ sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos, return 0; } -// ----------------------------------------------------------------------- + void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) { @@ -295,7 +295,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ) SetRasterOp( ROP_OVERPAINT ); } -// ----------------------------------------------------------------------- + void HeaderBar::ImplDrawItem( OutputDevice* pDev, sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag, @@ -656,7 +656,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, } } -// ----------------------------------------------------------------------- + void HeaderBar::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag, const Rectangle* pRect ) @@ -665,7 +665,7 @@ void HeaderBar::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag, ImplDrawItem( this, nPos, bHigh, bDrag, aRect, pRect, 0 ); } -// ----------------------------------------------------------------------- + void HeaderBar::ImplUpdate( sal_uInt16 nPos, sal_Bool bEnd, sal_Bool bDirect ) { @@ -709,7 +709,7 @@ void HeaderBar::ImplUpdate( sal_uInt16 nPos, sal_Bool bEnd, sal_Bool bDirect ) } } -// ----------------------------------------------------------------------- + void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand ) { @@ -772,7 +772,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand ) } } -// ----------------------------------------------------------------------- + void HeaderBar::ImplDrag( const Point& rMousePos ) { @@ -879,7 +879,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos ) Drag(); } -// ----------------------------------------------------------------------- + void HeaderBar::ImplEndDrag( sal_Bool bCancel ) { @@ -940,7 +940,7 @@ void HeaderBar::ImplEndDrag( sal_Bool bCancel ) mbItemDrag = sal_False; } -// ----------------------------------------------------------------------- + void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -969,7 +969,7 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void HeaderBar::MouseMove( const MouseEvent& rMEvt ) { @@ -984,7 +984,7 @@ void HeaderBar::MouseMove( const MouseEvent& rMEvt ) SetPointer( aPtr ); } -// ----------------------------------------------------------------------- + void HeaderBar::Tracking( const TrackingEvent& rTEvt ) { @@ -996,7 +996,7 @@ void HeaderBar::Tracking( const TrackingEvent& rTEvt ) ImplDrag( aMousePos ); } -// ----------------------------------------------------------------------- + void HeaderBar::Paint( const Rectangle& rRect ) { @@ -1025,7 +1025,7 @@ void HeaderBar::Paint( const Rectangle& rRect ) ImplDrawItem( i, (i == nCurItemPos) ? sal_True : sal_False, sal_False, &rRect ); } -// ----------------------------------------------------------------------- + void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) @@ -1081,7 +1081,7 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } -// ----------------------------------------------------------------------- + void HeaderBar::Resize() { @@ -1092,7 +1092,7 @@ void HeaderBar::Resize() mnDY = aSize.Height(); } -// ----------------------------------------------------------------------- + void HeaderBar::Command( const CommandEvent& rCEvt ) { @@ -1105,7 +1105,7 @@ void HeaderBar::Command( const CommandEvent& rCEvt ) Window::Command( rCEvt ); } -// ----------------------------------------------------------------------- + void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) { @@ -1160,7 +1160,7 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + void HeaderBar::StateChanged( StateChangedType nType ) { @@ -1186,7 +1186,7 @@ void HeaderBar::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1202,48 +1202,48 @@ void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void HeaderBar::UserDraw( const UserDrawEvent& ) { } -// ----------------------------------------------------------------------- + void HeaderBar::StartDrag() { maStartDragHdl.Call( this ); } -// ----------------------------------------------------------------------- + void HeaderBar::Drag() { maDragHdl.Call( this ); } -// ----------------------------------------------------------------------- + void HeaderBar::EndDrag() { maEndDragHdl.Call( this ); } -// ----------------------------------------------------------------------- + void HeaderBar::Select() { maSelectHdl.Call( this ); } -// ----------------------------------------------------------------------- + void HeaderBar::DoubleClick() { maDoubleClickHdl.Call( this ); } -// ----------------------------------------------------------------------- + void HeaderBar::InsertItem( sal_uInt16 nItemId, const OUString& rText, long nSize, HeaderBarItemBits nBits, sal_uInt16 nPos ) @@ -1270,7 +1270,7 @@ void HeaderBar::InsertItem( sal_uInt16 nItemId, const OUString& rText, ImplUpdate( nPos, sal_True ); } -// ----------------------------------------------------------------------- + void HeaderBar::RemoveItem( sal_uInt16 nItemId ) { @@ -1286,7 +1286,7 @@ void HeaderBar::RemoveItem( sal_uInt16 nItemId ) } } -// ----------------------------------------------------------------------- + void HeaderBar::MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos ) { @@ -1308,7 +1308,7 @@ void HeaderBar::MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos ) } } -// ----------------------------------------------------------------------- + void HeaderBar::Clear() { @@ -1321,7 +1321,7 @@ void HeaderBar::Clear() ImplUpdate( 0, sal_True ); } -// ----------------------------------------------------------------------- + void HeaderBar::SetOffset( long nNewOffset ) { @@ -1332,14 +1332,14 @@ void HeaderBar::SetOffset( long nNewOffset ) Scroll( nDelta, 0, aRect ); } -// ----------------------------------------------------------------------- + sal_uInt16 HeaderBar::GetItemCount() const { return (sal_uInt16)mpItemList->size(); } -// ----------------------------------------------------------------------- + sal_uInt16 HeaderBar::GetItemPos( sal_uInt16 nItemId ) const { @@ -1351,7 +1351,7 @@ sal_uInt16 HeaderBar::GetItemPos( sal_uInt16 nItemId ) const return HEADERBAR_ITEM_NOTFOUND; } -// ----------------------------------------------------------------------- + sal_uInt16 HeaderBar::GetItemId( sal_uInt16 nPos ) const { @@ -1362,7 +1362,7 @@ sal_uInt16 HeaderBar::GetItemId( sal_uInt16 nPos ) const return 0; } -// ----------------------------------------------------------------------- + sal_uInt16 HeaderBar::GetItemId( const Point& rPos ) const { @@ -1374,7 +1374,7 @@ sal_uInt16 HeaderBar::GetItemId( const Point& rPos ) const return 0; } -// ----------------------------------------------------------------------- + Rectangle HeaderBar::GetItemRect( sal_uInt16 nItemId ) const { @@ -1385,7 +1385,7 @@ Rectangle HeaderBar::GetItemRect( sal_uInt16 nItemId ) const return aRect; } -// ----------------------------------------------------------------------- + void HeaderBar::SetItemSize( sal_uInt16 nItemId, long nNewSize ) { @@ -1401,7 +1401,7 @@ void HeaderBar::SetItemSize( sal_uInt16 nItemId, long nNewSize ) } } -// ----------------------------------------------------------------------- + long HeaderBar::GetItemSize( sal_uInt16 nItemId ) const { @@ -1412,7 +1412,7 @@ long HeaderBar::GetItemSize( sal_uInt16 nItemId ) const return 0; } -// ----------------------------------------------------------------------- + void HeaderBar::SetItemBits( sal_uInt16 nItemId, HeaderBarItemBits nNewBits ) { @@ -1428,7 +1428,7 @@ void HeaderBar::SetItemBits( sal_uInt16 nItemId, HeaderBarItemBits nNewBits ) } } -// ----------------------------------------------------------------------- + HeaderBarItemBits HeaderBar::GetItemBits( sal_uInt16 nItemId ) const { @@ -1439,7 +1439,7 @@ HeaderBarItemBits HeaderBar::GetItemBits( sal_uInt16 nItemId ) const return 0; } -// ----------------------------------------------------------------------- + void HeaderBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) { @@ -1451,7 +1451,7 @@ void HeaderBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) } } -// ----------------------------------------------------------------------- + OUString HeaderBar::GetItemText( sal_uInt16 nItemId ) const { @@ -1461,7 +1461,7 @@ OUString HeaderBar::GetItemText( sal_uInt16 nItemId ) const return OUString(); } -// ----------------------------------------------------------------------- + OUString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const { @@ -1482,7 +1482,7 @@ OUString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const return OUString(); } -// ----------------------------------------------------------------------- + OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const { @@ -1493,7 +1493,7 @@ OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const return aRet; } -// ----------------------------------------------------------------------- + Size HeaderBar::CalcWindowSizePixel() const { diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index b15ef3b61210..f31f1c934064 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -63,7 +63,7 @@ namespace svt HyperLabelImpl(); }; - //--------------------------------------------------------------------- + HyperLabelImpl::HyperLabelImpl() { } @@ -209,7 +209,7 @@ namespace svt } - //------------------------------------------------------------------------------ + void HyperLabel::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index c80507f015a7..ac2b5ff7c16d 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -22,11 +22,11 @@ #include <svtools/svtools.hrc> #include <svtools/indexentryres.hxx> -// ------------------------------------------------------------------------- + // // wrapper for locale specific translations data of indexentry algorithm // -// ------------------------------------------------------------------------- + class IndexEntryResourceData { @@ -54,11 +54,11 @@ class IndexEntryResourceData } }; -// ------------------------------------------------------------------------- + // // implementation of the indexentry-algorithm-name translation // -// ------------------------------------------------------------------------- + #define INDEXENTRY_RESOURCE_COUNT (STR_SVT_INDEXENTRY_END - STR_SVT_INDEXENTRY_START + 1) diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index ac0529c6399a..33bcf894b1b7 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -202,7 +202,7 @@ void SvtMatchContext_Impl::execute( ) aLink.Call( this ); } -//------------------------------------------------------------------------- + // This method is called via AsynchronLink, so it has the SolarMutex and // calling solar code ( VCL ... ) is safe. It is called when the thread is // terminated ( finished work or stopped ). Cancelling the thread via @@ -285,7 +285,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, ) return 0; } -//------------------------------------------------------------------------- + void SvtMatchContext_Impl::Insert( const OUString& rCompletion, const OUString& rURL, sal_Bool bForce ) @@ -301,7 +301,7 @@ void SvtMatchContext_Impl::Insert( const OUString& rCompletion, aURLs.push_back(rURL); } -//------------------------------------------------------------------------- + void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, const OUString& rMatch, sal_Bool bSmart ) @@ -468,7 +468,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, } } -//------------------------------------------------------------------------- + OUString SvtURLBox::ParseSmart( OUString aText, OUString aBaseURL, const OUString& aWorkDir ) { OUString aMatch; @@ -552,7 +552,7 @@ OUString SvtURLBox::ParseSmart( OUString aText, OUString aBaseURL, const OUStrin return aMatch; } -//------------------------------------------------------------------------- + void SvtMatchContext_Impl::doExecute() { ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() ); @@ -831,7 +831,7 @@ void SvtURLBox::TryAutoComplete() } } -//------------------------------------------------------------------------- + SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent , WB_DROPDOWN | WB_AUTOSIZE | WB_AUTOHSCROLL ), eSmartProtocol( eSmart ), @@ -850,7 +850,7 @@ SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelp SetSizePixel( Size( 225, 240 ) ); } -//------------------------------------------------------------------------- + SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent, _nStyle ), @@ -874,7 +874,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtURLBox(Window *pParent, return pListBox; } -//------------------------------------------------------------------------- + SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent , _rResId ), @@ -1006,7 +1006,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl() } } -//------------------------------------------------------------------------- + sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey ) { // every key input stops the current matching thread @@ -1087,13 +1087,13 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey ) } } -//------------------------------------------------------------------------- + void SvtURLBox::Modify() { ComboBox::Modify(); } -//------------------------------------------------------------------------- + bool SvtURLBox::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetWindow() == GetSubEdit() && rNEvt.GetType() == EVENT_KEYINPUT ) @@ -1126,7 +1126,7 @@ bool SvtURLBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -//------------------------------------------------------------------------- + IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl) { if ( GetSubEdit()->GetAutocompleteAction() == AUTOCOMPLETE_KEYINPUT ) @@ -1138,7 +1138,7 @@ IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl) return 0L; } -//------------------------------------------------------------------------- + bool SvtURLBox::Notify( NotifyEvent &rEvt ) { if ( EVENT_GETFOCUS == rEvt.GetType() ) @@ -1163,14 +1163,14 @@ bool SvtURLBox::Notify( NotifyEvent &rEvt ) return ComboBox::Notify( rEvt ); } -//------------------------------------------------------------------------- + void SvtURLBox::Select() { ComboBox::Select(); ClearModifyFlag(); } -//------------------------------------------------------------------------- + void SvtURLBox::SetOnlyDirectories( sal_Bool bDir ) { bOnlyDirectories = bDir; @@ -1178,13 +1178,13 @@ void SvtURLBox::SetOnlyDirectories( sal_Bool bDir ) Clear(); } -//------------------------------------------------------------------------- + void SvtURLBox::SetNoURLSelection( sal_Bool bSet ) { bNoSelection = bSet; } -//------------------------------------------------------------------------- + OUString SvtURLBox::GetURL() { // wait for end of autocompletion diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index dc4ea873e5d3..bdbb85ff168c 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -178,7 +178,7 @@ namespace svt } }; - //--------------------------------------------------------------------- + void RoadmapImpl::initItemSize() { Size aLabelSize( m_rAntiImpl.GetOutputSizePixel() ); @@ -190,7 +190,7 @@ namespace svt //===================================================================== //= Roadmap //===================================================================== - //--------------------------------------------------------------------- + ORoadmap::ORoadmap( Window* _pParent, WinBits _nWinStyle ) :Control( _pParent, _nWinStyle ) ,m_pImpl( new RoadmapImpl( *this ) ) @@ -199,7 +199,7 @@ namespace svt implInit(); } - //--------------------------------------------------------------------- + void ORoadmap::implInit() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -231,7 +231,7 @@ namespace svt EnableMapMode( false ); } - //--------------------------------------------------------------------- + ORoadmap::~ORoadmap( ) { HL_Vector aItemsCopy = m_pImpl->getHyperLabels(); @@ -262,7 +262,7 @@ namespace svt } - //--------------------------------------------------------------------- + RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const OUString& _sLabel, ItemId _RMID, sal_Bool _bEnabled) { @@ -292,7 +292,7 @@ namespace svt return pItem; } - //--------------------------------------------------------------------- + void ORoadmap::SetRoadmapBitmap( const BitmapEx& _rBmp, sal_Bool _bInvalidate ) { m_pImpl->setPicture( _rBmp ); @@ -300,7 +300,7 @@ namespace svt Invalidate( ); } - //--------------------------------------------------------------------- + void ORoadmap::SetRoadmapInteractive( sal_Bool _bInteractive ) { m_pImpl->setInteractive( _bInteractive ); @@ -315,13 +315,13 @@ namespace svt } } - //--------------------------------------------------------------------- + sal_Bool ORoadmap::IsRoadmapInteractive() { return m_pImpl->isInteractive(); } - //--------------------------------------------------------------------- + void ORoadmap::SetRoadmapComplete( sal_Bool _bComplete ) { sal_Bool bWasComplete = m_pImpl->isComplete(); @@ -338,7 +338,7 @@ namespace svt m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), OUString("..."), RMINCOMPLETE ); } - //--------------------------------------------------------------------- + void ORoadmap::UpdatefollowingHyperLabels( ItemIndex _nIndex ) { const HL_Vector& rItems = m_pImpl->getHyperLabels(); @@ -364,7 +364,7 @@ namespace svt } } - //--------------------------------------------------------------------- + void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled ) { RoadmapItem* pItem = GetByIndex( _Index); @@ -376,13 +376,13 @@ namespace svt } } - //--------------------------------------------------------------------- + RoadmapTypes::ItemIndex ORoadmap::GetItemCount() const { return m_pImpl->getItemCount(); } - //--------------------------------------------------------------------- + RoadmapTypes::ItemId ORoadmap::GetItemID( ItemIndex _nIndex ) const { const RoadmapItem* pHyperLabel = GetByIndex( _nIndex ); @@ -391,7 +391,7 @@ namespace svt return -1; } - //--------------------------------------------------------------------- + void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ) { InsertHyperLabel( _Index, _RoadmapItem, _nUniqueId, _bEnabled ); @@ -399,7 +399,7 @@ namespace svt UpdatefollowingHyperLabels( _Index + 1 ); } - //--------------------------------------------------------------------- + void ORoadmap::DeleteRoadmapItem( ItemIndex _Index ) { if ( m_pImpl->getItemCount() > 0 && ( _Index > -1) && ( _Index < m_pImpl->getItemCount() ) ) @@ -409,13 +409,13 @@ namespace svt } } - //--------------------------------------------------------------------- + sal_Bool ORoadmap::IsRoadmapComplete( ) const { return m_pImpl->isComplete(); } - //--------------------------------------------------------------------- + void ORoadmap::EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex ) { RoadmapItem* pItem = GetByID( _nItemId, _nStartIndex ); @@ -423,7 +423,7 @@ namespace svt pItem->Enable( _bEnable ); } - //--------------------------------------------------------------------- + void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel, ItemIndex _nStartIndex ) { RoadmapItem* pItem = GetByID( _nID, _nStartIndex ); @@ -442,7 +442,7 @@ namespace svt } } - //--------------------------------------------------------------------- + void ORoadmap::ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex ) { RoadmapItem* pItem = GetByID( _nID, _nStartIndex ); @@ -450,7 +450,7 @@ namespace svt pItem->SetID( _NewID ); } - //--------------------------------------------------------------------- + RoadmapItem* ORoadmap::GetByID( ItemId _nID, ItemIndex _nStartIndex) { ItemId nLocID = 0; @@ -467,13 +467,13 @@ namespace svt return NULL; } - //--------------------------------------------------------------------- + const RoadmapItem* ORoadmap::GetByID( ItemId _nID, ItemIndex _nStartIndex ) const { return const_cast< ORoadmap* >( this )->GetByID( _nID, _nStartIndex ); } - //--------------------------------------------------------------------- + RoadmapItem* ORoadmap::GetByIndex( ItemIndex _nItemIndex) { const HL_Vector& rItems = m_pImpl->getHyperLabels(); @@ -484,13 +484,13 @@ namespace svt return NULL; } - //--------------------------------------------------------------------- + const RoadmapItem* ORoadmap::GetByIndex( ItemIndex _nItemIndex ) const { return const_cast< ORoadmap* >( this )->GetByIndex( _nItemIndex ); } - //--------------------------------------------------------------------- + RoadmapTypes::ItemId ORoadmap::GetNextAvailableItemId( ItemIndex _nNewIndex ) { RoadmapItem* pItem = NULL; @@ -507,7 +507,7 @@ namespace svt return -1; } - //--------------------------------------------------------------------- + RoadmapTypes::ItemId ORoadmap::GetPreviousAvailableItemId( ItemIndex _nNewIndex ) { RoadmapItem* pItem = NULL; @@ -523,7 +523,7 @@ namespace svt return -1; } - //--------------------------------------------------------------------- + void ORoadmap::DeselectOldRoadmapItems() { const HL_Vector& rItems = m_pImpl->getHyperLabels(); @@ -536,26 +536,26 @@ namespace svt } } - //--------------------------------------------------------------------- + void ORoadmap::SetItemSelectHdl( const Link& _rHdl ) { m_pImpl->setSelectHdl( _rHdl ); } - //--------------------------------------------------------------------- + Link ORoadmap::GetItemSelectHdl( ) const { return m_pImpl->getSelectHdl(); } - //--------------------------------------------------------------------- + void ORoadmap::Select() { GetItemSelectHdl().Call( this ); CallEventListeners( VCLEVENT_ROADMAP_ITEMSELECTED ); } - //--------------------------------------------------------------------- + void ORoadmap::GetFocus() { RoadmapItem* pCurHyperLabel = GetByID( GetCurrentRoadmapItemID() ); @@ -563,7 +563,7 @@ namespace svt pCurHyperLabel->GrabFocus(); } - //--------------------------------------------------------------------- + sal_Bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID ) { DeselectOldRoadmapItems(); @@ -585,7 +585,7 @@ namespace svt return sal_False; } - //--------------------------------------------------------------------- + void ORoadmap::Paint( const Rectangle& _rRect ) { Control::Paint( _rRect ); @@ -608,7 +608,7 @@ namespace svt DrawHeadline(); } - //--------------------------------------------------------------------- + void ORoadmap::DrawHeadline() { Point aTextPos = LogicToPixel( Point( ROADMAP_INDENT_X, 8 ), MAP_APPFONT ); @@ -623,7 +623,7 @@ namespace svt SetTextColor(rStyleSettings.GetFieldTextColor()); } - //--------------------------------------------------------------------- + RoadmapItem* ORoadmap::GetByPointer(Window* pWindow) { const HL_Vector& rItems = m_pImpl->getHyperLabels(); @@ -638,7 +638,7 @@ namespace svt return NULL; } - //--------------------------------------------------------------------- + bool ORoadmap::PreNotify( NotifyEvent& _rNEvt ) { // capture KeyEvents for taskpane cycling @@ -675,7 +675,7 @@ namespace svt return Window::PreNotify( _rNEvt ); } - //--------------------------------------------------------------------- + IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, _CurHyperLabel) { return SelectRoadmapItemByID( _CurHyperLabel->GetID() ); @@ -683,7 +683,7 @@ namespace svt - //--------------------------------------------------------------------- + void ORoadmap::DataChanged( const DataChangedEvent& rDCEvt ) { if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || @@ -707,7 +707,7 @@ namespace svt } - //--------------------------------------------------------------------- + RoadmapItem::RoadmapItem( ORoadmap& _rParent, const Size& _rItemPlayground ) :m_aItemPlayground( _rItemPlayground ) { @@ -718,40 +718,40 @@ namespace svt mpDescription->Show(); } - //--------------------------------------------------------------------- + bool RoadmapItem::Contains( const Window* _pWindow ) const { return ( mpID == _pWindow ) || ( mpDescription == _pWindow ); } - //--------------------------------------------------------------------- + void RoadmapItem::GrabFocus() { if ( mpDescription ) mpDescription->GrabFocus(); } - //--------------------------------------------------------------------- + void RoadmapItem::SetInteractive( sal_Bool _bInteractive ) { if ( mpDescription ) mpDescription->SetInteractive(_bInteractive); } - //--------------------------------------------------------------------- + void RoadmapItem::SetID( sal_Int16 _ID ) { if ( mpDescription ) mpDescription->SetID(_ID); } - //--------------------------------------------------------------------- + sal_Int16 RoadmapItem::GetID() const { return mpDescription ? mpDescription->GetID() : sal_Int16(-1); } - //--------------------------------------------------------------------- + void RoadmapItem::ImplUpdateIndex( const ItemIndex _nIndex ) { if ( mpDescription ) @@ -767,19 +767,19 @@ namespace svt ImplUpdatePosSize(); } - //--------------------------------------------------------------------- + void RoadmapItem::SetIndex( ItemIndex _Index ) { ImplUpdateIndex( _Index ); } - //--------------------------------------------------------------------- + RoadmapTypes::ItemIndex RoadmapItem::GetIndex() const { return mpDescription ? mpDescription->GetIndex() : ItemIndex(-1); } - //--------------------------------------------------------------------- + void RoadmapItem::SetPosition( RoadmapItem* _pOldItem ) { Point aIDPos; @@ -801,20 +801,20 @@ namespace svt mpDescription->SetPosPixel( Point( nDescPos, aIDPos.Y() ) ); } - //--------------------------------------------------------------------- + void RoadmapItem::Enable( sal_Bool _bEnable) { mpID->Enable(_bEnable); mpDescription->Enable(_bEnable); } - //--------------------------------------------------------------------- + sal_Bool RoadmapItem::IsEnabled() const { return mpID->IsEnabled(); } - //--------------------------------------------------------------------- + void RoadmapItem::ToggleBackgroundColor( const Color& _rGBColor ) { if (_rGBColor == COL_TRANSPARENT) @@ -830,7 +830,7 @@ namespace svt mpDescription->ToggleBackgroundColor(_rGBColor); } - //--------------------------------------------------------------------- + void RoadmapItem::ImplUpdatePosSize() { // calculate widths @@ -850,7 +850,7 @@ namespace svt mpDescription->SetSizePixel( aDescriptionSize ); } - //--------------------------------------------------------------------- + void RoadmapItem::Update( ItemIndex _RMIndex, const OUString& _rText ) { // update description label @@ -860,7 +860,7 @@ namespace svt ImplUpdateIndex( _RMIndex ); } - //--------------------------------------------------------------------- + RoadmapItem::~RoadmapItem( ) { { @@ -873,26 +873,26 @@ namespace svt } } - //--------------------------------------------------------------------- + void RoadmapItem::SetClickHdl( const Link& rLink ) { if ( mpDescription ) mpDescription->SetClickHdl( rLink); } - //--------------------------------------------------------------------- + IDLabel::IDLabel( Window* _pParent, WinBits _nWinStyle ) :FixedText( _pParent, _nWinStyle ) { } - //--------------------------------------------------------------------- + IDLabel::~IDLabel( ) { } - //--------------------------------------------------------------------- + void IDLabel::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 4975c83ba656..23e5d560ad69 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -32,7 +32,7 @@ using namespace ::rtl; using namespace ::com::sun::star; -//_____________________________________________________________________________ + class SvtScriptedTextHelper_Impl { @@ -307,7 +307,7 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) } -//_____________________________________________________________________________ + SvtScriptedTextHelper::SvtScriptedTextHelper( OutputDevice& _rOutDevice ) : mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice, NULL, NULL, NULL ) ) @@ -350,6 +350,6 @@ void SvtScriptedTextHelper::DrawText( const Point& _rPos ) } -//_____________________________________________________________________________ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 0c66ed7cd8dc..38c44b8445bc 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -38,7 +38,7 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) nColumnPixW = nLinePixH = GetSettings().GetStyleSettings().GetScrollBarSize(); } -//------------------------------------------------------------------- + ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits, ScrollableWindowFlags nFlags ) : @@ -50,7 +50,7 @@ ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits, ImpInitialize( nFlags ); } -// ----------------------------------------------------------------------- + void ScrollableWindow::Command( const CommandEvent& rCEvt ) { @@ -75,7 +75,7 @@ void ScrollableWindow::Command( const CommandEvent& rCEvt ) Window::Command( rCEvt ); } -//------------------------------------------------------------------- + void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -89,7 +89,7 @@ void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } -//------------------------------------------------------------------- + Size ScrollableWindow::GetOutputSizePixel() const { @@ -103,7 +103,7 @@ Size ScrollableWindow::GetOutputSizePixel() const return aSz; } -//------------------------------------------------------------------- + IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll ) { @@ -129,7 +129,7 @@ IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll ) return 0; } -//------------------------------------------------------------------- + IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll ) { @@ -150,7 +150,7 @@ IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll ) return 0; } -//------------------------------------------------------------------- + void ScrollableWindow::Resize() { @@ -272,19 +272,19 @@ void ScrollableWindow::Resize() } } -//------------------------------------------------------------------- + void ScrollableWindow::StartScroll() { } -//------------------------------------------------------------------- + void ScrollableWindow::EndScroll( long, long ) { } -//------------------------------------------------------------------- + void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode ) { @@ -293,7 +293,7 @@ void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode ) Window::SetMapMode( aMap ); } -//------------------------------------------------------------------- + MapMode ScrollableWindow::GetMapMode() const { @@ -302,7 +302,7 @@ MapMode ScrollableWindow::GetMapMode() const return aMap; } -//------------------------------------------------------------------- + void ScrollableWindow::SetTotalSize( const Size& rNewSize ) { @@ -310,7 +310,7 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize ) ScrollableWindow::Resize(); } -//------------------------------------------------------------------- + void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 ) { diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx index c966bebdba04..e73456b16682 100644 --- a/svtools/source/control/stdctrl.cxx +++ b/svtools/source/control/stdctrl.cxx @@ -27,7 +27,7 @@ FixedInfo::FixedInfo( Window* pParent, WinBits nWinStyle ) : { } -// ----------------------------------------------------------------------- + FixedInfo::FixedInfo( Window* pParent, const ResId& rResId ) : FixedText( pParent, rResId ) diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index a8c08377619d..34be090e5939 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -32,13 +32,13 @@ FontNameMenu::FontNameMenu() SetMenuFlags( GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS ); } -// ----------------------------------------------------------------------- + FontNameMenu::~FontNameMenu() { } -// ----------------------------------------------------------------------- + void FontNameMenu::Select() { @@ -46,7 +46,7 @@ void FontNameMenu::Select() maSelectHdl.Call( this ); } -// ----------------------------------------------------------------------- + void FontNameMenu::Highlight() { @@ -56,7 +56,7 @@ void FontNameMenu::Highlight() maCurName = aTempName; } -// ----------------------------------------------------------------------- + void FontNameMenu::Fill( const FontList* pList ) { @@ -87,7 +87,7 @@ void FontNameMenu::Fill( const FontList* pList ) SetCurName( maCurName ); } -// ----------------------------------------------------------------------- + void FontNameMenu::SetCurName(const OUString& rName) { @@ -124,7 +124,7 @@ FontSizeMenu::FontSizeMenu() SetMenuFlags( GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS ); } -// ----------------------------------------------------------------------- + FontSizeMenu::~FontSizeMenu() { @@ -132,7 +132,7 @@ FontSizeMenu::~FontSizeMenu() delete[] mpHeightAry; } -// ----------------------------------------------------------------------- + void FontSizeMenu::Select() { @@ -141,7 +141,7 @@ void FontSizeMenu::Select() maSelectHdl.Call( this ); } -// ----------------------------------------------------------------------- + void FontSizeMenu::Highlight() { @@ -158,7 +158,7 @@ void FontSizeMenu::Highlight() mnCurHeight = nTempHeight; } -// ----------------------------------------------------------------------- + void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList ) { @@ -226,7 +226,7 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList ) SetCurHeight( mnCurHeight ); } -// ----------------------------------------------------------------------- + void FontSizeMenu::SetCurHeight( long nHeight ) { diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 382ca95c879b..4e4ac1da29bb 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -93,9 +93,9 @@ struct ImplTabBarItem // ======================================================================= -// ----------------- + // - ImplTabButton - -// ----------------- + class ImplTabButton : public PushButton { @@ -146,9 +146,9 @@ bool ImplTabButton::PreNotify( NotifyEvent& rNEvt ) // ======================================================================= -// ---------------- + // - ImplTabSizer - -// ---------------- + class ImplTabSizer : public Window { @@ -168,7 +168,7 @@ private: long mnStartWidth; }; -// ----------------------------------------------------------------------- + ImplTabSizer::ImplTabSizer( TabBar* pParent, WinBits nWinStyle ) : Window( pParent, nWinStyle & WB_3DLOOK ) @@ -178,7 +178,7 @@ ImplTabSizer::ImplTabSizer( TabBar* pParent, WinBits nWinStyle ) SetSizePixel( Size( 7, 0 ) ); } -// ----------------------------------------------------------------------- + void ImplTabSizer::ImplTrack( const Point& rScreenPos ) { @@ -191,7 +191,7 @@ void ImplTabSizer::ImplTrack( const Point& rScreenPos ) pParent->Update(); } -// ----------------------------------------------------------------------- + void ImplTabSizer::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -209,7 +209,7 @@ void ImplTabSizer::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void ImplTabSizer::Tracking( const TrackingEvent& rTEvt ) { @@ -223,7 +223,7 @@ void ImplTabSizer::Tracking( const TrackingEvent& rTEvt ) ImplTrack( OutputToScreenPixel( rTEvt.GetMouseEvent().GetPosPixel() ) ); } -// ----------------------------------------------------------------------- + void ImplTabSizer::Paint( const Rectangle& ) { @@ -246,9 +246,9 @@ void ImplTabSizer::Paint( const Rectangle& ) // Is not named Impl. as it may be called or overloaded -// -------------- + // - TabBarEdit - -// -------------- + class TabBarEdit : public Edit { @@ -271,7 +271,7 @@ public: virtual void LoseFocus(); }; -// ----------------------------------------------------------------------- + TabBarEdit::TabBarEdit( TabBar* pParent, WinBits nWinStyle ) : Edit( pParent, nWinStyle ) @@ -279,7 +279,7 @@ TabBarEdit::TabBarEdit( TabBar* pParent, WinBits nWinStyle ) : mbPostEvt = sal_False; } -// ----------------------------------------------------------------------- + bool TabBarEdit::PreNotify( NotifyEvent& rNEvt ) { @@ -312,7 +312,7 @@ bool TabBarEdit::PreNotify( NotifyEvent& rNEvt ) return Edit::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + void TabBarEdit::LoseFocus() { @@ -325,7 +325,7 @@ void TabBarEdit::LoseFocus() Edit::LoseFocus(); } -// ----------------------------------------------------------------------- + IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel ) { @@ -346,7 +346,7 @@ IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl) { @@ -440,7 +440,7 @@ void TabBar::ImplInit( WinBits nWinStyle ) ImplInitSettings( sal_True, sal_True ); } -// ----------------------------------------------------------------------- + TabBar::TabBar( Window* pParent, WinBits nWinStyle ) : Window( pParent, (nWinStyle & WB_3DLOOK) | WB_CLIPCHILDREN ) @@ -449,7 +449,7 @@ TabBar::TabBar( Window* pParent, WinBits nWinStyle ) : maCurrentItemList = 0; } -// ----------------------------------------------------------------------- + TabBar::~TabBar() { @@ -472,7 +472,7 @@ TabBar::~TabBar() delete mpItemList; } -// ----------------------------------------------------------------------- + ImplTabBarItem* TabBar::seek( size_t i ) { if ( i < mpItemList->size() ) @@ -499,7 +499,7 @@ ImplTabBarItem* TabBar::next() return NULL; } -// ----------------------------------------------------------------------- + void TabBar::ImplInitSettings( sal_Bool bFont, sal_Bool bBackground ) { @@ -536,7 +536,7 @@ void TabBar::ImplInitSettings( sal_Bool bFont, sal_Bool bBackground ) } } -// ----------------------------------------------------------------------- + void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, Color& rSelectColor, Color& rSelectTextColor ) @@ -573,7 +573,7 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, } } -// ----------------------------------------------------------------------- + sal_Bool TabBar::ImplCalcWidth() { @@ -627,7 +627,7 @@ sal_Bool TabBar::ImplCalcWidth() return bChanged; } -// ----------------------------------------------------------------------- + void TabBar::ImplFormat() { @@ -675,7 +675,7 @@ void TabBar::ImplFormat() ImplEnableControls(); } -// ----------------------------------------------------------------------- + sal_uInt16 TabBar::ImplGetLastFirstPos() { @@ -697,7 +697,7 @@ sal_uInt16 TabBar::ImplGetLastFirstPos() return nLastFirstPos; } -// ----------------------------------------------------------------------- + void TabBar::ImplInitControls() { @@ -765,7 +765,7 @@ void TabBar::ImplInitControls() mbHasInsertTab = (mnWinStyle & WB_INSERTTAB); } -// ----------------------------------------------------------------------- + void TabBar::ImplEnableControls() { @@ -792,7 +792,7 @@ void TabBar::SetScrollAlwaysEnabled(bool bScrollAlwaysEnabled) ImplEnableControls(); } -// ----------------------------------------------------------------------- + void TabBar::ImplShowPage( sal_uInt16 nPos ) { @@ -816,7 +816,7 @@ void TabBar::ImplShowPage( sal_uInt16 nPos ) } } -// ----------------------------------------------------------------------- + IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn ) { @@ -849,7 +849,7 @@ IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn ) return 0; } -// ----------------------------------------------------------------------- + void TabBar::MouseMove( const MouseEvent& rMEvt ) { @@ -859,7 +859,7 @@ void TabBar::MouseMove( const MouseEvent& rMEvt ) Window::MouseMove( rMEvt ); } -// ----------------------------------------------------------------------- + void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -1063,7 +1063,7 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt ) Window::MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void TabBar::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -1072,7 +1072,7 @@ void TabBar::MouseButtonUp( const MouseEvent& rMEvt ) } -// ----------------------------------------------------------------------- + namespace { @@ -1464,7 +1464,7 @@ void TabBar::Paint( const Rectangle& rect ) } } -// ----------------------------------------------------------------------- + void TabBar::Resize() { Size aNewSize = GetOutputSizePixel(); @@ -1557,7 +1557,7 @@ void TabBar::Resize() ImplEnableControls(); } -// ----------------------------------------------------------------------- + void TabBar::RequestHelp( const HelpEvent& rHEvt ) { @@ -1625,7 +1625,7 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + void TabBar::StateChanged( StateChangedType nType ) { @@ -1661,7 +1661,7 @@ void TabBar::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void TabBar::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1677,7 +1677,7 @@ void TabBar::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void TabBar::ImplSelect() { @@ -1686,28 +1686,28 @@ void TabBar::ImplSelect() CallEventListeners( VCLEVENT_TABBAR_PAGESELECTED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)) ); } -// ----------------------------------------------------------------------- + void TabBar::Select() { maSelectHdl.Call( this ); } -// ----------------------------------------------------------------------- + void TabBar::DoubleClick() { maDoubleClickHdl.Call( this ); } -// ----------------------------------------------------------------------- + void TabBar::Split() { maSplitHdl.Call( this ); } -// ----------------------------------------------------------------------- + void TabBar::ImplActivatePage() { @@ -1716,14 +1716,14 @@ void TabBar::ImplActivatePage() CallEventListeners( VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)) ); } -// ----------------------------------------------------------------------- + void TabBar::ActivatePage() { maActivatePageHdl.Call( this ); } -// ----------------------------------------------------------------------- + long TabBar::ImplDeactivatePage() { @@ -1810,7 +1810,7 @@ Rectangle TabBar::ImplGetInsertTabRect(ImplTabBarItem* pItem) const return Rectangle(); } -// ----------------------------------------------------------------------- + long TabBar::DeactivatePage() { @@ -1820,7 +1820,7 @@ long TabBar::DeactivatePage() return sal_True; } -// ----------------------------------------------------------------------- + long TabBar::StartRenaming() { @@ -1830,7 +1830,7 @@ long TabBar::StartRenaming() return sal_True; } -// ----------------------------------------------------------------------- + long TabBar::AllowRenaming() { @@ -1840,21 +1840,21 @@ long TabBar::AllowRenaming() return sal_True; } -// ----------------------------------------------------------------------- + void TabBar::EndRenaming() { maEndRenamingHdl.Call( this ); } -// ----------------------------------------------------------------------- + void TabBar::Mirror() { } -// ----------------------------------------------------------------------- + void TabBar::InsertPage( sal_uInt16 nPageId, const OUString& rText, TabBarPageBits nBits, sal_uInt16 nPos ) @@ -1886,7 +1886,7 @@ void TabBar::InsertPage( sal_uInt16 nPageId, const OUString& rText, CallEventListeners( VCLEVENT_TABBAR_PAGEINSERTED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId)) ); } -// ----------------------------------------------------------------------- + Color TabBar::GetTabBgColor( sal_uInt16 nPageId ) const { @@ -1921,7 +1921,7 @@ void TabBar::SetTabBgColor( sal_uInt16 nPageId, const Color& aTabBgColor ) } } -// ----------------------------------------------------------------------- + void TabBar::RemovePage( sal_uInt16 nPageId ) { @@ -1951,7 +1951,7 @@ void TabBar::RemovePage( sal_uInt16 nPageId ) } } -// ----------------------------------------------------------------------- + void TabBar::MovePage( sal_uInt16 nPageId, sal_uInt16 nNewPos ) { @@ -1988,7 +1988,7 @@ void TabBar::MovePage( sal_uInt16 nPageId, sal_uInt16 nNewPos ) } } -// ----------------------------------------------------------------------- + void TabBar::Clear() { @@ -2011,7 +2011,7 @@ void TabBar::Clear() CallEventListeners( VCLEVENT_TABBAR_PAGEREMOVED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(PAGE_NOT_FOUND)) ); } -// ----------------------------------------------------------------------- + sal_Bool TabBar::IsPageEnabled( sal_uInt16 nPageId ) const { @@ -2023,7 +2023,7 @@ sal_Bool TabBar::IsPageEnabled( sal_uInt16 nPageId ) const return sal_False; } -// ----------------------------------------------------------------------- + void TabBar::SetPageBits( sal_uInt16 nPageId, TabBarPageBits nBits ) { @@ -2044,7 +2044,7 @@ void TabBar::SetPageBits( sal_uInt16 nPageId, TabBarPageBits nBits ) } } -// ----------------------------------------------------------------------- + TabBarPageBits TabBar::GetPageBits( sal_uInt16 nPageId ) const { @@ -2056,21 +2056,21 @@ TabBarPageBits TabBar::GetPageBits( sal_uInt16 nPageId ) const return sal_False; } -// ----------------------------------------------------------------------- + sal_uInt16 TabBar::GetPageCount() const { return (sal_uInt16)mpItemList->size(); } -// ----------------------------------------------------------------------- + sal_uInt16 TabBar::GetPageId( sal_uInt16 nPos ) const { return ( nPos < mpItemList->size() ) ? (*mpItemList)[ nPos ]->mnId : 0; } -// ----------------------------------------------------------------------- + sal_uInt16 TabBar::GetPagePos( sal_uInt16 nPageId ) const { @@ -2082,7 +2082,7 @@ sal_uInt16 TabBar::GetPagePos( sal_uInt16 nPageId ) const return PAGE_NOT_FOUND; } -// ----------------------------------------------------------------------- + sal_uInt16 TabBar::GetPageId( const Point& rPos, bool bCheckInsTab ) const { @@ -2103,7 +2103,7 @@ sal_uInt16 TabBar::GetPageId( const Point& rPos, bool bCheckInsTab ) const return 0; } -// ----------------------------------------------------------------------- + Rectangle TabBar::GetPageRect( sal_uInt16 nPageId ) const { @@ -2115,7 +2115,7 @@ Rectangle TabBar::GetPageRect( sal_uInt16 nPageId ) const return Rectangle(); } -// ----------------------------------------------------------------------- + void TabBar::SetCurPageId( sal_uInt16 nPageId ) { @@ -2201,7 +2201,7 @@ void TabBar::SetCurPageId( sal_uInt16 nPageId ) } } -// ----------------------------------------------------------------------- + void TabBar::MakeVisible( sal_uInt16 nPageId ) { @@ -2251,7 +2251,7 @@ void TabBar::MakeVisible( sal_uInt16 nPageId ) } } -// ----------------------------------------------------------------------- + void TabBar::SetFirstPageId( sal_uInt16 nPageId ) { @@ -2285,7 +2285,7 @@ void TabBar::SetFirstPageId( sal_uInt16 nPageId ) } } -// ----------------------------------------------------------------------- + void TabBar::SelectPage( sal_uInt16 nPageId, sal_Bool bSelect ) { @@ -2306,7 +2306,7 @@ void TabBar::SelectPage( sal_uInt16 nPageId, sal_Bool bSelect ) } } -// ----------------------------------------------------------------------- + sal_uInt16 TabBar::GetSelectPageCount() const { @@ -2321,7 +2321,7 @@ sal_uInt16 TabBar::GetSelectPageCount() const return nSelected; } -// ----------------------------------------------------------------------- + sal_Bool TabBar::IsPageSelected( sal_uInt16 nPageId ) const { @@ -2332,7 +2332,7 @@ sal_Bool TabBar::IsPageSelected( sal_uInt16 nPageId ) const return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool TabBar::StartEditMode( sal_uInt16 nPageId ) { @@ -2399,7 +2399,7 @@ sal_Bool TabBar::StartEditMode( sal_uInt16 nPageId ) } } -// ----------------------------------------------------------------------- + void TabBar::EndEditMode( sal_Bool bCancel ) { @@ -2442,7 +2442,7 @@ void TabBar::EndEditMode( sal_Bool bCancel ) } } -// ----------------------------------------------------------------------- + void TabBar::SetMirrored(bool bMirrored) { @@ -2466,7 +2466,7 @@ bool TabBar::IsEffectiveRTL() const return IsMirrored() != Application::GetSettings().GetLayoutRTL(); } -// ----------------------------------------------------------------------- + void TabBar::SetMaxPageWidth( long nMaxWidth ) { @@ -2481,7 +2481,7 @@ void TabBar::SetMaxPageWidth( long nMaxWidth ) } } -// ----------------------------------------------------------------------- + void TabBar::SetPageText( sal_uInt16 nPageId, const OUString& rText ) { @@ -2499,7 +2499,7 @@ void TabBar::SetPageText( sal_uInt16 nPageId, const OUString& rText ) } } -// ----------------------------------------------------------------------- + OUString TabBar::GetPageText( sal_uInt16 nPageId ) const { @@ -2509,7 +2509,7 @@ OUString TabBar::GetPageText( sal_uInt16 nPageId ) const return OUString(); } -// ----------------------------------------------------------------------- + OUString TabBar::GetHelpText( sal_uInt16 nPageId ) const { @@ -2529,7 +2529,7 @@ OUString TabBar::GetHelpText( sal_uInt16 nPageId ) const return OUString(); } -// ----------------------------------------------------------------------- + OString TabBar::GetHelpId( sal_uInt16 nPageId ) const { @@ -2540,7 +2540,7 @@ OString TabBar::GetHelpId( sal_uInt16 nPageId ) const return aRet; } -// ----------------------------------------------------------------------- + sal_Bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) { @@ -2585,7 +2585,7 @@ sal_Bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) return sal_True; } -// ----------------------------------------------------------------------- + sal_uInt16 TabBar::ShowDropPos( const Point& rPos ) { @@ -2691,7 +2691,7 @@ sal_uInt16 TabBar::ShowDropPos( const Point& rPos ) return mnDropPos; } -// ----------------------------------------------------------------------- + void TabBar::HideDropPos() { @@ -2731,7 +2731,7 @@ void TabBar::HideDropPos() } } -// ----------------------------------------------------------------------- + sal_Bool TabBar::SwitchPage( const Point& rPos ) { @@ -2771,7 +2771,7 @@ sal_Bool TabBar::SwitchPage( const Point& rPos ) return bSwitch; } -// ----------------------------------------------------------------------- + void TabBar::EndSwitchPage() { @@ -2779,7 +2779,7 @@ void TabBar::EndSwitchPage() mnSwitchId = 0; } -// ----------------------------------------------------------------------- + void TabBar::SetStyle( WinBits nStyle ) { @@ -2790,7 +2790,7 @@ void TabBar::SetStyle( WinBits nStyle ) Resize(); } -// ----------------------------------------------------------------------- + Size TabBar::CalcWindowSizePixel() const { @@ -2809,20 +2809,20 @@ Size TabBar::CalcWindowSizePixel() const return Size( nWidth, GetSettings().GetStyleSettings().GetScrollBarSize() ); } -// ----------------------------------------------------------------------- + Rectangle TabBar::GetPageArea() const { return Rectangle( Point( mnOffX, mnOffY ), Size( mnLastOffX-mnOffX+1, GetSizePixel().Height()-mnOffY ) ); } -// ----------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > TabBar::CreateAccessible() { return mpImpl->maAccessibleFactory.getFactory().createAccessibleTabBar( *this ); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index a6965112c8e8..270bff895259 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::accessibility; namespace svtools { -// -------------------------------------------------------------------- + static Window* GetTopMostParentSystemWindow( Window* pWindow ) { @@ -64,7 +64,7 @@ static Window* GetTopMostParentSystemWindow( Window* pWindow ) return NULL; } -// -------------------------------------------------------------------- + void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits ) { @@ -79,7 +79,7 @@ void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits ) mpControl = NULL; } -// -------------------------------------------------------------------- + ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& rText, MenuItemBits nBits ) : mrMenu( rMenu ) @@ -90,7 +90,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUSt mbHasText = true; } -// -------------------------------------------------------------------- + ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const OUString& rText, MenuItemBits nBits ) : mrMenu( rMenu ) @@ -104,7 +104,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Imag mbHasImage = true; } -// -------------------------------------------------------------------- + ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* pControl, MenuItemBits nBits ) : mrMenu( rMenu ) @@ -118,7 +118,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* p } } -// -------------------------------------------------------------------- + ToolbarMenuEntry::~ToolbarMenuEntry() { @@ -132,7 +132,7 @@ ToolbarMenuEntry::~ToolbarMenuEntry() delete mpControl; } -// -------------------------------------------------------------------- + const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible( bool bCreate /* = false */ ) { @@ -151,7 +151,7 @@ const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible( bool bCr return mxAccContext; } -// -------------------------------------------------------------------- + sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException) { @@ -166,7 +166,7 @@ sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException) return 1; } -// -------------------------------------------------------------------- + Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -188,7 +188,7 @@ Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) throw IndexOutOfBoundsException(); } -// -------------------------------------------------------------------- + ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) : mrMenu( rMenu ) @@ -202,14 +202,14 @@ ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star:: { } -// -------------------------------------------------------------------- + ToolbarMenu_Impl::~ToolbarMenu_Impl() { setAccessible( 0 ); } -// -------------------------------------------------------------------- + void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible ) { @@ -222,7 +222,7 @@ void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible ) } } -// ----------------------------------------------------------------------- + void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ) { @@ -230,14 +230,14 @@ void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const ::com::sun::st mxAccessible->FireAccessibleEvent( nEventId, rOldValue, rNewValue ); } -// ----------------------------------------------------------------------- + bool ToolbarMenu_Impl::hasAccessibleListeners() { return( mxAccessible.is() && mxAccessible->HasAccessibleListeners() ); } -// -------------------------------------------------------------------- + sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) { @@ -262,7 +262,7 @@ sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) return nCount; } -// -------------------------------------------------------------------- + Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -284,7 +284,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw IndexOutOfBoundsException(); } -// -------------------------------------------------------------------- + Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -301,7 +301,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl throw IndexOutOfBoundsException(); } -// -------------------------------------------------------------------- + void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -332,7 +332,7 @@ void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (Ind throw IndexOutOfBoundsException(); } -// -------------------------------------------------------------------- + sal_Bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -366,7 +366,7 @@ sal_Bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) th throw IndexOutOfBoundsException(); } -// -------------------------------------------------------------------- + void ToolbarMenu_Impl::clearAccessibleSelection() { @@ -378,7 +378,7 @@ void ToolbarMenu_Impl::clearAccessibleSelection() } -// -------------------------------------------------------------------- + void ToolbarMenu_Impl::notifyHighlightedEntry() { @@ -415,7 +415,7 @@ void ToolbarMenu_Impl::notifyHighlightedEntry() } } -// -------------------------------------------------------------------- + ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const { @@ -426,7 +426,7 @@ ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const } -// -------------------------------------------------------------------- + IMPL_LINK( ToolbarMenu, HighlightHdl, Control *, pControl ) { @@ -443,7 +443,7 @@ ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWind implInit(rFrame); } -// -------------------------------------------------------------------- + ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, const ResId& rResId ) : DockingWindow(pParentWindow, rResId) @@ -451,7 +451,7 @@ ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWind implInit(rFrame); } -// -------------------------------------------------------------------- + void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) { @@ -467,7 +467,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } -// -------------------------------------------------------------------- + ToolbarMenu::~ToolbarMenu() { @@ -492,7 +492,7 @@ ToolbarMenu::~ToolbarMenu() delete mpImpl; } -// -------------------------------------------------------------------- + int ToolbarMenu::getSelectedEntryId() const { @@ -500,7 +500,7 @@ int ToolbarMenu::getSelectedEntryId() const return pEntry ? pEntry->mnEntryId : -1; } -// -------------------------------------------------------------------- + int ToolbarMenu::getHighlightedEntryId() const { @@ -508,7 +508,7 @@ int ToolbarMenu::getHighlightedEntryId() const return pEntry ? pEntry->mnEntryId : -1; } -// -------------------------------------------------------------------- + void ToolbarMenu::checkEntry( int nEntryId, bool bChecked ) { @@ -520,7 +520,7 @@ void ToolbarMenu::checkEntry( int nEntryId, bool bChecked ) } } -// -------------------------------------------------------------------- + void ToolbarMenu::enableEntry( int nEntryId, bool bEnable ) { @@ -539,7 +539,7 @@ void ToolbarMenu::enableEntry( int nEntryId, bool bEnable ) } } -// -------------------------------------------------------------------- + void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr ) { @@ -553,7 +553,7 @@ void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr ) } } -// -------------------------------------------------------------------- + void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage ) { @@ -567,7 +567,7 @@ void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage ) } } -// -------------------------------------------------------------------- + void ToolbarMenu::initWindow() { @@ -582,7 +582,7 @@ void ToolbarMenu::initWindow() mpImpl->maSize = implCalcSize(); } -// -------------------------------------------------------------------- + static long ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) { @@ -765,14 +765,14 @@ Size ToolbarMenu::implCalcSize() return aSz; } -// -------------------------------------------------------------------- + void ToolbarMenu::highlightFirstEntry() { implChangeHighlightEntry( 0 ); } -// -------------------------------------------------------------------- + void ToolbarMenu::GetFocus() { @@ -782,7 +782,7 @@ void ToolbarMenu::GetFocus() DockingWindow::GetFocus(); } -// -------------------------------------------------------------------- + void ToolbarMenu::LoseFocus() { @@ -792,28 +792,28 @@ void ToolbarMenu::LoseFocus() DockingWindow::LoseFocus(); } -// -------------------------------------------------------------------- + void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, rStr, nItemBits ) ); } -// -------------------------------------------------------------------- + void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, rImage, rStr, nItemBits ) ); } -// -------------------------------------------------------------------- + void ToolbarMenu::appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, pControl, nItemBits ) ); } -// -------------------------------------------------------------------- + void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry ) { @@ -823,14 +823,14 @@ void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry ) Invalidate(); } -// -------------------------------------------------------------------- + void ToolbarMenu::appendSeparator() { appendEntry( 0 ); } -// -------------------------------------------------------------------- + /** creates an empty ValueSet that is initialized and can be inserted with appendEntry. */ ValueSet* ToolbarMenu::createEmptyValueSetControl() @@ -842,14 +842,14 @@ ValueSet* ToolbarMenu::createEmptyValueSetControl() return pSet; } -// -------------------------------------------------------------------- + ToolbarMenuEntry* ToolbarMenu::implGetEntry( int nEntry ) const { return mpImpl->implGetEntry( nEntry ); } -// -------------------------------------------------------------------- + ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const { @@ -867,7 +867,7 @@ ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const return NULL; } -// -------------------------------------------------------------------- + void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight ) { @@ -962,7 +962,7 @@ void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight ) } } -// -------------------------------------------------------------------- + void ToolbarMenu::implSelectEntry( int nSelectedEntry ) { @@ -976,7 +976,7 @@ void ToolbarMenu::implSelectEntry( int nSelectedEntry ) mpImpl->maSelectHdl.Call( this ); } -// -------------------------------------------------------------------- + void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -985,13 +985,13 @@ void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt ) implSelectEntry( mpImpl->mnHighlightedEntry ); } -// -------------------------------------------------------------------- + void ToolbarMenu::MouseButtonUp( const MouseEvent& ) { } -// -------------------------------------------------------------------- + void ToolbarMenu::MouseMove( const MouseEvent& rMEvt ) { @@ -1001,7 +1001,7 @@ void ToolbarMenu::MouseMove( const MouseEvent& rMEvt ) implHighlightEntry( rMEvt, false ); } -// -------------------------------------------------------------------- + void ToolbarMenu::implHighlightEntry( const MouseEvent& rMEvt, bool /*bMBDown*/ ) { @@ -1048,7 +1048,7 @@ void ToolbarMenu::implHighlightEntry( const MouseEvent& rMEvt, bool /*bMBDown*/ } } -// -------------------------------------------------------------------- + void ToolbarMenu::implChangeHighlightEntry( int nEntry ) { @@ -1068,7 +1068,7 @@ void ToolbarMenu::implChangeHighlightEntry( int nEntry ) mpImpl->notifyHighlightedEntry(); } -// -------------------------------------------------------------------- + static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLastColumn ) { @@ -1098,7 +1098,7 @@ static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLa return false; } -// -------------------------------------------------------------------- + ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd ) { @@ -1176,7 +1176,7 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd ) return 0; } -// -------------------------------------------------------------------- + void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl ) { @@ -1209,7 +1209,7 @@ void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl } } -// -------------------------------------------------------------------- + void ToolbarMenu::KeyInput( const KeyEvent& rKEvent ) { @@ -1288,7 +1288,7 @@ void ToolbarMenu::KeyInput( const KeyEvent& rKEvent ) } -// -------------------------------------------------------------------- + static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) { sal_Bool bNativeOk = sal_False; @@ -1493,7 +1493,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted ) } } -// -------------------------------------------------------------------- + void ToolbarMenu::Paint( const Rectangle& ) { @@ -1505,14 +1505,14 @@ void ToolbarMenu::Paint( const Rectangle& ) implHighlightEntry( mpImpl->mnHighlightedEntry, true ); } -// -------------------------------------------------------------------- + void ToolbarMenu::RequestHelp( const HelpEvent& rHEvt ) { DockingWindow::RequestHelp( rHEvt ); } -// -------------------------------------------------------------------- + void ToolbarMenu::StateChanged( StateChangedType nType ) { @@ -1525,7 +1525,7 @@ void ToolbarMenu::StateChanged( StateChangedType nType ) } } -// -------------------------------------------------------------------- + void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1541,7 +1541,7 @@ void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) } } -// -------------------------------------------------------------------- + void ToolbarMenu::Command( const CommandEvent& rCEvt ) { @@ -1555,7 +1555,7 @@ void ToolbarMenu::Command( const CommandEvent& rCEvt ) } } -// -------------------------------------------------------------------- + Reference< ::com::sun::star::accessibility::XAccessible > ToolbarMenu::CreateAccessible() { @@ -1563,7 +1563,7 @@ Reference< ::com::sun::star::accessibility::XAccessible > ToolbarMenu::CreateAcc return Reference< XAccessible >( mpImpl->mxAccessible.get() ); } -// -------------------------------------------------------------------- + // todo: move to new base class that will replace SfxPopupWindo void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) @@ -1572,14 +1572,14 @@ void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) mpImpl->mxStatusListener->addStatusListener( rCommandURL ); } -// -------------------------------------------------------------------- + // XStatusListener (subclasses must override this one to get the status updates void SAL_CALL ToolbarMenu::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& /*Event*/ ) throw ( ::com::sun::star::uno::RuntimeException ) { } -// -------------------------------------------------------------------- + class ToolbarMenuStatusListener : public svt::FrameStatusListener { @@ -1593,7 +1593,7 @@ public: ToolbarMenu* mpMenu; }; -// -------------------------------------------------------------------- + ToolbarMenuStatusListener::ToolbarMenuStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, @@ -1603,7 +1603,7 @@ ToolbarMenuStatusListener::ToolbarMenuStatusListener( { } -// -------------------------------------------------------------------- + void SAL_CALL ToolbarMenuStatusListener::dispose() throw (::com::sun::star::uno::RuntimeException) { @@ -1611,7 +1611,7 @@ void SAL_CALL ToolbarMenuStatusListener::dispose() throw (::com::sun::star::uno: svt::FrameStatusListener::dispose(); } -// -------------------------------------------------------------------- + void SAL_CALL ToolbarMenuStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) { @@ -1619,7 +1619,7 @@ void SAL_CALL ToolbarMenuStatusListener::statusChanged( const ::com::sun::star:: mpMenu->statusChanged( Event ); } -// -------------------------------------------------------------------- + void ToolbarMenu::initStatusListener() { @@ -1627,35 +1627,35 @@ void ToolbarMenu::initStatusListener() mpImpl->mxStatusListener.set( new ToolbarMenuStatusListener( mpImpl->mxFrame, *this ) ); } -// -------------------------------------------------------------------- + bool ToolbarMenu::IsInPopupMode() { return GetDockingManager()->IsInPopupMode(this); } -// -------------------------------------------------------------------- + void ToolbarMenu::EndPopupMode() { GetDockingManager()->EndPopupMode(this); } -// -------------------------------------------------------------------- + const Size& ToolbarMenu::getMenuSize() const { return mpImpl->maSize; } -// -------------------------------------------------------------------- + void ToolbarMenu::SetSelectHdl( const Link& rLink ) { mpImpl->maSelectHdl = rLink; } -// -------------------------------------------------------------------- + } diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 0a9036614c27..398d38aaa086 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -39,9 +39,9 @@ using namespace ::com::sun::star::accessibility; namespace svtools { -// ------------------ + // - ToolbarMenuAcc - -// ------------------ + ToolbarMenuAcc::ToolbarMenuAcc( ToolbarMenu_Impl& rParent ) : ToolbarMenuAccComponentBase(m_aMutex) @@ -51,7 +51,7 @@ ToolbarMenuAcc::ToolbarMenuAcc( ToolbarMenu_Impl& rParent ) mpParent->mrMenu.AddEventListener( LINK( this, ToolbarMenuAcc, WindowEventListener ) ); } -// ----------------------------------------------------------------------------- + ToolbarMenuAcc::~ToolbarMenuAcc() { @@ -59,7 +59,7 @@ ToolbarMenuAcc::~ToolbarMenuAcc() mpParent->mrMenu.RemoveEventListener( LINK( this, ToolbarMenuAcc, WindowEventListener ) ); } -// ----------------------------------------------------------------------- + IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclSimpleEvent*, pEvent ) { @@ -80,7 +80,7 @@ IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclSimpleEvent*, pEvent ) return 0; } -// ----------------------------------------------------------------------- + void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -117,7 +117,7 @@ void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -// ----------------------------------------------------------------------- + void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue, const Any& rNewValue ) { @@ -145,7 +145,7 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue, } } -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() throw (RuntimeException) { @@ -153,7 +153,7 @@ Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() return this; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeException) { @@ -163,7 +163,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeExcep return mpParent->getAccessibleChildCount(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -173,7 +173,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 return mpParent->getAccessibleChild(i); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (RuntimeException) { @@ -189,7 +189,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R return xRet; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeException) { @@ -209,7 +209,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx return 0; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException) { @@ -217,7 +217,7 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException) return AccessibleRole::LIST; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException) { @@ -225,7 +225,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeExcep return OUString( "ToolbarMenu" ); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException) { @@ -246,7 +246,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException) return aRet; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelationSet() throw (RuntimeException) { @@ -254,7 +254,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelati return Reference< XAccessibleRelationSet >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet() throw (RuntimeException) { @@ -274,7 +274,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet( return pStateSet; } -// ----------------------------------------------------------------------------- + Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -295,7 +295,7 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException) { @@ -320,7 +320,7 @@ void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAcce } } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException) { @@ -335,7 +335,7 @@ void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XA } } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException) { @@ -347,7 +347,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) thro return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint ); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { @@ -379,7 +379,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw return xRet; } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException) { @@ -397,7 +397,7 @@ awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException) return aRet; } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException) { @@ -407,7 +407,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException) return awt::Point( aOutPos.X(), aOutPos.Y() ); } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() throw (RuntimeException) { @@ -417,7 +417,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() throw (RuntimeExcepti return awt::Point( aScreenPos.X(), aScreenPos.Y() ); } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException) { @@ -427,7 +427,7 @@ awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException) return awt::Size( aOutSize.Width(), aOutSize.Height() ); } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException) { @@ -436,7 +436,7 @@ void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException) mpParent->mrMenu.GrabFocus(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL ToolbarMenuAcc::getAccessibleKeyBinding() throw (RuntimeException) { @@ -444,7 +444,7 @@ Any SAL_CALL ToolbarMenuAcc::getAccessibleKeyBinding() throw (RuntimeException) return Any(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() throw (RuntimeException) { @@ -453,7 +453,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() throw (RuntimeException) return static_cast<sal_Int32>(nColor); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException) { @@ -462,7 +462,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException) return static_cast<sal_Int32>(nColor); } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -472,7 +472,7 @@ void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) thr mpParent->selectAccessibleChild( nChildIndex ); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -481,7 +481,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildInd return mpParent->isAccessibleChildSelected( nChildIndex ); } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException) { @@ -490,7 +490,7 @@ void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException mpParent->clearAccessibleSelection(); } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeException) { @@ -498,7 +498,7 @@ void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeExcept // unsupported due to single selection only } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (RuntimeException) { @@ -508,7 +508,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (Runt return mpParent->mnHighlightedEntry != -1 ? 1 : 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -533,7 +533,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sa throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -545,7 +545,7 @@ void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) t mpParent->clearAccessibleSelection(); } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuAcc::disposing (void) { @@ -589,9 +589,9 @@ void ToolbarMenuAcc::ThrowIfDisposed (void) throw (DisposedException) } } -// ----------------------- + // - ToolbarMenuEntryAcc - -// ----------------------- + ToolbarMenuEntryAcc::ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent ) : ToolbarMenuEntryAccBase( m_aMutex ) @@ -599,13 +599,13 @@ ToolbarMenuEntryAcc::ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent ) { } -// ----------------------------------------------------------------------------- + ToolbarMenuEntryAcc::~ToolbarMenuEntryAcc() { } -// ----------------------------------------------------------------------- + void SAL_CALL ToolbarMenuEntryAcc::disposing (void) { @@ -640,28 +640,28 @@ void SAL_CALL ToolbarMenuEntryAcc::disposing (void) ++aListenerIterator; } } -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL ToolbarMenuEntryAcc::getAccessibleContext() throw (RuntimeException) { return this; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleChildCount() throw (RuntimeException) { return 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException) { throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() throw (RuntimeException) { @@ -674,7 +674,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() thr return xRet; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (RuntimeException) { @@ -706,21 +706,21 @@ sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (Runt return nIndexInParent; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeException) { return AccessibleRole::LIST_ITEM; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException) { return OUString(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException) { @@ -741,14 +741,14 @@ OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeExcepti return aRet; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleRelationSet() throw (RuntimeException) { return Reference< XAccessibleRelationSet >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet() throw (RuntimeException) { @@ -775,7 +775,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat return pStateSet; } -// ----------------------------------------------------------------------------- + Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -794,7 +794,7 @@ Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleCompone return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException) { @@ -813,7 +813,7 @@ void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< } } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException) { @@ -827,7 +827,7 @@ void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Referenc } } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException) { @@ -838,7 +838,7 @@ sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint ); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) { @@ -846,7 +846,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( con return xRet; } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException) { @@ -870,7 +870,7 @@ awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException return aRet; } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException) { @@ -878,7 +878,7 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException) return awt::Point( aRect.X, aRect.Y ); } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeException) { @@ -896,7 +896,7 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeExc return aRet; } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException) { @@ -909,28 +909,28 @@ awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException) return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ToolbarMenuEntryAcc::grabFocus() throw (RuntimeException) { // nothing to do } -// ----------------------------------------------------------------------------- + Any SAL_CALL ToolbarMenuEntryAcc::getAccessibleKeyBinding() throw (RuntimeException) { return Any(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getForeground( ) throw (RuntimeException) { return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetMenuTextColor().GetColor()); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getBackground( ) throw (RuntimeException) { diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index d526a68e2e1a..ab11ade6263e 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -30,7 +30,7 @@ namespace svt //===================================================================== //= OFileURLControl //===================================================================== - //--------------------------------------------------------------------- + OFileURLControl::OFileURLControl(Window* _pParent, const ResId& _rId) : SvtURLBox(_pParent, _rId, INET_PROT_FILE) { @@ -52,7 +52,7 @@ namespace svt return pListBox; } - //--------------------------------------------------------------------- + bool OFileURLControl::PreNotify( NotifyEvent& _rNEvt ) { if (GetSubEdit() == _rNEvt.GetWindow()) @@ -64,7 +64,7 @@ namespace svt return SvtURLBox::PreNotify(_rNEvt); } - //--------------------------------------------------------------------- + bool OFileURLControl::Notify( NotifyEvent& _rNEvt ) { if (GetSubEdit() == _rNEvt.GetWindow()) diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 098ee4b58fb6..fdcdec9f9cd2 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -31,9 +31,9 @@ using namespace ::com::sun::star; -// ---------------- + // - ValueSetItem - -// ---------------- + ValueSetItem::ValueSetItem( ValueSet& rParent ) : mrParent(rParent) @@ -46,7 +46,7 @@ ValueSetItem::ValueSetItem( ValueSet& rParent ) { } -// ----------------------------------------------------------------------- + ValueSetItem::~ValueSetItem() { @@ -57,7 +57,7 @@ ValueSetItem::~ValueSetItem() } } -// ----------------------------------------------------------------------- + uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool bIsTransientChildrenDisabled ) { @@ -67,9 +67,9 @@ uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool b return *mpxAcc; } -// --------------- + // - ValueSetAcc - -// --------------- + ValueSetAcc::ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled ) : ValueSetAccComponentBase (m_aMutex), @@ -79,13 +79,13 @@ ValueSetAcc::ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled ) { } -// ----------------------------------------------------------------------------- + ValueSetAcc::~ValueSetAcc() { } -// ----------------------------------------------------------------------- + void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) { @@ -123,7 +123,7 @@ const uno::Sequence< sal_Int8 >& ValueSetAcc::getUnoTunnelId() return theValueSetAccUnoTunnelId::get().getSeq(); } -// ----------------------------------------------------------------------------- + ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) throw() @@ -140,7 +140,7 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa } -// ----------------------------------------------------------------------------- + void ValueSetAcc::GetFocus (void) { @@ -154,7 +154,7 @@ void ValueSetAcc::GetFocus (void) aOldState, aNewState); } -// ----------------------------------------------------------------------------- + void ValueSetAcc::LoseFocus (void) { @@ -168,7 +168,7 @@ void ValueSetAcc::LoseFocus (void) aOldState, aNewState); } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAccessibleContext() throw (uno::RuntimeException) @@ -177,7 +177,7 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAcc return this; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() throw (uno::RuntimeException) @@ -191,7 +191,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() return nCount; } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -209,7 +209,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible return xRet; } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleParent() throw (uno::RuntimeException) @@ -225,7 +225,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible return xRet; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() throw (uno::RuntimeException) @@ -252,7 +252,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() return nRet; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() throw (uno::RuntimeException) @@ -265,7 +265,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() : accessibility::AccessibleRole::LIST ); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL ValueSetAcc::getAccessibleDescription() throw (uno::RuntimeException) @@ -277,7 +277,7 @@ OUString SAL_CALL ValueSetAcc::getAccessibleDescription() return aRet; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL ValueSetAcc::getAccessibleName() throw (uno::RuntimeException) @@ -304,7 +304,7 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName() return aRet; } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::getAccessibleRelationSet() throw (uno::RuntimeException) @@ -337,7 +337,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge return xRelSet; } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAccessibleStateSet() throw (uno::RuntimeException) @@ -359,7 +359,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAc return pStateSet; } -// ----------------------------------------------------------------------------- + lang::Locale SAL_CALL ValueSetAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException) @@ -381,7 +381,7 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale() return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException) @@ -407,7 +407,7 @@ void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< acc } } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException) @@ -425,7 +425,7 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< } } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) throw (uno::RuntimeException) @@ -438,7 +438,7 @@ sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint ); } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (uno::RuntimeException) @@ -462,7 +462,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible return xRet; } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL ValueSetAcc::getBounds() throw (uno::RuntimeException) @@ -481,7 +481,7 @@ awt::Rectangle SAL_CALL ValueSetAcc::getBounds() return aRet; } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL ValueSetAcc::getLocation() throw (uno::RuntimeException) @@ -496,7 +496,7 @@ awt::Point SAL_CALL ValueSetAcc::getLocation() return aRet; } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() throw (uno::RuntimeException) @@ -512,7 +512,7 @@ awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() return aRet; } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL ValueSetAcc::getSize() throw (uno::RuntimeException) @@ -527,7 +527,7 @@ awt::Size SAL_CALL ValueSetAcc::getSize() return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueSetAcc::grabFocus() throw (uno::RuntimeException) @@ -537,7 +537,7 @@ void SAL_CALL ValueSetAcc::grabFocus() mpParent->GrabFocus(); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL ValueSetAcc::getAccessibleKeyBinding() throw (uno::RuntimeException) @@ -546,7 +546,7 @@ uno::Any SAL_CALL ValueSetAcc::getAccessibleKeyBinding() return uno::Any(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueSetAcc::getForeground( ) throw (uno::RuntimeException) @@ -556,7 +556,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getForeground( ) return static_cast<sal_Int32>(nColor); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueSetAcc::getBackground( ) throw (uno::RuntimeException) @@ -566,7 +566,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -584,7 +584,7 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw lang::IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -602,7 +602,7 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex return bRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueSetAcc::clearAccessibleSelection() throw (uno::RuntimeException) @@ -612,7 +612,7 @@ void SAL_CALL ValueSetAcc::clearAccessibleSelection() mpParent->SetNoSelection(); } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() throw (uno::RuntimeException) @@ -621,7 +621,7 @@ void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() // unsupported due to single selection only } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() throw (uno::RuntimeException) @@ -641,7 +641,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() return nRet; } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -661,7 +661,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc return xRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -674,7 +674,7 @@ void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) mpParent->SetNoSelection(); } -// ----------------------------------------------------------------------------- + sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException ) { @@ -787,9 +787,9 @@ bool ValueSetAcc::HasNoneField (void) const -// ---------------- + // - ValueItemAcc - -// ---------------- + ValueItemAcc::ValueItemAcc( ValueSetItem* pParent, bool bIsTransientChildrenDisabled ) : mpParent( pParent ), @@ -797,13 +797,13 @@ ValueItemAcc::ValueItemAcc( ValueSetItem* pParent, bool bIsTransientChildrenDisa { } -// ----------------------------------------------------------------------------- + ValueItemAcc::~ValueItemAcc() { } -// ----------------------------------------------------------------------- + void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) { @@ -825,7 +825,7 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu } } -// ----------------------------------------------------------------------------- + void ValueItemAcc::ParentDestroyed() { @@ -843,7 +843,7 @@ const uno::Sequence< sal_Int8 >& ValueItemAcc::getUnoTunnelId() return theValueItemAccUnoTunnelId::get().getSeq(); } -// ----------------------------------------------------------------------------- + ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) throw() @@ -859,7 +859,7 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter } } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAccessibleContext() throw (uno::RuntimeException) @@ -867,7 +867,7 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAc return this; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() throw (uno::RuntimeException) @@ -875,7 +875,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() return 0; } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -883,7 +883,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl throw lang::IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleParent() throw (uno::RuntimeException) @@ -897,7 +897,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl return xRet; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() throw (uno::RuntimeException) @@ -948,7 +948,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() return nIndexInParent; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() throw (uno::RuntimeException) @@ -956,7 +956,7 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() return accessibility::AccessibleRole::LIST_ITEM; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL ValueItemAcc::getAccessibleDescription() throw (uno::RuntimeException) @@ -964,7 +964,7 @@ OUString SAL_CALL ValueItemAcc::getAccessibleDescription() return OUString(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL ValueItemAcc::getAccessibleName() throw (uno::RuntimeException) @@ -987,7 +987,7 @@ OUString SAL_CALL ValueItemAcc::getAccessibleName() return aRet; } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::getAccessibleRelationSet() throw (uno::RuntimeException) @@ -995,7 +995,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::g return uno::Reference< accessibility::XAccessibleRelationSet >(); } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getAccessibleStateSet() throw (uno::RuntimeException) @@ -1027,7 +1027,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA return pStateSet; } -// ----------------------------------------------------------------------------- + lang::Locale SAL_CALL ValueItemAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException) @@ -1048,7 +1048,7 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException) @@ -1073,7 +1073,7 @@ void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< ac } } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException) @@ -1090,7 +1090,7 @@ void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< } } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint ) throw (uno::RuntimeException) @@ -1102,7 +1102,7 @@ sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint ) return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint ); } -// ----------------------------------------------------------------------------- + uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleAtPoint( const awt::Point& ) throw (uno::RuntimeException) @@ -1111,7 +1111,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl return xRet; } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL ValueItemAcc::getBounds() throw (uno::RuntimeException) @@ -1136,7 +1136,7 @@ awt::Rectangle SAL_CALL ValueItemAcc::getBounds() return aRet; } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL ValueItemAcc::getLocation() throw (uno::RuntimeException) @@ -1150,7 +1150,7 @@ awt::Point SAL_CALL ValueItemAcc::getLocation() return aRet; } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen() throw (uno::RuntimeException) @@ -1170,7 +1170,7 @@ awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen() return aRet; } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL ValueItemAcc::getSize() throw (uno::RuntimeException) @@ -1184,7 +1184,7 @@ awt::Size SAL_CALL ValueItemAcc::getSize() return aRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL ValueItemAcc::grabFocus() throw (uno::RuntimeException) @@ -1192,7 +1192,7 @@ void SAL_CALL ValueItemAcc::grabFocus() // nothing to do } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL ValueItemAcc::getAccessibleKeyBinding() throw (uno::RuntimeException) @@ -1200,7 +1200,7 @@ uno::Any SAL_CALL ValueItemAcc::getAccessibleKeyBinding() return uno::Any(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueItemAcc::getForeground( ) throw (uno::RuntimeException) @@ -1209,7 +1209,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getForeground( ) return static_cast<sal_Int32>(nColor); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) throw (uno::RuntimeException) @@ -1222,7 +1222,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } -// ----------------------------------------------------------------------------- + sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException ) { diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index c661b268189e..dde15796c616 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -50,9 +50,9 @@ enum { } -// ------------ + // - ValueSet - -// ------------ + void ValueSet::ImplInit() { @@ -92,7 +92,7 @@ void ValueSet::ImplInit() ImplInitSettings( true, true, true ); } -// ----------------------------------------------------------------------- + ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren ) : Control( pParent, nWinStyle ), @@ -114,7 +114,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, V return new ValueSet(pParent, nWinBits); } -// ----------------------------------------------------------------------- + ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) : Control( pParent, rResId ), @@ -125,7 +125,7 @@ ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransient mbIsTransientChildrenDisabled = bDisableTransientChildren; } -// ----------------------------------------------------------------------- + ValueSet::~ValueSet() { @@ -140,7 +140,7 @@ ValueSet::~ValueSet() ImplDeleteItems(); } -// ----------------------------------------------------------------------- + void ValueSet::ImplDeleteItems() { @@ -163,7 +163,7 @@ void ValueSet::ImplDeleteItems() mItemList.clear(); } -// ----------------------------------------------------------------------- + void ValueSet::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { @@ -204,7 +204,7 @@ void ValueSet::ImplInitSettings( bool bFont, bool bForeground, bool bBackground } } -// ----------------------------------------------------------------------- + void ValueSet::ImplInitScrollBar() { @@ -224,7 +224,7 @@ void ValueSet::ImplInitScrollBar() } } -// ----------------------------------------------------------------------- + void ValueSet::ImplFormatItem( ValueSetItem* pItem, Rectangle aRect ) { @@ -352,14 +352,14 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem, Rectangle aRect ) } } -// ----------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ValueSet::CreateAccessible() { return new ValueSetAcc( this, mbIsTransientChildrenDisabled ); } -// ----------------------------------------------------------------------- + void ValueSet::Format() { @@ -688,7 +688,7 @@ void ValueSet::Format() delete pDelScrBar; } -// ----------------------------------------------------------------------- + void ValueSet::ImplDrawItemText(const OUString& rText) { @@ -716,7 +716,7 @@ void ValueSet::ImplDrawItemText(const OUString& rText) DrawText( Point( (aWinSize.Width()-nTxtWidth) / 2, nTxtOffset+(NAME_OFFSET/2) ), rText ); } -// ----------------------------------------------------------------------- + void ValueSet::ImplDrawSelect() { @@ -739,7 +739,7 @@ void ValueSet::ImplDrawSelect() } } -// ----------------------------------------------------------------------- + void ValueSet::ImplDrawSelect( sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel ) { @@ -900,7 +900,7 @@ void ValueSet::ImplDrawSelect( sal_uInt16 nItemId, const bool bFocus, const bool } } -// ----------------------------------------------------------------------- + void ValueSet::ImplHideSelect( sal_uInt16 nItemId ) { @@ -930,7 +930,7 @@ void ValueSet::ImplHideSelect( sal_uInt16 nItemId ) DrawOutDev( aPos, aSize, aPos, aSize, maVirDev ); } -// ----------------------------------------------------------------------- + void ValueSet::ImplHighlightItem( sal_uInt16 nItemId, bool bIsSelection ) { @@ -951,7 +951,7 @@ void ValueSet::ImplHighlightItem( sal_uInt16 nItemId, bool bIsSelection ) } } -// ----------------------------------------------------------------------- + void ValueSet::ImplDraw() { @@ -1008,7 +1008,7 @@ void ValueSet::ImplDraw() ImplDrawSelect(); } -// ----------------------------------------------------------------------- + bool ValueSet::ImplScroll( const Point& rPos ) { @@ -1043,7 +1043,7 @@ bool ValueSet::ImplScroll( const Point& rPos ) return true; } -// ----------------------------------------------------------------------- + size_t ValueSet::ImplGetItem( const Point& rPos, bool bMove ) const { @@ -1089,7 +1089,7 @@ size_t ValueSet::ImplGetItem( const Point& rPos, bool bMove ) const return VALUESET_ITEM_NOTFOUND; } -// ----------------------------------------------------------------------- + ValueSetItem* ValueSet::ImplGetItem( size_t nPos ) { @@ -1099,14 +1099,14 @@ ValueSetItem* ValueSet::ImplGetItem( size_t nPos ) return ( nPos < mItemList.size() ) ? mItemList[nPos] : NULL; } -// ----------------------------------------------------------------------- + ValueSetItem* ValueSet::ImplGetFirstItem() { return mItemList.size() ? mItemList[0] : NULL; } -// ----------------------------------------------------------------------- + sal_uInt16 ValueSet::ImplGetVisibleItemCount() const { @@ -1122,7 +1122,7 @@ sal_uInt16 ValueSet::ImplGetVisibleItemCount() const return nRet; } -// ----------------------------------------------------------------------- + void ValueSet::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ) { @@ -1132,7 +1132,7 @@ void ValueSet::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star:: pAcc->FireAccessibleEvent( nEventId, rOldValue, rNewValue ); } -// ----------------------------------------------------------------------- + bool ValueSet::ImplHasAccessibleListeners() { @@ -1140,7 +1140,7 @@ bool ValueSet::ImplHasAccessibleListeners() return( pAcc && pAcc->HasAccessibleListeners() ); } -// ----------------------------------------------------------------------- + IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar ) { @@ -1154,7 +1154,7 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ValueSet, ImplTimerHdl) { @@ -1162,7 +1162,7 @@ IMPL_LINK_NOARG(ValueSet, ImplTimerHdl) return 0; } -// ----------------------------------------------------------------------- + void ValueSet::ImplTracking( const Point& rPos, bool bRepeat ) { @@ -1196,7 +1196,7 @@ void ValueSet::ImplTracking( const Point& rPos, bool bRepeat ) } } -// ----------------------------------------------------------------------- + void ValueSet::ImplEndTracking( const Point& rPos, bool bCancel ) { @@ -1225,7 +1225,7 @@ void ValueSet::ImplEndTracking( const Point& rPos, bool bCancel ) } } -// ----------------------------------------------------------------------- + void ValueSet::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -1265,7 +1265,7 @@ void ValueSet::MouseButtonDown( const MouseEvent& rMEvt ) Control::MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void ValueSet::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -1276,7 +1276,7 @@ void ValueSet::MouseButtonUp( const MouseEvent& rMEvt ) Control::MouseButtonUp( rMEvt ); } -// ----------------------------------------------------------------------- + void ValueSet::MouseMove( const MouseEvent& rMEvt ) { @@ -1286,7 +1286,7 @@ void ValueSet::MouseMove( const MouseEvent& rMEvt ) Control::MouseMove( rMEvt ); } -// ----------------------------------------------------------------------- + void ValueSet::Tracking( const TrackingEvent& rTEvt ) { @@ -1298,7 +1298,7 @@ void ValueSet::Tracking( const TrackingEvent& rTEvt ) ImplTracking( aMousePos, rTEvt.IsTrackingRepeat() ); } -// ----------------------------------------------------------------------- + void ValueSet::KeyInput( const KeyEvent& rKEvt ) { @@ -1457,7 +1457,7 @@ void ValueSet::KeyInput( const KeyEvent& rKEvt ) } } -// ----------------------------------------------------------------------- + void ValueSet::Command( const CommandEvent& rCEvt ) { @@ -1472,7 +1472,7 @@ void ValueSet::Command( const CommandEvent& rCEvt ) Control::Command( rCEvt ); } -// ----------------------------------------------------------------------- + void ValueSet::Paint( const Rectangle& ) { @@ -1489,7 +1489,7 @@ void ValueSet::Paint( const Rectangle& ) ImplDraw(); } -// ----------------------------------------------------------------------- + void ValueSet::GetFocus() { @@ -1503,7 +1503,7 @@ void ValueSet::GetFocus() pAcc->GetFocus(); } -// ----------------------------------------------------------------------- + void ValueSet::LoseFocus() { @@ -1520,7 +1520,7 @@ void ValueSet::LoseFocus() pAcc->LoseFocus(); } -// ----------------------------------------------------------------------- + void ValueSet::Resize() { @@ -1530,7 +1530,7 @@ void ValueSet::Resize() Control::Resize(); } -// ----------------------------------------------------------------------- + void ValueSet::RequestHelp( const HelpEvent& rHEvt ) { @@ -1555,7 +1555,7 @@ void ValueSet::RequestHelp( const HelpEvent& rHEvt ) Control::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + void ValueSet::StateChanged( StateChangedType nType ) { @@ -1603,7 +1603,7 @@ void ValueSet::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void ValueSet::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1621,27 +1621,27 @@ void ValueSet::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void ValueSet::Select() { maSelectHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ValueSet::DoubleClick() { maDoubleClickHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ValueSet::UserDraw( const UserDrawEvent& ) { } -// ----------------------------------------------------------------------- + void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t nPos ) { @@ -1652,7 +1652,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t nPos ImplInsertItem( pItem, nPos ); } -// ----------------------------------------------------------------------- + void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t nPos ) { @@ -1663,7 +1663,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t nPos ImplInsertItem( pItem, nPos ); } -// ----------------------------------------------------------------------- + void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, const OUString& rText, size_t nPos ) @@ -1676,7 +1676,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, ImplInsertItem( pItem, nPos ); } -// ----------------------------------------------------------------------- + void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, const OUString& rText, size_t nPos ) @@ -1689,7 +1689,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, ImplInsertItem( pItem, nPos ); } -// ----------------------------------------------------------------------- + void ValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos ) { @@ -1699,7 +1699,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos ) ImplInsertItem( pItem, nPos ); } -// ----------------------------------------------------------------------- + void ValueSet::ImplInsertItem( ValueSetItem *const pItem, const size_t nPos ) { @@ -1722,7 +1722,7 @@ void ValueSet::ImplInsertItem( ValueSetItem *const pItem, const size_t nPos ) Invalidate(); } -// ----------------------------------------------------------------------- + Rectangle ValueSet::ImplGetItemRect( size_t nPos ) const { @@ -1744,7 +1744,7 @@ Rectangle ValueSet::ImplGetItemRect( size_t nPos ) const return Rectangle( Point(x, y), Size(mnItemWidth, mnItemHeight) ); } -// ----------------------------------------------------------------------- + void ValueSet::RemoveItem( sal_uInt16 nItemId ) { @@ -1776,7 +1776,7 @@ void ValueSet::RemoveItem( sal_uInt16 nItemId ) Invalidate(); } -// ----------------------------------------------------------------------- + void ValueSet::Clear() { @@ -1794,14 +1794,14 @@ void ValueSet::Clear() Invalidate(); } -// ----------------------------------------------------------------------- + size_t ValueSet::GetItemCount() const { return mItemList.size(); } -// ----------------------------------------------------------------------- + size_t ValueSet::GetItemPos( sal_uInt16 nItemId ) const { @@ -1813,14 +1813,14 @@ size_t ValueSet::GetItemPos( sal_uInt16 nItemId ) const return VALUESET_ITEM_NOTFOUND; } -// ----------------------------------------------------------------------- + sal_uInt16 ValueSet::GetItemId( size_t nPos ) const { return ( nPos < mItemList.size() ) ? mItemList[nPos]->mnId : 0 ; } -// ----------------------------------------------------------------------- + sal_uInt16 ValueSet::GetItemId( const Point& rPos ) const { @@ -1831,7 +1831,7 @@ sal_uInt16 ValueSet::GetItemId( const Point& rPos ) const return 0; } -// ----------------------------------------------------------------------- + Rectangle ValueSet::GetItemRect( sal_uInt16 nItemId ) const { @@ -1843,14 +1843,14 @@ Rectangle ValueSet::GetItemRect( sal_uInt16 nItemId ) const return Rectangle(); } -// ----------------------------------------------------------------------- + void ValueSet::EnableFullItemMode( bool bFullMode ) { mbFullMode = bFullMode; } -// ----------------------------------------------------------------------- + void ValueSet::SetColCount( sal_uInt16 nNewCols ) { @@ -1864,7 +1864,7 @@ void ValueSet::SetColCount( sal_uInt16 nNewCols ) } } -// ----------------------------------------------------------------------- + void ValueSet::SetLineCount( sal_uInt16 nNewLines ) { @@ -1878,7 +1878,7 @@ void ValueSet::SetLineCount( sal_uInt16 nNewLines ) } } -// ----------------------------------------------------------------------- + void ValueSet::SetItemWidth( long nNewItemWidth ) { @@ -1905,7 +1905,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const OUString& rText, size_t nPo ImplInsertItem( pItem, nPos ); } -// ----------------------------------------------------------------------- + void ValueSet::SetItemHeight( long nNewItemHeight ) { @@ -1919,7 +1919,7 @@ void ValueSet::SetItemHeight( long nNewItemHeight ) } } -// ----------------------------------------------------------------------- + void ValueSet::SelectItem( sal_uInt16 nItemId ) { @@ -2040,7 +2040,7 @@ void ValueSet::SelectItem( sal_uInt16 nItemId ) } } -// ----------------------------------------------------------------------- + void ValueSet::SetNoSelection() { @@ -2052,7 +2052,7 @@ void ValueSet::SetNoSelection() ImplDraw(); } -// ----------------------------------------------------------------------- + void ValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) { @@ -2075,7 +2075,7 @@ void ValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) mbFormat = true; } -// ----------------------------------------------------------------------- + Image ValueSet::GetItemImage( sal_uInt16 nItemId ) const { @@ -2087,7 +2087,7 @@ Image ValueSet::GetItemImage( sal_uInt16 nItemId ) const return Image(); } -// ----------------------------------------------------------------------- + void ValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor ) { @@ -2110,7 +2110,7 @@ void ValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor ) mbFormat = true; } -// ----------------------------------------------------------------------- + Color ValueSet::GetItemColor( sal_uInt16 nItemId ) const { @@ -2122,7 +2122,7 @@ Color ValueSet::GetItemColor( sal_uInt16 nItemId ) const return Color(); } -// ----------------------------------------------------------------------- + void ValueSet::SetItemData( sal_uInt16 nItemId, void* pData ) { @@ -2147,7 +2147,7 @@ void ValueSet::SetItemData( sal_uInt16 nItemId, void* pData ) } } -// ----------------------------------------------------------------------- + void* ValueSet::GetItemData( sal_uInt16 nItemId ) const { @@ -2159,7 +2159,7 @@ void* ValueSet::GetItemData( sal_uInt16 nItemId ) const return NULL; } -// ----------------------------------------------------------------------- + void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) { @@ -2202,7 +2202,7 @@ void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText) } } -// ----------------------------------------------------------------------- + OUString ValueSet::GetItemText( sal_uInt16 nItemId ) const { @@ -2214,7 +2214,7 @@ OUString ValueSet::GetItemText( sal_uInt16 nItemId ) const return OUString(); } -// ----------------------------------------------------------------------- + void ValueSet::SetColor( const Color& rColor ) { @@ -2224,7 +2224,7 @@ void ValueSet::SetColor( const Color& rColor ) ImplDraw(); } -// ----------------------------------------------------------------------- + void ValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing ) { @@ -2239,7 +2239,7 @@ void ValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing ) } } -// ----------------------------------------------------------------------- + void ValueSet::StartSelection() { @@ -2248,7 +2248,7 @@ void ValueSet::StartSelection() mnHighItemId = mnSelItemId; } -// ----------------------------------------------------------------------- + void ValueSet::EndSelection() { @@ -2263,7 +2263,7 @@ void ValueSet::EndSelection() mbSelection = false; } -// ----------------------------------------------------------------------- + bool ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) { @@ -2303,7 +2303,7 @@ bool ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) return true; } -// ----------------------------------------------------------------------- + Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCols, sal_uInt16 nDesireLines ) const @@ -2381,7 +2381,7 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCol return aSize; } -// ----------------------------------------------------------------------- + Size ValueSet::CalcItemSizePixel( const Size& rItemSize, bool bOut ) const { @@ -2412,7 +2412,7 @@ Size ValueSet::CalcItemSizePixel( const Size& rItemSize, bool bOut ) const return aSize; } -// ----------------------------------------------------------------------- + long ValueSet::GetScrollWidth() const { @@ -2425,7 +2425,7 @@ long ValueSet::GetScrollWidth() const return 0; } -// ----------------------------------------------------------------------- + void ValueSet::SetHighlightHdl( const Link& rLink ) { @@ -2456,7 +2456,7 @@ Size ValueSet::GetOptimalSize() const return CalcWindowSizePixel(aLargestItemSize); } -// ----------------------------------------------------------------------- + void ValueSet::SetEdgeBlending(bool bNew) { diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index e610875c7eae..e46512f7a1fe 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -58,36 +58,36 @@ VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar( VCLXWindow* pVCLWindow ) m_pHeadBar = static_cast< HeaderBar* >( GetWindow() ); } -// ----------------------------------------------------------------------------- + VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleHeaderBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + ::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName() throw (RuntimeException) { return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleHeaderBar" ); } -// ----------------------------------------------------------------------------- + Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() throw (RuntimeException) { diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 7b7a24320320..6e293146986f 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -56,7 +56,7 @@ VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar* pHeadBar m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() ); } -// ----------------------------------------------------------------------------- + VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem() { @@ -64,13 +64,13 @@ VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem() m_pExternalLock = NULL; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleHeaderBarItem::ProcessWindowEvent( const VclWindowEvent& ) { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -88,9 +88,9 @@ void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSe } } -// ----------------------------------------------------------------------------- + // OCommonAccessibleComponent -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeException) { @@ -105,21 +105,21 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeExcept return aBounds; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleHeaderBarItem, AccessibleExtendedComponentHelper_BASE, VCLXAccessibleHeaderBarItem_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, AccessibleExtendedComponentHelper_BASE, VCLXAccessibleHeaderBarItem_BASE ) -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void VCLXAccessibleHeaderBarItem::disposing() { @@ -152,9 +152,9 @@ Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContex return this; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeException) { @@ -163,7 +163,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeE return 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -175,7 +175,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_In return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() throw (RuntimeException) { @@ -190,7 +190,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() thro return xParent; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (RuntimeException) { @@ -198,7 +198,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (Runti return m_nIndexInParent - 1; } -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeException) { @@ -207,7 +207,7 @@ sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeExcepti return AccessibleRole::COLUMN_HEADER; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeException) { @@ -216,7 +216,7 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeE return sDescription; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeException) { @@ -228,7 +228,7 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeExceptio return sName; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -239,7 +239,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRe return xSet; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet( ) throw (RuntimeException) { @@ -260,7 +260,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleState return xSet; } -// ----------------------------------------------------------------------------- + com::sun::star::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -269,9 +269,9 @@ com::sun::star::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (Ill return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) { @@ -280,7 +280,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( cons return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException) { @@ -290,7 +290,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException) return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException) { @@ -300,9 +300,9 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException) return nColor; } -// ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent -// ----------------------------------------------------------------------------- + Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeException) { @@ -312,7 +312,7 @@ Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeExc return xFont; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeException) { @@ -322,7 +322,7 @@ OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeExcept return sText; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleHeaderBarItem::getToolTipText() throw (RuntimeException) { diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index c623be09debe..2c0d731bb6d8 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -124,7 +124,7 @@ namespace svt virtual void setCommand(const OUString& _rCommand) = 0; }; - // ------------------------------------------------------------------- + IAssigmentData::~IAssigmentData() { } @@ -162,7 +162,7 @@ public: virtual void setCommand(const OUString& _rCommand); }; - // ------------------------------------------------------------------- + AssigmentTransientData::AssigmentTransientData( const Reference< XDataSource >& _rxDataSource, const OUString& _rDataSourceName, const OUString& _rTableName, const Sequence< AliasProgrammaticPair >& _rFields ) @@ -204,25 +204,25 @@ public: } } - // ------------------------------------------------------------------- + OUString AssigmentTransientData::getDatasourceName() const { return m_sDSName; } - // ------------------------------------------------------------------- + OUString AssigmentTransientData::getCommand() const { return m_sTableName; } - // ------------------------------------------------------------------- + sal_Int32 AssigmentTransientData::getCommandType() const { return CommandType::TABLE; } - // ------------------------------------------------------------------- + sal_Bool AssigmentTransientData::hasFieldAssignment(const OUString& _rLogicalName) { MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName ); @@ -230,7 +230,7 @@ public: && ( !aPos->second.isEmpty() ); } - // ------------------------------------------------------------------- + OUString AssigmentTransientData::getFieldAssignment(const OUString& _rLogicalName) { OUString sReturn; @@ -241,13 +241,13 @@ public: return sReturn; } - // ------------------------------------------------------------------- + void AssigmentTransientData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) { m_aAliases[ _rLogicalName ] = _rAssignment; } - // ------------------------------------------------------------------- + void AssigmentTransientData::clearFieldAssignment(const OUString& _rLogicalName) { MapString2String::iterator aPos = m_aAliases.find( _rLogicalName ); @@ -255,13 +255,13 @@ public: m_aAliases.erase( aPos ); } - // ------------------------------------------------------------------- + void AssigmentTransientData::setDatasourceName(const OUString&) { OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" ); } - // ------------------------------------------------------------------- + void AssigmentTransientData::setCommand(const OUString&) { OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" ); @@ -320,7 +320,7 @@ void AssignmentPersistentData::Commit() { } - // ------------------------------------------------------------------- + AssignmentPersistentData::AssignmentPersistentData() :ConfigItem( OUString( "Office.DataAccess/AddressBook" )) { @@ -330,18 +330,18 @@ void AssignmentPersistentData::Commit() m_aStoredFields.insert(*pStoredNames); } - // ------------------------------------------------------------------- + AssignmentPersistentData::~AssignmentPersistentData() { } - // ------------------------------------------------------------------- + sal_Bool AssignmentPersistentData::hasFieldAssignment(const OUString& _rLogicalName) { return (m_aStoredFields.end() != m_aStoredFields.find(_rLogicalName)); } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getFieldAssignment(const OUString& _rLogicalName) { OUString sAssignment; @@ -355,13 +355,13 @@ void AssignmentPersistentData::Commit() return sAssignment; } - // ------------------------------------------------------------------- + Any AssignmentPersistentData::getProperty(const sal_Char* _pLocalName) const { return getProperty(OUString::createFromAscii(_pLocalName)); } - // ------------------------------------------------------------------- + Any AssignmentPersistentData::getProperty(const OUString& _rLocalName) const { Sequence< OUString > aProperties(&_rLocalName, 1); @@ -370,7 +370,7 @@ void AssignmentPersistentData::Commit() return aValues[0]; } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getStringProperty(const OUString& _rLocalName) const { OUString sReturn; @@ -378,7 +378,7 @@ void AssignmentPersistentData::Commit() return sReturn; } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const { OUString sReturn; @@ -386,7 +386,7 @@ void AssignmentPersistentData::Commit() return sReturn; } - // ------------------------------------------------------------------- + sal_Int32 AssignmentPersistentData::getInt32Property(const sal_Char* _pLocalName) const { sal_Int32 nReturn = 0; @@ -394,7 +394,7 @@ void AssignmentPersistentData::Commit() return nReturn; } - // ------------------------------------------------------------------- + void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue) { Sequence< OUString > aNames(1); @@ -404,7 +404,7 @@ void AssignmentPersistentData::Commit() PutProperties(aNames, aValues); } - // ------------------------------------------------------------------- + void AssignmentPersistentData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment) { if (_rAssignment.isEmpty()) @@ -441,7 +441,7 @@ void AssignmentPersistentData::Commit() DBG_ASSERT(bSuccess, "AssignmentPersistentData::setFieldAssignment: could not commit the changes a field!"); } - // ------------------------------------------------------------------- + void AssignmentPersistentData::clearFieldAssignment(const OUString& _rLogicalName) { if (!hasFieldAssignment(_rLogicalName)) @@ -453,31 +453,31 @@ void AssignmentPersistentData::Commit() ClearNodeElements(sDescriptionNodePath, aNames); } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getDatasourceName() const { return getStringProperty( "DataSourceName" ); } - // ------------------------------------------------------------------- + OUString AssignmentPersistentData::getCommand() const { return getStringProperty( "Command" ); } - // ------------------------------------------------------------------- + void AssignmentPersistentData::setDatasourceName(const OUString& _rName) { setStringProperty( "DataSourceName", _rName ); } - // ------------------------------------------------------------------- + void AssignmentPersistentData::setCommand(const OUString& _rCommand) { setStringProperty( "Command", _rCommand ); } - // ------------------------------------------------------------------- + sal_Int32 AssignmentPersistentData::getCommandType() const { return getInt32Property( "CommandType" ); @@ -545,7 +545,7 @@ void AssignmentPersistentData::Commit() // = AddressBookSourceDialog // =================================================================== - // ------------------------------------------------------------------- + AddressBookSourceDialog::AddressBookSourceDialog(Window* _pParent, const Reference< XComponentContext >& _rxORB ) : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui") @@ -556,7 +556,7 @@ void AssignmentPersistentData::Commit() implConstruct(); } - // ------------------------------------------------------------------- + AddressBookSourceDialog::AddressBookSourceDialog( Window* _pParent, const Reference< XComponentContext >& _rxORB, const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) @@ -568,7 +568,7 @@ void AssignmentPersistentData::Commit() implConstruct(); } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::implConstruct() { get(m_pDatasource, "datasource"); @@ -714,7 +714,7 @@ void AssignmentPersistentData::Commit() } } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::getFieldMapping(Sequence< AliasProgrammaticPair >& _rMapping) const { _rMapping.realloc( m_pImpl->aLogicalFieldNames.size() ); @@ -739,7 +739,7 @@ void AssignmentPersistentData::Commit() _rMapping.realloc( pPair - _rMapping.getArray() ); } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::loadConfiguration() { OUString sName = m_pImpl->pConfigData->getDatasourceName(); @@ -767,13 +767,13 @@ void AssignmentPersistentData::Commit() *aAssignment = m_pImpl->pConfigData->getFieldAssignment(*aLogical); } - // ------------------------------------------------------------------- + AddressBookSourceDialog::~AddressBookSourceDialog() { delete m_pImpl; } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::initializeDatasources() { if (!m_xDatabaseContext.is()) @@ -812,14 +812,14 @@ void AssignmentPersistentData::Commit() m_pDatasource->InsertEntry(*pDatasourceNames); } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar) { implScrollFields( _pScrollBar->GetThumbPos(), sal_True, sal_True ); return 0L; } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::resetTables() { if (!m_xDatabaseContext.is()) @@ -925,7 +925,7 @@ void AssignmentPersistentData::Commit() resetFields(); } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::resetFields() { WaitObject aWaitCursor(this); @@ -1006,7 +1006,7 @@ void AssignmentPersistentData::Commit() (*aAdjust) = ""; } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnFieldSelect, ListBox*, _pListbox) { // the index of the affected list box in our array @@ -1025,7 +1025,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar) { if (_nPos == m_pImpl->nFieldScrollPos) @@ -1122,7 +1122,7 @@ void AssignmentPersistentData::Commit() m_pFieldScroller->SetThumbPos(m_pImpl->nFieldScrollPos); } - // ------------------------------------------------------------------- + void AddressBookSourceDialog::implSelectField(ListBox* _pBox, const OUString& _rText) { if (!_rText.isEmpty()) @@ -1133,7 +1133,7 @@ void AssignmentPersistentData::Commit() _pBox->SelectEntryPos(0); } - // ------------------------------------------------------------------- + IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize) { // load the initial data from the configuration @@ -1148,7 +1148,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnComboSelect, ComboBox*, _pBox) { if (_pBox == m_pDatasource) @@ -1158,14 +1158,14 @@ void AssignmentPersistentData::Commit() return 0; } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnComboGetFocus, ComboBox*, _pBox) { _pBox->SaveValue(); return 0L; } - // ------------------------------------------------------------------- + IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, ComboBox*, _pBox) { if (_pBox->GetSavedValue() != _pBox->GetText()) @@ -1178,7 +1178,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + IMPL_LINK_NOARG(AddressBookSourceDialog, OnOkClicked) { OUString sSelectedDS = lcl_getSelectedDataSource(*m_pDatasource); @@ -1205,7 +1205,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + IMPL_LINK_NOARG(AddressBookSourceDialog, OnAdministrateDatasources) { // create the dialog object @@ -1260,7 +1260,7 @@ void AssignmentPersistentData::Commit() return 0L; } - // ------------------------------------------------------------------- + bool AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt ) { switch (_rNEvt.GetType()) diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 2cc7f72734e1..a25ccac6972e 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -35,9 +35,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::ui::dialogs; -// --------------- + // - ColorDialog - -// --------------- + SvColorDialog::SvColorDialog( Window* pWindow ) : mpParent( pWindow ) @@ -54,21 +54,21 @@ void SvColorDialog::SetColor( const Color& rColor ) maColor = rColor; } -// ----------------------------------------------------------------------- + const Color& SvColorDialog::GetColor() const { return maColor; } -// ----------------------------------------------------------------------- + void SvColorDialog::SetMode( sal_Int16 eMode ) { meMode = eMode; } -// ----------------------------------------------------------------------- + short SvColorDialog::Execute() { diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index e312e6af09f9..615c96922d1b 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -34,11 +34,11 @@ using namespace ::com::sun::star; -//--------------------------------------------- + // this struct conforms to the Microsoft // OBJECTDESCRIPTOR -> see oleidl.h // (MS platform sdk) -//--------------------------------------------- + struct OleObjectDescriptor { @@ -91,7 +91,7 @@ void SvObjectServerList::Remove( const SvGlobalName & rName ) } } -//--------------------------------------------------------------------- + void SvObjectServerList::FillInsertObjects() /* [Description] @@ -282,7 +282,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId ) return aUIName; } -// ----------------------------------------------------------------------------- + sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat) { sal_Bool bRet = sal_False; @@ -339,6 +339,6 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat } return bRet; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx index 16551a55140c..5a3548665dec 100644 --- a/svtools/source/dialogs/mcvmath.cxx +++ b/svtools/source/dialogs/mcvmath.cxx @@ -20,7 +20,7 @@ #include <mcvmath.hxx> -// --------------------------------------------------------------------- + // die folgenden Tabellen enthalten sin(phi) * 2**14 // fuer phi= 360Grad*2**-32 bis 360 Grad // def. fuer x: phi=360Grad * 2**(x-16) diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index a493c719e94e..a378b92d2adf 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -42,7 +42,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter, pPropBtn->Show( pPrinter->HasSupport( SUPPORT_SETUPDIALOG ) ); } -// ----------------------------------------------------------------------- + void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear ) { @@ -50,7 +50,7 @@ void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear ) pBox->Clear(); } -// ----------------------------------------------------------------------- + Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, Printer* pPrinter, Printer* pTempPrinter ) @@ -89,7 +89,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, return pTempPrinter; } -// ----------------------------------------------------------------------- + Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter ) { @@ -109,7 +109,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter ) return pTempPrinter; } -// ----------------------------------------------------------------------- + void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ) { @@ -121,7 +121,7 @@ void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ) } } -// ----------------------------------------------------------------------- + static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddStr) { @@ -131,14 +131,14 @@ static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddSt return aStr + rAddStr; } -// ----------------------------------------------------------------------- + static OUString ImplPrnDlgAddResString(const OUString& rStr, sal_uInt16 nResId) { return ImplPrnDlgAddString(rStr, SVT_RESSTR(nResId)); } -// ----------------------------------------------------------------------- + OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) { @@ -241,7 +241,7 @@ PrinterSetupDialog::PrinterSetupDialog(Window* pParent) m_pLbName->SetSelectHdl( LINK( this, PrinterSetupDialog, ImplChangePrinterHdl ) ); } -// ----------------------------------------------------------------------- + PrinterSetupDialog::~PrinterSetupDialog() { @@ -249,7 +249,7 @@ PrinterSetupDialog::~PrinterSetupDialog() delete mpTempPrinter; } -// ----------------------------------------------------------------------- + void PrinterSetupDialog::SetOptionsHdl( const Link& rLink ) { @@ -277,7 +277,7 @@ void PrinterSetupDialog::ImplSetInfo() } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl) { @@ -288,7 +288,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl) { @@ -299,7 +299,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl) { @@ -309,7 +309,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl) return 0; } -// ----------------------------------------------------------------------- + bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) { @@ -319,7 +319,7 @@ bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) return ModalDialog::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -338,7 +338,7 @@ void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt ) ModalDialog::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + short PrinterSetupDialog::Execute() { diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index b1d86bf20049..20800aef3e8c 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -85,7 +85,7 @@ namespace svt sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS ); }; - //-------------------------------------------------------------------- + sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath ) { sal_Int32 nStateIndexInPath = 0; @@ -98,7 +98,7 @@ namespace svt return nStateIndexInPath; } - //-------------------------------------------------------------------- + sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId ) { sal_Int32 nStateIndexInPath = -1; @@ -108,7 +108,7 @@ namespace svt return nStateIndexInPath; } - //-------------------------------------------------------------------- + sal_Int32 RoadmapWizardImpl::getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS ) { sal_Int32 nMinLength = ::std::min( _rLHS.size(), _rRHS.size() ); @@ -124,14 +124,14 @@ namespace svt //= RoadmapWizard //==================================================================== DBG_NAME( RoadmapWizard ) - //-------------------------------------------------------------------- + #ifdef DBG_UTIL const char* CheckInvariants( const void* pVoid ) { return static_cast< const RoadmapWizard* >( pVoid )->checkInvariants(); } - //-------------------------------------------------------------------- + const sal_Char* RoadmapWizard::checkInvariants() const { // all paths have to start with the same state @@ -166,7 +166,7 @@ namespace svt } #endif - //-------------------------------------------------------------------- + RoadmapWizard::RoadmapWizard( Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, _rRes, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) @@ -175,7 +175,7 @@ namespace svt impl_construct(); } - //-------------------------------------------------------------------- + RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, i_nStyle, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) @@ -184,7 +184,7 @@ namespace svt impl_construct(); } - //-------------------------------------------------------------------- + void RoadmapWizard::impl_construct() { SetLeftAlignedButtonCount( 1 ); @@ -209,26 +209,26 @@ namespace svt m_pImpl->pRoadmap->Show(); } - //-------------------------------------------------------------------- + RoadmapWizard::~RoadmapWizard() { delete m_pImpl; DBG_DTOR( RoadmapWizard, CheckInvariants ); } - //-------------------------------------------------------------------- + void RoadmapWizard::SetRoadmapHelpId( const OString& _rId ) { m_pImpl->pRoadmap->SetHelpId( _rId ); } - //-------------------------------------------------------------------- + void RoadmapWizard::SetRoadmapInteractive( sal_Bool _bInteractive ) { m_pImpl->pRoadmap->SetRoadmapInteractive( _bInteractive ); } - //-------------------------------------------------------------------- + void RoadmapWizard::declarePath( PathId _nPathId, const WizardPath& _lWizardStates) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -242,7 +242,7 @@ namespace svt implUpdateRoadmap( ); } - //-------------------------------------------------------------------- + void RoadmapWizard::declarePath( PathId _nPathId, WizardState _nFirstState, ... ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -272,7 +272,7 @@ namespace svt declarePath( _nPathId, aNewPath ); } - //-------------------------------------------------------------------- + void RoadmapWizard::describeState( WizardState _nState, const OUString& _rStateDisplayName, RoadmapPageFactory _pPageFactory ) { OSL_ENSURE( m_pImpl->aStateDescriptors.find( _nState ) == m_pImpl->aStateDescriptors.end(), @@ -280,7 +280,7 @@ namespace svt m_pImpl->aStateDescriptors[ _nState ] = StateDescriptions::mapped_type( _rStateDisplayName, _pPageFactory ); } - //-------------------------------------------------------------------- + void RoadmapWizard::activatePath( PathId _nPathId, bool _bDecideForIt ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -325,7 +325,7 @@ namespace svt implUpdateRoadmap( ); } - //-------------------------------------------------------------------- + void RoadmapWizard::implUpdateRoadmap( ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -432,7 +432,7 @@ namespace svt m_pImpl->pRoadmap->SetRoadmapComplete( !bIncompletePath ); } - //-------------------------------------------------------------------- + WizardTypes::WizardState RoadmapWizard::determineNextState( WizardState _nCurrentState ) const { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -463,7 +463,7 @@ namespace svt return aActivePathPos->second[ nNextStateIndex ]; } - //--------------------------------------------------------------------- + bool RoadmapWizard::canAdvance() const { if ( !m_pImpl->bActivePathIsDefinite ) @@ -500,7 +500,7 @@ namespace svt return true; } - //--------------------------------------------------------------------- + void RoadmapWizard::updateTravelUI() { OWizardMachine::updateTravelUI(); @@ -523,7 +523,7 @@ namespace svt implUpdateRoadmap(); } - //-------------------------------------------------------------------- + IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -568,7 +568,7 @@ namespace svt return 1L; } - //-------------------------------------------------------------------- + void RoadmapWizard::enterState( WizardState _nState ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -580,7 +580,7 @@ namespace svt m_pImpl->pRoadmap->SelectRoadmapItemByID( getCurrentState() ); } - //-------------------------------------------------------------------- + OUString RoadmapWizard::getStateDisplayName( WizardState _nState ) const { OUString sDisplayName; @@ -594,7 +594,7 @@ namespace svt return sDisplayName; } - //-------------------------------------------------------------------- + TabPage* RoadmapWizard::createPage( WizardState _nState ) { TabPage* pPage( NULL ); @@ -611,7 +611,7 @@ namespace svt return pPage; } - //-------------------------------------------------------------------- + void RoadmapWizard::enableState( WizardState _nState, bool _bEnable ) { DBG_CHKTHIS( RoadmapWizard, CheckInvariants ); @@ -629,7 +629,7 @@ namespace svt m_pImpl->pRoadmap->EnableRoadmapItem( (RoadmapTypes::ItemId)_nState, _bEnable ); } - //-------------------------------------------------------------------- + bool RoadmapWizard::knowsState( WizardState i_nState ) const { for ( Paths::const_iterator path = m_pImpl->aPaths.begin(); @@ -649,13 +649,13 @@ namespace svt return false; } - //-------------------------------------------------------------------- + bool RoadmapWizard::isStateEnabled( WizardState _nState ) const { return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end(); } - //-------------------------------------------------------------------- + void RoadmapWizard::Resize() { OWizardMachine::Resize(); @@ -665,7 +665,7 @@ namespace svt } - //-------------------------------------------------------------------- + void RoadmapWizard::StateChanged( StateChangedType nType ) { WizardDialog::StateChanged( nType ); @@ -674,7 +674,7 @@ namespace svt ResizeFixedLine(); } - //-------------------------------------------------------------------- + void RoadmapWizard::ResizeFixedLine() { Size aSize( m_pImpl->pRoadmap->GetSizePixel() ); @@ -682,7 +682,7 @@ namespace svt m_pImpl->pFixedLine->SetSizePixel( aSize ); } - //-------------------------------------------------------------------- + void RoadmapWizard::updateRoadmapItemLabel( WizardState _nState ) { const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] ); diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 84467ab8b12a..d05030fa517e 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -56,25 +56,25 @@ namespace svt { } - //--------------------------------------------------------------------- + OWizardPage::~OWizardPage() { delete m_pImpl; } - //--------------------------------------------------------------------- + void OWizardPage::initializePage() { } - //--------------------------------------------------------------------- + void OWizardPage::ActivatePage() { TabPage::ActivatePage(); updateDialogTravelUI(); } - //--------------------------------------------------------------------- + void OWizardPage::updateDialogTravelUI() { OWizardMachine* pWizardMachine = dynamic_cast< OWizardMachine* >( GetParent() ); @@ -82,13 +82,13 @@ namespace svt pWizardMachine->updateTravelUI(); } - //--------------------------------------------------------------------- + bool OWizardPage::canAdvance() const { return true; } - //--------------------------------------------------------------------- + sal_Bool OWizardPage::commitPage( WizardTypes::CommitPageReason ) { return sal_True; @@ -121,7 +121,7 @@ namespace svt //===================================================================== //= OWizardMachine //===================================================================== - //--------------------------------------------------------------------- + OWizardMachine::OWizardMachine(Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags ) :WizardDialog( _pParent, _rRes ) ,m_pFinish(NULL) @@ -134,7 +134,7 @@ namespace svt implConstruct( _nButtonFlags ); } - //--------------------------------------------------------------------- + OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :WizardDialog( _pParent, i_nStyle ) ,m_pFinish(NULL) @@ -147,7 +147,7 @@ namespace svt implConstruct( _nButtonFlags ); } - //--------------------------------------------------------------------- + void OWizardMachine::implConstruct( const sal_uInt32 _nButtonFlags ) { m_pImpl->sTitleBase = GetText(); @@ -216,7 +216,7 @@ namespace svt } } - //--------------------------------------------------------------------- + OWizardMachine::~OWizardMachine() { delete m_pFinish; @@ -231,7 +231,7 @@ namespace svt delete m_pImpl; } - //--------------------------------------------------------------------- + void OWizardMachine::implUpdateTitle() { OUString sCompleteTitle(m_pImpl->sTitleBase); @@ -246,14 +246,14 @@ namespace svt SetText(sCompleteTitle); } - //--------------------------------------------------------------------- + void OWizardMachine::setTitleBase(const OUString& _rTitleBase) { m_pImpl->sTitleBase = _rTitleBase; implUpdateTitle(); } - //--------------------------------------------------------------------- + TabPage* OWizardMachine::GetOrCreatePage( const WizardState i_nState ) { if ( NULL == GetPage( i_nState ) ) @@ -281,7 +281,7 @@ namespace svt return GetPage( i_nState ); } - //--------------------------------------------------------------------- + void OWizardMachine::ActivatePage() { WizardDialog::ActivatePage(); @@ -292,7 +292,7 @@ namespace svt enterState( nCurrentLevel ); } - //--------------------------------------------------------------------- + long OWizardMachine::DeactivatePage() { WizardState nCurrentState = getCurrentState(); @@ -301,7 +301,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + void OWizardMachine::defaultButton(sal_uInt32 _nWizardButtonFlags) { // the new default button @@ -323,7 +323,7 @@ namespace svt implResetDefault( this ); } - //--------------------------------------------------------------------- + void OWizardMachine::implResetDefault(Window* _pWindow) { Window* pChildLoop = _pWindow->GetWindow(WINDOW_FIRSTCHILD); @@ -353,7 +353,7 @@ namespace svt } } - //--------------------------------------------------------------------- + void OWizardMachine::defaultButton(PushButton* _pNewDefButton) { // loop through all (direct and indirect) descendants which participate in our tabbing order, and @@ -365,7 +365,7 @@ namespace svt _pNewDefButton->SetStyle(_pNewDefButton->GetStyle() | WB_DEFBUTTON); } - //--------------------------------------------------------------------- + void OWizardMachine::enableButtons(sal_uInt32 _nWizardButtonFlags, sal_Bool _bEnable) { if (m_pFinish && (_nWizardButtonFlags & WZB_FINISH)) @@ -380,7 +380,7 @@ namespace svt m_pCancel->Enable(_bEnable); } - //--------------------------------------------------------------------- + void OWizardMachine::enterState(WizardState _nState) { // tell the page @@ -398,7 +398,7 @@ namespace svt implUpdateTitle(); } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::leaveState(WizardState) { // no need to ask the page here. @@ -408,13 +408,13 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::onFinish() { return Finnish( RET_OK ); } - //--------------------------------------------------------------------- + IMPL_LINK_NOARG(OWizardMachine, OnFinish) { if ( isTravelingSuspended() ) @@ -427,13 +427,13 @@ namespace svt return onFinish() ? 1L : 0L; } - //--------------------------------------------------------------------- + OWizardMachine::WizardState OWizardMachine::determineNextState( WizardState _nCurrentState ) const { return _nCurrentState + 1; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::prepareLeaveCurrentState( CommitPageReason _eReason ) { IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) ); @@ -441,7 +441,7 @@ namespace svt return pController->commitPage( _eReason ); } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::skipBackwardUntil( WizardState _nTargetState ) { // alowed to leave the current page? @@ -468,7 +468,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::skipUntil( WizardState _nTargetState ) { WizardState nCurrentState = getCurrentState(); @@ -508,7 +508,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::skip(sal_Int32 _nSteps) { DBG_ASSERT(_nSteps > 0, "OWizardMachine::skip: invalid number of steps!"); @@ -548,7 +548,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::travelNext() { // allowed to leave the current page? @@ -573,7 +573,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool OWizardMachine::travelPrevious() { DBG_ASSERT(m_pImpl->aStateHistory.size() > 0, "OWizardMachine::travelPrevious: have no previous page!"); @@ -598,7 +598,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + void OWizardMachine::removePageFromHistory( WizardState nToRemove ) { @@ -619,19 +619,19 @@ namespace svt } } - //--------------------------------------------------------------------- + void OWizardMachine::enableAutomaticNextButtonState( bool _bEnable ) { m_pImpl->m_bAutoNextButtonState = _bEnable; } - //--------------------------------------------------------------------- + bool OWizardMachine::isAutomaticNextButtonStateEnabled() const { return m_pImpl->m_bAutoNextButtonState; } - //--------------------------------------------------------------------- + IMPL_LINK_NOARG(OWizardMachine, OnPrevPage) { if ( isTravelingSuspended() ) @@ -641,7 +641,7 @@ namespace svt return nRet; } - //--------------------------------------------------------------------- + IMPL_LINK_NOARG(OWizardMachine, OnNextPage) { if ( isTravelingSuspended() ) @@ -651,14 +651,14 @@ namespace svt return nRet; } - //--------------------------------------------------------------------- + IWizardPageController* OWizardMachine::getPageController( TabPage* _pCurrentPage ) const { IWizardPageController* pController = dynamic_cast< IWizardPageController* >( _pCurrentPage ); return pController; } - //--------------------------------------------------------------------- + void OWizardMachine::getStateHistory( ::std::vector< WizardState >& _out_rHistory ) { ::std::stack< WizardState > aHistoryCopy( m_pImpl->aStateHistory ); @@ -669,13 +669,13 @@ namespace svt } } - //--------------------------------------------------------------------- + bool OWizardMachine::canAdvance() const { return WZS_INVALID_STATE != determineNextState( getCurrentState() ); } - //--------------------------------------------------------------------- + void OWizardMachine::updateTravelUI() { const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) ); @@ -687,20 +687,20 @@ namespace svt enableButtons( WZB_NEXT, bCanAdvance ); } - //--------------------------------------------------------------------- + bool OWizardMachine::isTravelingSuspended() const { return m_pImpl->m_bTravelingSuspended; } - //--------------------------------------------------------------------- + void OWizardMachine::suspendTraveling( AccessGuard ) { DBG_ASSERT( !m_pImpl->m_bTravelingSuspended, "OWizardMachine::suspendTraveling: already suspended!" ); m_pImpl->m_bTravelingSuspended = true; } - //--------------------------------------------------------------------- + void OWizardMachine::resumeTraveling( AccessGuard ) { DBG_ASSERT( m_pImpl->m_bTravelingSuspended, "OWizardMachine::resumeTraveling: nothing to resume!" ); diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 48440f2fefb6..de29f6ba5f85 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -37,7 +37,7 @@ struct ImplWizPageData TabPage* mpPage; }; -// ----------------------------------------------------------------------- + struct ImplWizButtonData { @@ -66,20 +66,20 @@ void WizardDialog::ImplInitData() maWizardLayoutTimer.SetTimeoutHdl( LINK( this, WizardDialog, ImplHandleWizardLayoutTimerHdl ) ); } -// ----------------------------------------------------------------------- + void WizardDialog::SetLeftAlignedButtonCount( sal_Int16 _nCount ) { mnLeftAlignCount = _nCount; } -// ----------------------------------------------------------------------- + void WizardDialog::SetEmptyViewMargin() { mbEmptyViewMargin = true; } -// ----------------------------------------------------------------------- + void WizardDialog::ImplCalcSize( Size& rSize ) { @@ -258,7 +258,7 @@ long WizardDialog::LogicalCoordinateToPixel(int iCoordinate){ } -// ----------------------------------------------------------------------- + void WizardDialog::ImplPosTabPage() { @@ -316,7 +316,7 @@ void WizardDialog::ImplPosTabPage() mpCurTabPage->SetPosSizePixel( aPos, aDlgSize ); } -// ----------------------------------------------------------------------- + void WizardDialog::ImplShowTabPage( TabPage* pTabPage ) { @@ -339,7 +339,7 @@ void WizardDialog::ImplShowTabPage( TabPage* pTabPage ) pOldTabPage->Hide(); } -// ----------------------------------------------------------------------- + TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const { @@ -367,7 +367,7 @@ WizardDialog::WizardDialog( Window* pParent, WinBits nStyle ) : ImplInitData(); } -// ----------------------------------------------------------------------- + WizardDialog::WizardDialog( Window* pParent, const ResId& rResId ) : ModalDialog( pParent, rResId ) @@ -375,7 +375,7 @@ WizardDialog::WizardDialog( Window* pParent, const ResId& rResId ) : ImplInitData(); } -// ----------------------------------------------------------------------- + WizardDialog::~WizardDialog() { @@ -392,7 +392,7 @@ WizardDialog::~WizardDialog() RemovePage( mpFirstPage->mpPage ); } -// ----------------------------------------------------------------------- + void WizardDialog::Resize() { @@ -405,7 +405,7 @@ void WizardDialog::Resize() Dialog::Resize(); } -// ----------------------------------------------------------------------- + void WizardDialog::StateChanged( StateChangedType nType ) { @@ -443,7 +443,7 @@ void WizardDialog::StateChanged( StateChangedType nType ) Dialog::StateChanged( nType ); } -// ----------------------------------------------------------------------- + bool WizardDialog::Notify( NotifyEvent& rNEvt ) { @@ -489,14 +489,14 @@ bool WizardDialog::Notify( NotifyEvent& rNEvt ) return Dialog::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void WizardDialog::ActivatePage() { maActivateHdl.Call( this ); } -// ----------------------------------------------------------------------- + long WizardDialog::DeactivatePage() { @@ -506,14 +506,14 @@ long WizardDialog::DeactivatePage() return sal_True; } -// ----------------------------------------------------------------------- + sal_Bool WizardDialog::ShowNextPage() { return ShowPage( mnCurLevel+1 ); } -// ----------------------------------------------------------------------- + sal_Bool WizardDialog::ShowPrevPage() { @@ -522,7 +522,7 @@ sal_Bool WizardDialog::ShowPrevPage() return ShowPage( mnCurLevel-1 ); } -// ----------------------------------------------------------------------- + sal_Bool WizardDialog::ShowPage( sal_uInt16 nLevel ) { @@ -537,7 +537,7 @@ sal_Bool WizardDialog::ShowPage( sal_uInt16 nLevel ) return sal_False; } -// ----------------------------------------------------------------------- + sal_Bool WizardDialog::Finnish( long nResult ) { @@ -556,7 +556,7 @@ sal_Bool WizardDialog::Finnish( long nResult ) return sal_False; } -// ----------------------------------------------------------------------- + void WizardDialog::AddPage( TabPage* pPage ) { @@ -575,7 +575,7 @@ void WizardDialog::AddPage( TabPage* pPage ) } } -// ----------------------------------------------------------------------- + void WizardDialog::RemovePage( TabPage* pPage ) { @@ -602,7 +602,7 @@ void WizardDialog::RemovePage( TabPage* pPage ) OSL_FAIL( "WizardDialog::RemovePage() - Page not in list" ); } -// ----------------------------------------------------------------------- + void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage ) { @@ -625,7 +625,7 @@ void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage ) } } -// ----------------------------------------------------------------------- + TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const { @@ -643,7 +643,7 @@ TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const return NULL; } -// ----------------------------------------------------------------------- + void WizardDialog::AddButton( Button* pButton, long nOffset ) { @@ -663,7 +663,7 @@ void WizardDialog::AddButton( Button* pButton, long nOffset ) } } -// ----------------------------------------------------------------------- + void WizardDialog::RemoveButton( Button* pButton ) { @@ -688,7 +688,7 @@ void WizardDialog::RemoveButton( Button* pButton ) OSL_FAIL( "WizardDialog::RemoveButton() - Button not in list" ); } -// ----------------------------------------------------------------------- + void WizardDialog::ShowButtonFixedLine( sal_Bool bVisible ) { diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 0893e64c5f9a..481b135622f0 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -121,20 +121,20 @@ SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< uno::XCompon { } -// ----------------------------------------------------------------------------- + SvFilterOptionsDialog::~SvFilterOptionsDialog() { } -// ----------------------------------------------------------------------------- + void SAL_CALL SvFilterOptionsDialog::acquire() throw() { OWeakObject::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL SvFilterOptionsDialog::release() throw() { diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 3642591fc154..572412c95252 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -47,9 +47,9 @@ using namespace ::com::sun::star; namespace unographic { -// --------------------- + // - GraphicDescriptor - -// --------------------- + GraphicDescriptor::GraphicDescriptor() : ::comphelper::PropertySetHelper( createPropertySetInfo(), SAL_NO_ACQUIRE ), @@ -62,14 +62,14 @@ GraphicDescriptor::GraphicDescriptor() : { } -// ------------------------------------------------------------------------------ + GraphicDescriptor::~GraphicDescriptor() throw() { } -// ------------------------------------------------------------------------------ + void GraphicDescriptor::init( const ::Graphic& rGraphic ) throw() @@ -77,7 +77,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic ) mpGraphic = &rGraphic; } -// ------------------------------------------------------------------------------ + void GraphicDescriptor::init( const OUString& rURL ) throw() @@ -91,7 +91,7 @@ void GraphicDescriptor::init( const OUString& rURL ) } } -// ------------------------------------------------------------------------------ + void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL ) throw() @@ -105,7 +105,7 @@ void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, } } -// ------------------------------------------------------------------------------ + void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) { @@ -171,7 +171,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) } } -// ------------------------------------------------------------------------------ + OUString GraphicDescriptor::getImplementationName_Static() throw() @@ -179,7 +179,7 @@ OUString GraphicDescriptor::getImplementationName_Static() return OUString( "com.sun.star.comp.graphic.GraphicDescriptor" ); } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() throw( ) @@ -191,7 +191,7 @@ uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() return aSeq; } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException ) @@ -214,7 +214,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) return aAny; } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) @@ -222,7 +222,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) return OWeakAggObject::queryInterface( rType ); } -// ------------------------------------------------------------------------------ + void SAL_CALL GraphicDescriptor::acquire() throw() @@ -230,7 +230,7 @@ void SAL_CALL GraphicDescriptor::acquire() OWeakAggObject::acquire(); } -// ------------------------------------------------------------------------------ + void SAL_CALL GraphicDescriptor::release() throw() @@ -238,7 +238,7 @@ void SAL_CALL GraphicDescriptor::release() OWeakAggObject::release(); } -// ------------------------------------------------------------------------------ + OUString SAL_CALL GraphicDescriptor::getImplementationName() throw( uno::RuntimeException ) @@ -252,7 +252,7 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceNam return cppu::supportsService(this, ServiceName); } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() throw( uno::RuntimeException ) @@ -260,7 +260,7 @@ uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() return getSupportedServiceNames_Static(); } -// ------------------------------------------------------------------------------ + uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes() throw( uno::RuntimeException ) @@ -289,7 +289,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() return theGraphicDescriptorUnoTunnelId::get().getSeq(); } -// ------------------------------------------------------------------------------ + ::comphelper::PropertySetInfo* GraphicDescriptor::createPropertySetInfo() { @@ -315,7 +315,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() return pRet; } -// ------------------------------------------------------------------------------ + void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ ) throw( beans::UnknownPropertyException, @@ -326,7 +326,7 @@ void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** // we only have readonly attributes } -// ------------------------------------------------------------------------------ + void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) throw( beans::UnknownPropertyException, lang::WrappedTargetException ) diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index 6cfabaa6d545..bc8546e199a3 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -37,7 +37,7 @@ Graphic::Graphic() : { } -// ------------------------------------------------------------------------------ + Graphic::~Graphic() throw() @@ -45,7 +45,7 @@ Graphic::~Graphic() delete mpGraphic; } -// ------------------------------------------------------------------------------ + void Graphic::init( const ::Graphic& rGraphic ) throw() @@ -55,7 +55,7 @@ void Graphic::init( const ::Graphic& rGraphic ) ::unographic::GraphicDescriptor::init( *mpGraphic ); } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) throw( uno::RuntimeException ) @@ -73,7 +73,7 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) return aAny ; } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) @@ -84,7 +84,7 @@ uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) return aReturn; } -// ------------------------------------------------------------------------------ + void SAL_CALL Graphic::acquire() throw() @@ -92,14 +92,14 @@ void SAL_CALL Graphic::acquire() ::unographic::GraphicDescriptor::acquire(); } -// ------------------------------------------------------------------------------ + void SAL_CALL Graphic::release() throw() { ::unographic::GraphicDescriptor::release(); } -// ------------------------------------------------------------------------------ + namespace { @@ -112,7 +112,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static() return theGraphicUnoTunnelId::get().getSeq(); } -// ------------------------------------------------------------------------------ + OUString Graphic::getImplementationName_Static() throw() @@ -120,7 +120,7 @@ OUString Graphic::getImplementationName_Static() return OUString( "com.sun.star.comp.graphic.Graphic" ); } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > Graphic::getSupportedServiceNames_Static() throw() @@ -172,7 +172,7 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() return aRet; } -// ------------------------------------------------------------------------------ + uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() throw(uno::RuntimeException) @@ -180,7 +180,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() return getImplementationId_Static(); } -// ------------------------------------------------------------------------------ + ::sal_Int8 SAL_CALL Graphic::getType() throw (uno::RuntimeException) @@ -193,9 +193,9 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() return cRet; } -//---------------------------------------------------------------------- + // XBitmap -//---------------------------------------------------------------------- + awt::Size SAL_CALL Graphic::getSize( ) throw (uno::RuntimeException) { @@ -208,7 +208,7 @@ awt::Size SAL_CALL Graphic::getSize( ) throw (uno::RuntimeException) return awt::Size( aVclSize.Width(), aVclSize.Height() ); } -//---------------------------------------------------------------------- + uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeException) { @@ -227,7 +227,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeExce } } -//---------------------------------------------------------------------- + uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB( ) throw (uno::RuntimeException) { @@ -246,7 +246,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB( ) throw (uno::Runtime } } -//---------------------------------------------------------------------- + const ::Graphic* Graphic::getImplementation( const uno::Reference< uno::XInterface >& rxIFace ) throw() { @@ -254,7 +254,7 @@ const ::Graphic* Graphic::getImplementation( const uno::Reference< uno::XInterfa return( xTunnel.is() ? reinterpret_cast< ::Graphic* >( xTunnel->getSomething( getImplementationId_Static() ) ) : NULL ); } -//---------------------------------------------------------------------- + sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException ) { diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index a98e534bf9cc..d8057c1b8198 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -21,9 +21,9 @@ #include <tools/vcompat.hxx> #include <svtools/grfmgr.hxx> -// --------------- + // - GraphicAttr - -// --------------- + GraphicAttr::GraphicAttr() : mfGamma ( 1.0 ), @@ -44,13 +44,13 @@ GraphicAttr::GraphicAttr() : { } -// ------------------------------------------------------------------------ + GraphicAttr::~GraphicAttr() { } -// ------------------------------------------------------------------------ + sal_Bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const { @@ -71,7 +71,7 @@ sal_Bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const ( meDrawMode == rAttr.meDrawMode ) ); } -// ------------------------------------------------------------------------ + SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr ) { @@ -98,7 +98,7 @@ SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr ) return rIStm; } -// ------------------------------------------------------------------------ + SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr ) { diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index ea953e9ea18b..55eb718f07df 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -30,17 +30,17 @@ #include "grfcache.hxx" #include <svtools/grfmgr.hxx> -// ----------- + // - defines - -// ----------- + #define WATERMARK_LUM_OFFSET 50 #define WATERMARK_CON_OFFSET -70 #define MAP( cVal0, cVal1, nFrac ) ((sal_uInt8)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L)) -// ------------------ + // - GraphicManager - -// ------------------ + GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize ) : mpCache( new GraphicCache( nCacheSize, nMaxObjCacheSize ) ) diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index f4030333ff78..aa8d4665457a 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -102,7 +102,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() return theGraphicProviderUnoTunnelId::get().getSeq(); } -// ------------------------------------------------------------------------------ + uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) const { @@ -144,7 +144,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS return xRet; } -// ------------------------------------------------------------------------------ + uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) const { @@ -165,7 +165,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( } -// ------------------------------------------------------------------------------ + uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) const { @@ -195,7 +195,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co return xRet; } -// ------------------------------------------------------------------------------ + uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm ) const { @@ -229,7 +229,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno return xRet; } -// ------------------------------------------------------------------------------ + uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) const { @@ -309,7 +309,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O return xRet; } -// ------------------------------------------------------------------------------ + uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDescriptor( const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -382,7 +382,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc return xRet; } -// ------------------------------------------------------------------------------ + uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) @@ -727,7 +727,7 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal } } -// ------------------------------------------------------------------------------ + void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 1577ba747c64..d57823f85acf 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -47,14 +47,14 @@ GraphicRendererVCL::GraphicRendererVCL() : { } -// ------------------------------------------------------------------------------ + GraphicRendererVCL::~GraphicRendererVCL() throw() { } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException ) @@ -79,7 +79,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType return aAny; } -// ------------------------------------------------------------------------------ + uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) @@ -87,7 +87,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) return OWeakAggObject::queryInterface( rType ); } -// ------------------------------------------------------------------------------ + void SAL_CALL GraphicRendererVCL::acquire() throw() @@ -95,7 +95,7 @@ void SAL_CALL GraphicRendererVCL::acquire() OWeakAggObject::acquire(); } -// ------------------------------------------------------------------------------ + void SAL_CALL GraphicRendererVCL::release() throw() @@ -103,7 +103,7 @@ void SAL_CALL GraphicRendererVCL::release() OWeakAggObject::release(); } -// ------------------------------------------------------------------------------ + OUString SAL_CALL GraphicRendererVCL::getImplementationName() throw( uno::RuntimeException ) @@ -117,7 +117,7 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceNa return cppu::supportsService(this, ServiceName); } -// ------------------------------------------------------------------------------ + uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() throw( uno::RuntimeException ) @@ -127,7 +127,7 @@ uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames( return aSeq; } -// ------------------------------------------------------------------------------ + uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes() throw( uno::RuntimeException ) @@ -157,7 +157,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() return theGraphicRendererVCLUnoTunnelId::get().getSeq(); } -// ------------------------------------------------------------------------------ + ::comphelper::PropertySetInfo* GraphicRendererVCL::createPropertySetInfo() { @@ -178,7 +178,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() return pRet; } -// ------------------------------------------------------------------------------ + void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) throw( beans::UnknownPropertyException, @@ -233,7 +233,7 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry* } } -// ------------------------------------------------------------------------------ + void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) throw( beans::UnknownPropertyException, lang::WrappedTargetException ) @@ -272,7 +272,7 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry* } } -// ------------------------------------------------------------------------------ + void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic ) throw (uno::RuntimeException) diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 30f07c7af197..cf05cc2cfbda 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -38,21 +38,21 @@ using namespace com::sun::star; namespace unographic { -// ---------------------- + // - GraphicTransformer - -// ---------------------- + GraphicTransformer::GraphicTransformer() { } -// ------------------------------------------------------------------------------ + GraphicTransformer::~GraphicTransformer() { } -// ------------------------------------------------------------------------------ + void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo ) { diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index b4ffcc917473..45b2eaef9ca6 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -82,7 +82,7 @@ class MainThreadFrameCloserRequest static void Start( MainThreadFrameCloserRequest* pRequest ); }; -// -------------------------------------------------------- + void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTRequest ) { if ( pMTRequest ) @@ -97,7 +97,7 @@ void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTReque } } -// -------------------------------------------------------- + IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserRequest*, pMTRequest ) { (void) pThis; // unused @@ -167,7 +167,7 @@ ODocumentCloser::ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArg 0 ); } -// -------------------------------------------------------- + ODocumentCloser::~ODocumentCloser() { if ( m_pListenersContainer ) @@ -178,7 +178,7 @@ ODocumentCloser::~ODocumentCloser() } // XComponent -// -------------------------------------------------------- + void SAL_CALL ODocumentCloser::dispose() throw (uno::RuntimeException) { @@ -202,7 +202,7 @@ void SAL_CALL ODocumentCloser::dispose() m_bDisposed = sal_True; } -// -------------------------------------------------------- + void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw (uno::RuntimeException) { @@ -216,7 +216,7 @@ void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEv m_pListenersContainer->addInterface( xListener ); } -// -------------------------------------------------------- + void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw (uno::RuntimeException) { diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 92237e2a0f85..36c0457ffe1a 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -43,11 +43,11 @@ namespace svt { -//----------------------------------------------- + class SVT_DLLPRIVATE AsyncAccelExec { public: - //--------------------------------------- + /** creates a new instance of this class, which can be used one times only! @@ -60,7 +60,7 @@ class SVT_DLLPRIVATE AsyncAccelExec void execAsync(); private: - //--------------------------------------- + /** @short allow creation of instances of this class by using our factory only! */ @@ -75,14 +75,14 @@ class SVT_DLLPRIVATE AsyncAccelExec css::util::URL m_aURL; }; -//----------------------------------------------- + AcceleratorExecute::AcceleratorExecute() : TMutexInit ( ) , m_aAsyncCallback(LINK(this, AcceleratorExecute, impl_ts_asyncCallback)) { } -//----------------------------------------------- + AcceleratorExecute::AcceleratorExecute(const AcceleratorExecute&) : TMutexInit ( ) , m_aAsyncCallback(LINK(this, AcceleratorExecute, impl_ts_asyncCallback)) @@ -91,20 +91,20 @@ AcceleratorExecute::AcceleratorExecute(const AcceleratorExecute&) // but we need this ctor to init our async callback ... } -//----------------------------------------------- + AcceleratorExecute::~AcceleratorExecute() { // does nothing real } -//----------------------------------------------- + AcceleratorExecute* AcceleratorExecute::createAcceleratorHelper() { AcceleratorExecute* pNew = new AcceleratorExecute(); return pNew; } -//----------------------------------------------- + void AcceleratorExecute::init(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xEnv ) { @@ -168,14 +168,14 @@ void AcceleratorExecute::init(const css::uno::Reference< css::uno::XComponentCon // <- SAFE ---------------------------------- } -//----------------------------------------------- + sal_Bool AcceleratorExecute::execute(const KeyCode& aVCLKey) { css::awt::KeyEvent aAWTKey = AcceleratorExecute::st_VCLKey2AWTKey(aVCLKey); return execute(aAWTKey); } -//----------------------------------------------- + sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) { OUString sCommand = impl_ts_findCommand(aAWTKey); @@ -211,7 +211,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) return bRet; } -//----------------------------------------------- + css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey) { css::awt::KeyEvent aAWTKey; @@ -229,7 +229,7 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey) return aAWTKey; } -//----------------------------------------------- + KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { sal_Bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT ); @@ -240,12 +240,12 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) return KeyCode(nKey, bShift, bMod1, bMod2, bMod3); } -//----------------------------------------------- + OUString AcceleratorExecute::findCommand(const css::awt::KeyEvent& aKey) { return impl_ts_findCommand(aKey); } -//----------------------------------------------- + OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey) { // SAFE -> ---------------------------------- @@ -363,7 +363,7 @@ OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey) return OUString(); } -//----------------------------------------------- + css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st_openModuleConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame) { @@ -394,7 +394,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st return xAccCfg; } -//----------------------------------------------- + css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel) { css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg; @@ -407,7 +407,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st return xAccCfg; } -//----------------------------------------------- + css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_getURLParser() { // SAFE -> ---------------------------------- @@ -431,14 +431,14 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge return xParser; } -//----------------------------------------------- + IMPL_LINK_NOARG(AcceleratorExecute, impl_ts_asyncCallback) { // replaced by AsyncAccelExec! return 0; } -//----------------------------------------------- + AsyncAccelExec::AsyncAccelExec(const css::uno::Reference< css::frame::XDispatch >& xDispatch, const css::util::URL& aURL ) : m_aAsyncCallback(LINK(this, AsyncAccelExec, impl_ts_asyncCallback)) @@ -447,7 +447,7 @@ AsyncAccelExec::AsyncAccelExec(const css::uno::Reference< css::frame::XDispatch { } -//----------------------------------------------- + AsyncAccelExec* AsyncAccelExec::createOnShotInstance(const css::uno::Reference< css::frame::XDispatch >& xDispatch, const css::util::URL& aURL ) { @@ -455,13 +455,13 @@ AsyncAccelExec* AsyncAccelExec::createOnShotInstance(const css::uno::Reference< return pExec; } -//----------------------------------------------- + void AsyncAccelExec::execAsync() { m_aAsyncCallback.Post(0); } -//----------------------------------------------- + IMPL_LINK(AsyncAccelExec, impl_ts_asyncCallback, void*,) { if (! m_xDispatch.is()) diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index a0ef4e0a4076..bcd5395e2125 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; -// ----------------------------------------------------------------------------- + TransferableClipboardListener::TransferableClipboardListener( const Link& rCallback ) : aLink( rCallback ) diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index b08fe017a949..8f3eb8513d37 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -31,7 +31,7 @@ namespace svt //===================================================================== //= DialogClosedListener //===================================================================== - //--------------------------------------------------------------------- + DialogClosedListener::DialogClosedListener() { } diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index e89a97ca0307..b8c06b137193 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -31,7 +31,7 @@ namespace svt //===================================================================== //= IWindowOperator //===================================================================== - //--------------------------------------------------------------------- + IWindowOperator::~IWindowOperator() { } @@ -39,7 +39,7 @@ namespace svt //===================================================================== //= IWindowEventFilter //===================================================================== - //--------------------------------------------------------------------- + IWindowEventFilter::~IWindowEventFilter() { } @@ -65,7 +65,7 @@ namespace svt //===================================================================== //= DialogController //===================================================================== - //--------------------------------------------------------------------- + DialogController::DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ) :m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, _pOperator ) ) @@ -76,13 +76,13 @@ namespace svt m_pImpl->rInstigator.AddEventListener( LINK( this, DialogController, OnWindowEvent ) ); } - //--------------------------------------------------------------------- + DialogController::~DialogController() { reset(); } - //--------------------------------------------------------------------- + void DialogController::reset() { m_pImpl->rInstigator.RemoveEventListener( LINK( this, DialogController, OnWindowEvent ) ); @@ -91,7 +91,7 @@ namespace svt m_pImpl->pOperator.reset(); } - //--------------------------------------------------------------------- + void DialogController::addDependentWindow( Window& _rWindow ) { m_pImpl->aConcernedWindows.push_back( &_rWindow ); @@ -100,7 +100,7 @@ namespace svt impl_update( aEvent, _rWindow ); } - //--------------------------------------------------------------------- + IMPL_LINK( DialogController, OnWindowEvent, const VclWindowEvent*, _pEvent ) { if ( m_pImpl->pEventFilter->payAttentionTo( *_pEvent ) ) @@ -108,7 +108,7 @@ namespace svt return 0L; } - //--------------------------------------------------------------------- + void DialogController::impl_updateAll( const VclWindowEvent& _rTriggerEvent ) { for ( ::std::vector< Window* >::iterator loop = m_pImpl->aConcernedWindows.begin(); @@ -118,7 +118,7 @@ namespace svt impl_update( _rTriggerEvent, *(*loop) ); } - //--------------------------------------------------------------------- + void DialogController::impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ) { m_pImpl->pOperator->operateOn( _rTriggerEvent, _rWindow ); @@ -135,18 +135,18 @@ namespace svt //===================================================================== //= ControlDependencyManager //===================================================================== - //--------------------------------------------------------------------- + ControlDependencyManager::ControlDependencyManager() :m_pImpl( new ControlDependencyManager_Data ) { } - //--------------------------------------------------------------------- + ControlDependencyManager::~ControlDependencyManager() { } - //--------------------------------------------------------------------- + namespace { struct ResetDialogController : public ::std::unary_function< const PDialogController&, void > @@ -158,21 +158,21 @@ namespace svt }; } - //--------------------------------------------------------------------- + void ControlDependencyManager::clear() { ::std::for_each( m_pImpl->aControllers.begin(), m_pImpl->aControllers.end(), ResetDialogController() ); m_pImpl->aControllers.clear(); } - //--------------------------------------------------------------------- + void ControlDependencyManager::addController( const PDialogController& _pController ) { OSL_ENSURE( _pController.get() != NULL, "ControlDependencyManager::addController: invalid controller, this will crash, sooner or later!" ); m_pImpl->aControllers.push_back( _pController ); } - //--------------------------------------------------------------------- + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); @@ -180,7 +180,7 @@ namespace svt m_pImpl->aControllers.push_back( pController ); } - //--------------------------------------------------------------------- + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); @@ -189,7 +189,7 @@ namespace svt m_pImpl->aControllers.push_back( pController ); } - //--------------------------------------------------------------------- + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); @@ -199,7 +199,7 @@ namespace svt m_pImpl->aControllers.push_back( pController ); } - //--------------------------------------------------------------------- + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); @@ -211,7 +211,7 @@ namespace svt m_pImpl->aControllers.push_back( pController ); } - //--------------------------------------------------------------------- + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); @@ -219,7 +219,7 @@ namespace svt m_pImpl->aControllers.push_back( pController ); } - //--------------------------------------------------------------------- + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); @@ -228,7 +228,7 @@ namespace svt m_pImpl->aControllers.push_back( pController ); } - //--------------------------------------------------------------------- + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 48719a369d7f..338d74584e01 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -142,7 +142,7 @@ static sal_uInt16 aWndFunc( return nRet; } -//------------------------------------------------------------------------- + SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong lEndP, ResMgr *pMgrP) : @@ -156,14 +156,14 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong l } } -//------------------------------------------------------------------------- + SfxErrorHandler::~SfxErrorHandler() { delete pFreeMgr; } -//------------------------------------------------------------------------- + bool SfxErrorHandler::CreateString( const ErrorInfo *pErr, OUString &rStr, sal_uInt16& nFlags) const @@ -210,7 +210,7 @@ bool SfxErrorHandler::CreateString( return false; } -//------------------------------------------------------------------------- + class ResString: public OUString @@ -229,7 +229,7 @@ class ResString: public OUString ResString( ResId &rId); }; -//------------------------------------------------------------------------- + ResString::ResString(ResId & rId): OUString(rId.SetAutoRelease(false).toString()), @@ -243,7 +243,7 @@ ResString::ResString(ResId & rId): pResMgr->PopContext(); } -//------------------------------------------------------------------------- + struct ErrorResource_Impl : private Resource @@ -293,7 +293,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) con return bRet; } -//------------------------------------------------------------------------- + sal_Bool SfxErrorHandler::GetMessageString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -323,7 +323,7 @@ sal_Bool SfxErrorHandler::GetMessageString( return bRet; } -//------------------------------------------------------------------------- + sal_Bool SfxErrorHandler::GetErrorString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -371,7 +371,7 @@ sal_Bool SfxErrorHandler::GetErrorString( return bRet; } -//------------------------------------------------------------------------- + SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) @@ -381,7 +381,7 @@ SfxErrorContext::SfxErrorContext( nResId=RID_ERRCTX; } -//------------------------------------------------------------------------- + SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1P, Window *pWindow, @@ -393,7 +393,7 @@ SfxErrorContext::SfxErrorContext( nResId=RID_ERRCTX; } -//------------------------------------------------------------------------- + bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 45e621dd7b09..ee9a77eb51ad 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -54,7 +54,7 @@ SvEmbedTransferHelper::SvEmbedTransferHelper( const uno::Reference< embed::XEmbe } } -// ----------------------------------------------------------------------------- + SvEmbedTransferHelper::~SvEmbedTransferHelper() { @@ -65,7 +65,7 @@ SvEmbedTransferHelper::~SvEmbedTransferHelper() } } -// ----------------------------------------------------------------------------- + void SvEmbedTransferHelper::AddSupportedFormats() { @@ -74,7 +74,7 @@ void SvEmbedTransferHelper::AddSupportedFormats() AddFormat( FORMAT_GDIMETAFILE ); } -// ----------------------------------------------------------------------------- + sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { @@ -181,7 +181,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D return bRet; } -// ----------------------------------------------------------------------------- + void SvEmbedTransferHelper::ObjectReleased() { diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index af24eab18539..713b195b5976 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -70,7 +70,7 @@ namespace svt virtual ::sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); }; - //-------------------------------------------------------------------- + StreamSupplier::StreamSupplier( const Reference< XInputStream >& _rxInput, const Reference< XOutputStream >& _rxOutput ) :m_xInput( _rxInput ) ,m_xOutput( _rxOutput ) @@ -81,19 +81,19 @@ namespace svt OSL_ENSURE( m_xSeekable.is(), "StreamSupplier::StreamSupplier: at least one of both must be seekable!" ); } - //-------------------------------------------------------------------- + Reference< XInputStream > SAL_CALL StreamSupplier::getInputStream( ) throw (RuntimeException) { return m_xInput; } - //-------------------------------------------------------------------- + Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream( ) throw (RuntimeException) { return m_xOutput; } - //-------------------------------------------------------------------- + void SAL_CALL StreamSupplier::seek( ::sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException) { if ( !m_xSeekable.is() ) @@ -102,7 +102,7 @@ namespace svt m_xSeekable->seek( location ); } - //-------------------------------------------------------------------- + ::sal_Int64 SAL_CALL StreamSupplier::getPosition( ) throw (IOException, RuntimeException) { if ( !m_xSeekable.is() ) @@ -111,7 +111,7 @@ namespace svt return m_xSeekable->getPosition(); } - //-------------------------------------------------------------------- + ::sal_Int64 SAL_CALL StreamSupplier::getLength( ) throw (IOException, RuntimeException) { if ( !m_xSeekable.is() ) @@ -123,7 +123,7 @@ namespace svt //==================================================================== //= GraphicAccess //==================================================================== - //-------------------------------------------------------------------- + bool GraphicAccess::isSupportedURL( const OUString& _rURL ) { if ( _rURL.startsWith( "private:resource/" ) @@ -136,7 +136,7 @@ namespace svt return false; } - //-------------------------------------------------------------------- + SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL ) { SvStream* pReturn = NULL; @@ -180,7 +180,7 @@ namespace svt return pReturn; } - //-------------------------------------------------------------------- + Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL ) { return new OSeekableInputStreamWrapper( getImageStream( _rxContext, _rImageResourceURL ), true ); // take ownership diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 9a20be97284c..bc1260b7e310 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -30,7 +30,7 @@ DBG_NAME(SfxItemDesruptor_Impl); -// ----------------------------------------------------------------------- + class SfxItemDesruptor_Impl { @@ -47,7 +47,7 @@ public: ~SfxItemDesruptor_Impl(); }; -// ------------------------------------------------------------------------ + SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ): pItem(pItemToDesrupt), aLink( LINK(this, SfxItemDesruptor_Impl, Delete) ) @@ -64,7 +64,7 @@ void SfxItemDesruptor_Impl::LaunchDeleteOnIdle() GetpApp()->InsertIdleHdl( aLink, 1 ); } -// ------------------------------------------------------------------------ + SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl() { DBG_DTOR(SfxItemDesruptor_Impl, 0); @@ -78,7 +78,7 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl() delete pItem; } -// ------------------------------------------------------------------------ + IMPL_LINK_NOARG(SfxItemDesruptor_Impl, Delete) { {DBG_CHKTHIS(SfxItemDesruptor_Impl, 0);} diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 7ddf25fcad6c..fe1480bf7499 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText ) { @@ -112,7 +112,7 @@ SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText ) return aRes; } -//------------------------------------------------------------------------ + namespace { BOOST_STATIC_ASSERT( @@ -125,13 +125,13 @@ SvtLanguageTable::SvtLanguageTable() : { } -//------------------------------------------------------------------------ + SvtLanguageTable::~SvtLanguageTable() { } -//------------------------------------------------------------------------ + const OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const { @@ -156,7 +156,7 @@ OUString SvtLanguageTable::GetLanguageString( const LanguageType eType ) return aLangTable.GetString( eType ); } -//------------------------------------------------------------------------ + LanguageType SvtLanguageTable::GetType( const OUString& rStr ) const { @@ -174,14 +174,14 @@ LanguageType SvtLanguageTable::GetType( const OUString& rStr ) const return eType; } -//------------------------------------------------------------------------ + sal_uInt32 SvtLanguageTable::GetEntryCount() const { return Count(); } -//------------------------------------------------------------------------ + LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32 nIndex ) const { @@ -191,6 +191,6 @@ LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32 nIndex ) const return nType; } -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 5286a7e25546..c739afcc2a2a 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -45,7 +45,7 @@ OpenFileDropTargetListener::OpenFileDropTargetListener( const css::uno::Referenc { } -// ----------------------------------------------------------------------------- + OpenFileDropTargetListener::~OpenFileDropTargetListener() { @@ -55,7 +55,7 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener() m_pFormats = NULL; } -// ----------------------------------------------------------------------------- + void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException ) { @@ -63,7 +63,7 @@ void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObjec m_xContext.clear(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw( css::uno::RuntimeException ) { @@ -98,7 +98,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr } } -// ----------------------------------------------------------------------------- + void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw( css::uno::RuntimeException ) { @@ -113,7 +113,7 @@ void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dn dragOver( dtdee ); } -// ----------------------------------------------------------------------------- + void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw( css::uno::RuntimeException ) { @@ -126,7 +126,7 @@ void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd } } -// ----------------------------------------------------------------------------- + void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw( css::uno::RuntimeException ) { @@ -145,7 +145,7 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd } } -// ----------------------------------------------------------------------------- + void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw( css::uno::RuntimeException ) { diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx index 579a9998d2e7..19d90ec82143 100644 --- a/svtools/source/misc/stringtransfer.cxx +++ b/svtools/source/misc/stringtransfer.cxx @@ -30,20 +30,20 @@ namespace svt //==================================================================== //= OStringTransferable //==================================================================== - //-------------------------------------------------------------------- + OStringTransferable::OStringTransferable(const OUString& _rContent) :TransferableHelper() ,m_sContent( _rContent ) { } - //-------------------------------------------------------------------- + void OStringTransferable::AddSupportedFormats() { AddFormat(SOT_FORMAT_STRING); } - //-------------------------------------------------------------------- + sal_Bool OStringTransferable::GetData( const DataFlavor& _rFlavor ) { sal_uInt32 nFormat = SotExchange::GetFormat( _rFlavor ); @@ -56,7 +56,7 @@ namespace svt //==================================================================== //= OStringTransfer //==================================================================== - //-------------------------------------------------------------------- + void OStringTransfer::CopyString( const OUString& _rContent, Window* _pWindow ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); @@ -64,7 +64,7 @@ namespace svt pTransferable->CopyToClipboard( _pWindow ); } - //-------------------------------------------------------------------- + sal_Bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow ) { TransferableDataHelper aClipboardData = TransferableDataHelper::CreateFromSystemClipboard( _pWindow ); @@ -88,7 +88,7 @@ namespace svt return sal_False; } - //-------------------------------------------------------------------- + void OStringTransfer::StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 86b81037b5b9..4370aebffbff 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -220,23 +220,23 @@ namespace svt } }; - //---------------------------------------------------------------- + AccessibleDummyFactory::AccessibleDummyFactory() { } - //---------------------------------------------------------------- + AccessibleDummyFactory::~AccessibleDummyFactory() { } - //---------------------------------------------------------------- + oslInterlockedCount SAL_CALL AccessibleDummyFactory::acquire() { return osl_atomic_increment( &m_refCount ); } - //---------------------------------------------------------------- + oslInterlockedCount SAL_CALL AccessibleDummyFactory::release() { if ( 0 == osl_atomic_decrement( &m_refCount ) ) @@ -251,13 +251,13 @@ namespace svt //==================================================================== //= AccessibleFactoryAccess //==================================================================== - //-------------------------------------------------------------------- + AccessibleFactoryAccess::AccessibleFactoryAccess() :m_bInitialized( false ) { } - //-------------------------------------------------------------------- + #ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } #else @@ -315,7 +315,7 @@ namespace svt m_bInitialized = true; } - //-------------------------------------------------------------------- + AccessibleFactoryAccess::~AccessibleFactoryAccess() { if ( m_bInitialized ) @@ -337,7 +337,7 @@ namespace svt } } - //-------------------------------------------------------------------- + IAccessibleFactory& AccessibleFactoryAccess::getFactory() { ensureInitialized(); diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 6a49d9dbbad7..55b6db900864 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -55,7 +55,7 @@ namespace svt //===================================================================== //= helpers //===================================================================== - //--------------------------------------------------------------------- + SvStream& WriteDateTime( SvStream& _rStorage, const util::DateTime& _rDate ) { sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / Time::nanoPerCenti ); @@ -71,7 +71,7 @@ namespace svt return _rStorage; } - //--------------------------------------------------------------------- + SvStream& operator >> ( SvStream& _rStorage, util::DateTime& _rDate ) { sal_uInt16 hundredthSeconds; @@ -88,7 +88,7 @@ namespace svt return _rStorage; } - //--------------------------------------------------------------------- + sal_Bool operator == ( const util::DateTime& _rLHS, const util::DateTime& _rRHS ) { return _rLHS.NanoSeconds == _rRHS.NanoSeconds @@ -101,7 +101,7 @@ namespace svt && _rLHS.IsUTC == _rRHS.IsUTC; } - //--------------------------------------------------------------------- + sal_Bool operator != ( const util::DateTime& _rLHS, const util::DateTime& _rRHS ) { return !( _rLHS == _rRHS ); @@ -158,10 +158,10 @@ namespace svt { m_aSubContents.push_back( _rxNewElement ); } }; - //--------------------------------------------------------------------- + DBG_NAME( TemplateContent ) - //--------------------------------------------------------------------- + TemplateContent::TemplateContent( const INetURLObject& _rURL ) :m_aURL( _rURL ) { @@ -171,7 +171,7 @@ namespace svt implResetDate(); } - //--------------------------------------------------------------------- + TemplateContent::~TemplateContent() { DBG_DTOR( TemplateContent, NULL ); @@ -180,7 +180,7 @@ namespace svt //===================================================================== //= stl helpers //===================================================================== - //--------------------------------------------------------------------- + /// compares two TemplateContent by URL struct TemplateContentURLLess :public ::std::binary_function < ::rtl::Reference< TemplateContent > @@ -196,7 +196,7 @@ namespace svt } }; - //--------------------------------------------------------------------- + /// sorts the sib contents of a TemplateFolderContent struct SubContentSort : public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > { @@ -225,7 +225,7 @@ namespace svt } } }; - //--------------------------------------------------------------------- + /** does a deep compare of two template contents */ struct TemplateContentEqual @@ -270,7 +270,7 @@ namespace svt } }; - //--------------------------------------------------------------------- + /// base class for functors which act an an SvStream struct StorageHelper { @@ -279,7 +279,7 @@ namespace svt StorageHelper( SvStream& _rStorage ) : m_rStorage( _rStorage ) { } }; - //--------------------------------------------------------------------- + /// functor which allows storing a string struct StoreString :public ::std::unary_function< OUString, void > @@ -293,7 +293,7 @@ namespace svt } }; - //--------------------------------------------------------------------- + /// functor which stores the local name of a TemplateContent struct StoreLocalContentName :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > @@ -310,7 +310,7 @@ namespace svt } }; - //--------------------------------------------------------------------- + struct StoreContentURL :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > ,public StoreString @@ -334,7 +334,7 @@ namespace svt } }; - //--------------------------------------------------------------------- + /// functor which stores the complete content of a TemplateContent struct StoreFolderContent :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > @@ -382,7 +382,7 @@ namespace svt } }; - //--------------------------------------------------------------------- + /// functor which reads a complete TemplateContent instance struct ReadFolderContent :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > @@ -488,7 +488,7 @@ namespace svt uno::Reference< util::XOfficeInstallationDirectories > getOfficeInstDirs(); }; - //--------------------------------------------------------------------- + TemplateFolderCacheImpl::TemplateFolderCacheImpl( sal_Bool _bAutoStoreState ) :m_pCacheStream ( NULL ) ,m_bNeedsUpdate ( sal_True ) @@ -498,7 +498,7 @@ namespace svt { } - //--------------------------------------------------------------------- + TemplateFolderCacheImpl::~TemplateFolderCacheImpl( ) { // store the current state if possible and required @@ -508,7 +508,7 @@ namespace svt closeCacheStream( ); } - //--------------------------------------------------------------------- + sal_Int32 TemplateFolderCacheImpl::getMagicNumber() { sal_Int32 nMagic = 0; @@ -519,20 +519,20 @@ namespace svt return nMagic; } - //--------------------------------------------------------------------- + OUString TemplateFolderCacheImpl::getCacheFileName() { return OUString(".templdir.cache"); } - //--------------------------------------------------------------------- + void TemplateFolderCacheImpl::normalize( TemplateFolderContent& _rState ) { SubContentSort()( _rState ); } - //--------------------------------------------------------------------- + sal_Bool TemplateFolderCacheImpl::equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ) { if ( _rLHS.size() != _rRHS.size() ) @@ -551,7 +551,7 @@ namespace svt return aFirstDifferent.first == _rLHS.end(); } - //--------------------------------------------------------------------- + void TemplateFolderCacheImpl::storeState( sal_Bool _bForceRetrieval ) { if ( !m_bValidCurrentState || _bForceRetrieval ) @@ -580,7 +580,7 @@ namespace svt } } - //--------------------------------------------------------------------- + OUString TemplateFolderCacheImpl::implParseSmart( const OUString& _rPath ) { INetURLObject aParser; @@ -595,13 +595,13 @@ namespace svt return aParser.GetMainURL( INetURLObject::DECODE_TO_IURI ); } - //--------------------------------------------------------------------- + void TemplateFolderCacheImpl::closeCacheStream( ) { DELETEZ( m_pCacheStream ); } - //--------------------------------------------------------------------- + sal_Bool TemplateFolderCacheImpl::implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ) { try @@ -672,7 +672,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool TemplateFolderCacheImpl::readCurrentState() { // reset @@ -718,7 +718,7 @@ namespace svt return m_bValidCurrentState; } - //--------------------------------------------------------------------- + sal_Bool TemplateFolderCacheImpl::readPreviousState() { DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::readPreviousState: not to be called without stream!" ); @@ -765,7 +765,7 @@ namespace svt return sal_True; } - //--------------------------------------------------------------------- + sal_Bool TemplateFolderCacheImpl::openCacheStream( sal_Bool _bForRead ) { // close any old stream instance @@ -798,7 +798,7 @@ namespace svt return NULL != m_pCacheStream; } - //--------------------------------------------------------------------- + sal_Bool TemplateFolderCacheImpl::needsUpdate( sal_Bool _bForceCheck ) { if ( m_bKnowState && !_bForceCheck ) @@ -825,7 +825,7 @@ namespace svt return m_bNeedsUpdate; } - //--------------------------------------------------------------------- + uno::Reference< util::XOfficeInstallationDirectories > TemplateFolderCacheImpl::getOfficeInstDirs() { @@ -845,25 +845,25 @@ namespace svt //===================================================================== //= TemplateFolderCache //===================================================================== - //--------------------------------------------------------------------- + TemplateFolderCache::TemplateFolderCache( sal_Bool _bAutoStoreState ) :m_pImpl( new TemplateFolderCacheImpl( _bAutoStoreState ) ) { } - //--------------------------------------------------------------------- + TemplateFolderCache::~TemplateFolderCache( ) { DELETEZ( m_pImpl ); } - //--------------------------------------------------------------------- + sal_Bool TemplateFolderCache::needsUpdate( sal_Bool _bForceCheck ) { return m_pImpl->needsUpdate( _bForceCheck ); } - //--------------------------------------------------------------------- + void TemplateFolderCache::storeState( sal_Bool _bForceRetrieval ) { m_pImpl->storeState( _bForceRetrieval ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 2d56c4a37df3..65de5d70cd6d 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -59,9 +59,9 @@ #include <vcl/pngread.hxx> #include <vcl/pngwrite.hxx> -// -------------- + // - Namespaces - -// -------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -71,9 +71,9 @@ using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; -// -------------------------------- + // - TransferableObjectDescriptor - -// -------------------------------- + #define TOD_SIG1 0x01234567 #define TOD_SIG2 0x89abcdef @@ -112,7 +112,7 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ) return rIStm; } -// ----------------------------------------------------------------------------- + SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc ) { @@ -140,7 +140,7 @@ SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const Transferable return rOStm; } -// ----------------------------------------------------------------------------- + // the reading of the parameter is done using the special service ::com::sun::star::datatransfer::MimeContentType, // a similar approach should be implemented for creation of the mimetype string; // for now the set of acceptable characters has to be hardcoded, in future it should be part of the service that creates the mimetype @@ -211,7 +211,7 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj return aParams; } -// ----------------------------------------------------------------------------- + static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, const DataFlavorEx& rFlavorEx ) { @@ -282,43 +282,43 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons } } -// ----------------------------------------- + // - TransferableHelper::TerminateListener - -// ----------------------------------------- + TransferableHelper::TerminateListener::TerminateListener( TransferableHelper& rTransferableHelper ) : mrParent( rTransferableHelper ) { } -// ----------------------------------------------------------------------------- + TransferableHelper::TerminateListener::~TerminateListener() { } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& ) throw( TerminationVetoException, RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& ) throw( RuntimeException ) { mrParent.ImplFlush(); } -// ---------------------- + // - TransferableHelper - -// ---------------------- + TransferableHelper::TransferableHelper() : mpFormats( new DataFlavorExVector ), @@ -326,7 +326,7 @@ TransferableHelper::TransferableHelper() : { } -// ----------------------------------------------------------------------------- + TransferableHelper::~TransferableHelper() { @@ -334,7 +334,7 @@ TransferableHelper::~TransferableHelper() delete mpFormats; } -// ----------------------------------------------------------------------------- + Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) throw( UnsupportedFlavorException, IOException, RuntimeException ) { @@ -453,7 +453,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th return maAny; } -// ----------------------------------------------------------------------------- + Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() throw( RuntimeException ) { @@ -480,7 +480,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr return aRet; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException ) { @@ -508,7 +508,7 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r return bRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw( RuntimeException ) { @@ -531,13 +531,13 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, } } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::disposing( const EventObject& ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) throw( RuntimeException ) { @@ -553,31 +553,31 @@ void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE } } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException ) { @@ -594,7 +594,7 @@ sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& return nRet; } -// ----------------------------------------------------------------------------- + void TransferableHelper::ImplFlush() { @@ -617,7 +617,7 @@ void TransferableHelper::ImplFlush() } } -// ----------------------------------------------------------------------------- + void TransferableHelper::AddFormat( SotFormatStringId nFormat ) { @@ -627,7 +627,7 @@ void TransferableHelper::AddFormat( SotFormatStringId nFormat ) AddFormat( aFlavor ); } -// ----------------------------------------------------------------------------- + void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) { @@ -685,7 +685,7 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) } } -// ----------------------------------------------------------------------------- + void TransferableHelper::RemoveFormat( SotFormatStringId nFormat ) { @@ -695,7 +695,7 @@ void TransferableHelper::RemoveFormat( SotFormatStringId nFormat ) RemoveFormat( aFlavor ); } -// ----------------------------------------------------------------------------- + void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) { @@ -710,7 +710,7 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) } } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::HasFormat( SotFormatStringId nFormat ) { @@ -728,7 +728,7 @@ sal_Bool TransferableHelper::HasFormat( SotFormatStringId nFormat ) return bRet; } -// ----------------------------------------------------------------------------- + void TransferableHelper::ClearFormats() { @@ -736,7 +736,7 @@ void TransferableHelper::ClearFormats() maAny.clear(); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) { @@ -744,7 +744,7 @@ sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor ) { @@ -767,7 +767,7 @@ sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavo return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavor& rFlavor ) { @@ -807,7 +807,7 @@ sal_Bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataF return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& ) { @@ -822,7 +822,7 @@ sal_Bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const Data return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& ) { @@ -839,7 +839,7 @@ sal_Bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlav return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& ) { @@ -852,7 +852,7 @@ sal_Bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::su return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& ) @@ -867,7 +867,7 @@ sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const Transferable return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) @@ -957,7 +957,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) @@ -972,7 +972,7 @@ sal_Bool TransferableHelper::SetINetImage( const INetImage& rINtImg, return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const DataFlavor& rFlavor ) { @@ -1003,7 +1003,7 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec return( maAny.hasValue() ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt32, const DataFlavor& ) { @@ -1011,19 +1011,19 @@ sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt3 return sal_False; } -// ----------------------------------------------------------------------------- + void TransferableHelper::DragFinished( sal_Int8 ) { } -// ----------------------------------------------------------------------------- + void TransferableHelper::ObjectReleased() { } -// ----------------------------------------------------------------------------- + void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDesc ) { @@ -1034,7 +1034,7 @@ void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDes AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); } -// ----------------------------------------------------------------------------- + void TransferableHelper::CopyToClipboard( Window *pWindow ) const { @@ -1067,7 +1067,7 @@ void TransferableHelper::CopyToClipboard( Window *pWindow ) const } } -// ----------------------------------------------------------------------------- + void TransferableHelper::CopyToSelection( Window *pWindow ) const { @@ -1097,7 +1097,7 @@ void TransferableHelper::CopyToSelection( Window *pWindow ) const } } -// ----------------------------------------------------------------------------- + void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, sal_Int32 nDnDPointer, sal_Int32 nDnDImage ) @@ -1146,7 +1146,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, } } -// ----------------------------------------------------------------------------- + void TransferableHelper::ClearSelection( Window *pWindow ) { @@ -1157,7 +1157,7 @@ void TransferableHelper::ClearSelection( Window *pWindow ) xSelection->setContents( NULL, NULL ); } -// ----------------------------------------------------------------------------- + Reference< XClipboard> TransferableHelper::GetSystemClipboard() { @@ -1179,9 +1179,9 @@ const Sequence< sal_Int8 >& TransferableHelper::getUnoTunnelId() return theTransferableHelperUnoTunnelId::get().getSeq(); } -// --------------------------------- + // - TransferableClipboardNotifier - -// --------------------------------- + class TransferableClipboardNotifier : public ::cppu::WeakImplHelper1< XClipboardListener > { @@ -1210,7 +1210,7 @@ public: void dispose(); }; -// ----------------------------------------------------------------------------- + TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex ) :mrMutex( _rMutex ) @@ -1228,7 +1228,7 @@ TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X osl_atomic_decrement( &m_refCount ); } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException) { @@ -1242,7 +1242,7 @@ void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::C mpListener->Rebind( event.Contents ); } -// ----------------------------------------------------------------------------- + void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) throw (RuntimeException) { @@ -1250,7 +1250,7 @@ void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) thr dispose(); } -// ----------------------------------------------------------------------------- + void TransferableClipboardNotifier::dispose() { @@ -1265,9 +1265,9 @@ void TransferableClipboardNotifier::dispose() mpListener = NULL; } -// ------------------------------- + // - TransferableDataHelper_Impl - -// ------------------------------- + struct TransferableDataHelper_Impl { @@ -1280,9 +1280,9 @@ struct TransferableDataHelper_Impl } }; -// -------------------------- + // - TransferableDataHelper - -// -------------------------- + TransferableDataHelper::TransferableDataHelper() : mpFormats( new DataFlavorExVector ), @@ -1291,7 +1291,7 @@ TransferableDataHelper::TransferableDataHelper() : { } -// ----------------------------------------------------------------------------- + TransferableDataHelper::TransferableDataHelper( const Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ) : mxTransfer( rxTransferable ), @@ -1302,7 +1302,7 @@ TransferableDataHelper::TransferableDataHelper( const Reference< ::com::sun::sta InitFormats(); } -// ----------------------------------------------------------------------------- + TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rDataHelper ) : mxTransfer( rDataHelper.mxTransfer ), @@ -1313,7 +1313,7 @@ TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rD { } -// ----------------------------------------------------------------------------- + TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDataHelper& rDataHelper ) { @@ -1338,7 +1338,7 @@ TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDat return *this; } -// ----------------------------------------------------------------------------- + TransferableDataHelper::~TransferableDataHelper() { @@ -1351,7 +1351,7 @@ TransferableDataHelper::~TransferableDataHelper() delete mpImpl; } -// ----------------------------------------------------------------------------- + void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor >& rDataFlavorSeq, DataFlavorExVector& rDataFlavorExVector ) @@ -1446,7 +1446,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor } } -// ----------------------------------------------------------------------------- + void TransferableDataHelper::InitFormats() { @@ -1471,7 +1471,7 @@ void TransferableDataHelper::InitFormats() } } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const { @@ -1492,7 +1492,7 @@ sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const { @@ -1513,7 +1513,7 @@ sal_Bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const return bRet; } -// ----------------------------------------------------------------------------- + sal_uInt32 TransferableDataHelper::GetFormatCount() const { @@ -1521,7 +1521,7 @@ sal_uInt32 TransferableDataHelper::GetFormatCount() const return mpFormats->size(); } -// ----------------------------------------------------------------------------- + SotFormatStringId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) const @@ -1531,7 +1531,7 @@ SotFormatStringId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) const return( ( nFormat < mpFormats->size() ) ? (*mpFormats)[ nFormat ].mnSotId : 0 ); } -// ----------------------------------------------------------------------------- + DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) const { @@ -1546,7 +1546,7 @@ DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) con return aRet; } -// ----------------------------------------------------------------------------- + Reference< XTransferable > TransferableDataHelper::GetXTransferable() const { @@ -1571,7 +1571,7 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const return xRet; } -// ----------------------------------------------------------------------------- + Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const { @@ -1585,7 +1585,7 @@ Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const } -// ----------------------------------------------------------------------------- + Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const { @@ -1622,7 +1622,7 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const return aRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& rStr ) { @@ -1630,7 +1630,7 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetString( aFlavor, rStr ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr ) { @@ -1666,7 +1666,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetBitmapEx( SotFormatStringId nFormat, BitmapEx& rBmpEx ) { @@ -1688,7 +1688,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( SotFormatStringId nFormat, BitmapE return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetBitmapEx( aFlavor, rBmpEx ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& rBmpEx ) { @@ -1775,7 +1775,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapE return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetGDIMetaFile( SotFormatStringId nFormat, GDIMetaFile& rMtf ) { @@ -1783,7 +1783,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( SotFormatStringId nFormat, GDIM return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetGDIMetaFile( aFlavor, rMtf ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf ) { @@ -1828,7 +1828,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIM return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic& rGraphic ) { @@ -1850,7 +1850,7 @@ sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic& return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetGraphic( aFlavor, rGraphic ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) { @@ -1896,7 +1896,7 @@ sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfe return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMap& rIMap ) { @@ -1904,7 +1904,7 @@ sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMa return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetImageMap( aFlavor, rIMap ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap ) { @@ -1920,7 +1920,7 @@ sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransf return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( SotFormatStringId nFormat, TransferableObjectDescriptor& rDesc ) { @@ -1928,7 +1928,7 @@ sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( SotFormatStrin return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetTransferableObjectDescriptor( aFlavor, rDesc ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc ) { @@ -1936,7 +1936,7 @@ sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( const ::com::s return true; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetINetBookmark( SotFormatStringId nFormat, INetBookmark& rBmk ) { @@ -1944,7 +1944,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( SotFormatStringId nFormat, INe return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetINetBookmark( aFlavor, rBmk ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ) { @@ -2083,7 +2083,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetINetImage( SotFormatStringId nFormat, INetImage& rINtImg ) @@ -2092,7 +2092,7 @@ sal_Bool TransferableDataHelper::GetINetImage( SotFormatStringId nFormat, return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetINetImage( aFlavor, rINtImg ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetINetImage( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, @@ -2106,7 +2106,7 @@ sal_Bool TransferableDataHelper::GetINetImage( return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetFileList( SotFormatStringId nFormat, FileList& rFileList ) @@ -2115,7 +2115,7 @@ sal_Bool TransferableDataHelper::GetFileList( SotFormatStringId nFormat, return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetFileList( aFlavor, rFileList ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetFileList( const ::com::sun::star::datatransfer::DataFlavor&, @@ -2151,7 +2151,7 @@ sal_Bool TransferableDataHelper::GetFileList( return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetSequence( SotFormatStringId nFormat, Sequence< sal_Int8 >& rSeq ) { @@ -2159,7 +2159,7 @@ sal_Bool TransferableDataHelper::GetSequence( SotFormatStringId nFormat, Sequenc return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetSequence( aFlavor, rSeq ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetSequence( const DataFlavor& rFlavor, Sequence< sal_Int8 >& rSeq ) { @@ -2171,7 +2171,7 @@ sal_Bool TransferableDataHelper::GetSequence( const DataFlavor& rFlavor, Sequenc return( aAny.hasValue() && ( aAny >>= rSeq ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat, SotStorageStreamRef& rxStream ) { @@ -2179,7 +2179,7 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat, return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetSotStorageStream( aFlavor, rxStream ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, SotStorageStreamRef& rxStream ) { @@ -2202,7 +2202,7 @@ sal_Bool TransferableDataHelper::GetInputStream( SotFormatStringId nFormat, Refe return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetInputStream( aFlavor, rxStream ) ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Reference < XInputStream >& rxStream ) { @@ -2215,7 +2215,7 @@ sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Refe return bRet; } -// ----------------------------------------------------------------------------- + void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewContent ) { @@ -2223,7 +2223,7 @@ void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewCon InitFormats(); } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::StartClipboardListening( ) { @@ -2237,7 +2237,7 @@ sal_Bool TransferableDataHelper::StartClipboardListening( ) return mpImpl->mpClipboardListener->isListening(); } -// ----------------------------------------------------------------------------- + void TransferableDataHelper::StopClipboardListening( ) { @@ -2251,7 +2251,7 @@ void TransferableDataHelper::StopClipboardListening( ) } } -// ----------------------------------------------------------------------------- + TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window * pWindow ) { @@ -2285,7 +2285,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window } -// ----------------------------------------------------------------------------- + TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWindow ) { @@ -2321,7 +2321,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWin return aRet; } -// ----------------------------------------------------------------------------- + sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor, sal_Bool ) diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index eb282c13f6b6..2b27f9c0f0e5 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -33,9 +33,9 @@ #include <svtools/imap.hxx> #include <svtools/transfer.hxx> -// -------------- + // - Namespaces - -// -------------- + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -44,28 +44,28 @@ using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::clipboard; using namespace ::com::sun::star::datatransfer::dnd; -// ----------------------------------------- + // - DragSourceHelper::DragGestureListener - -// ----------------------------------------- + DragSourceHelper::DragGestureListener::DragGestureListener( DragSourceHelper& rDragSourceHelper ) : mrParent( rDragSourceHelper ) { } -// ----------------------------------------------------------------------------- + DragSourceHelper::DragGestureListener::~DragGestureListener() { } -// ----------------------------------------------------------------------------- + void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) throw( RuntimeException ) { @@ -75,9 +75,9 @@ void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( cons mrParent.StartDrag( rDGE.DragAction, aPtPixel ); } -// -------------------- + // - DragSourceHelper - -// -------------------- + DragSourceHelper::DragSourceHelper( Window* pWindow ) : mxDragGestureRecognizer( pWindow->GetDragGestureRecognizer() ) @@ -89,7 +89,7 @@ DragSourceHelper::DragSourceHelper( Window* pWindow ) : } } -// ----------------------------------------------------------------------------- + DragSourceHelper::~DragSourceHelper() { @@ -97,15 +97,15 @@ DragSourceHelper::~DragSourceHelper() mxDragGestureRecognizer->removeDragGestureListener( mxDragGestureListener ); } -// ----------------------------------------------------------------------------- + void DragSourceHelper::StartDrag( sal_Int8, const Point& ) { } -// ---------------------------------------- + // - DropTargetHelper::DropTargetListener - -// ---------------------------------------- + DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDropTargetHelper ) : mrParent( rDropTargetHelper ), @@ -113,20 +113,20 @@ DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDro { } -// ----------------------------------------------------------------------------- + DropTargetHelper::DropTargetListener::~DropTargetListener() { delete mpLastDragOverEvent; } -// ----------------------------------------------------------------------------- + void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) throw( RuntimeException ) { @@ -176,7 +176,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv } } -// ----------------------------------------------------------------------------- + void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) throw( RuntimeException ) { @@ -193,7 +193,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD dragOver( rDTDEE ); } -// ----------------------------------------------------------------------------- + void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) throw( RuntimeException ) { @@ -219,7 +219,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr } } -// ----------------------------------------------------------------------------- + void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) throw( RuntimeException ) { @@ -243,15 +243,15 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv } -// ----------------------------------------------------------------------------- + void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& ) throw( RuntimeException ) { } -// -------------------- + // - DropTargetHelper - -// -------------------- + DropTargetHelper::DropTargetHelper( Window* pWindow ) : mxDropTarget( pWindow->GetDropTarget() ), @@ -260,7 +260,7 @@ DropTargetHelper::DropTargetHelper( Window* pWindow ) : ImplConstruct(); } -// ----------------------------------------------------------------------------- + DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget ) : mxDropTarget( rxDropTarget ), @@ -269,7 +269,7 @@ DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget ImplConstruct(); } -// ----------------------------------------------------------------------------- + DropTargetHelper::~DropTargetHelper() { @@ -279,7 +279,7 @@ DropTargetHelper::~DropTargetHelper() delete mpFormats; } -// ----------------------------------------------------------------------------- + void DropTargetHelper::ImplConstruct() { @@ -291,7 +291,7 @@ void DropTargetHelper::ImplConstruct() } } -// ----------------------------------------------------------------------------- + void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDataFlavors ) { @@ -299,28 +299,28 @@ void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDa TransferableDataHelper::FillDataFlavorExVector( rSupportedDataFlavors, *mpFormats ); } -// ----------------------------------------------------------------------------- + void DropTargetHelper::ImplEndDrag() { mpFormats->clear(); } -// ----------------------------------------------------------------------------- + sal_Int8 DropTargetHelper::AcceptDrop( const AcceptDropEvent& ) { return( DNDConstants::ACTION_NONE ); } -// ----------------------------------------------------------------------------- + sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& ) { return( DNDConstants::ACTION_NONE ); } -// ----------------------------------------------------------------------------- + sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) { @@ -339,7 +339,7 @@ sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor ) { @@ -358,9 +358,9 @@ sal_Bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor ) return bRet; } -// ----------------------------------------------------------------------------- + // TransferDataContainer -// ----------------------------------------------------------------------------- + struct TDataCntnrEntry_Impl { @@ -368,11 +368,11 @@ struct TDataCntnrEntry_Impl SotFormatStringId nId; }; -// ----------------------------------------------------------------------------- + typedef ::std::list< TDataCntnrEntry_Impl > TDataCntnrEntryList; -// ----------------------------------------------------------------------------- + struct TransferDataContainer_Impl { @@ -393,27 +393,27 @@ struct TransferDataContainer_Impl } }; -// ----------------------------------------------------------------------------- + TransferDataContainer::TransferDataContainer() : pImpl( new TransferDataContainer_Impl ) { } -// ----------------------------------------------------------------------------- + TransferDataContainer::~TransferDataContainer() { delete pImpl; } -// ----------------------------------------------------------------------------- + void TransferDataContainer::AddSupportedFormats() { } -// ----------------------------------------------------------------------------- + sal_Bool TransferDataContainer::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) @@ -460,7 +460,7 @@ sal_Bool TransferDataContainer::GetData( const return bFnd; } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) { @@ -477,7 +477,7 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ); } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyAnyData( sal_uLong nFormatId, const sal_Char* pData, sal_uLong nLen ) @@ -495,7 +495,7 @@ void TransferDataContainer::CopyAnyData( sal_uLong nFormatId, } } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyByteString( sal_uLong nFormatId, const OString& rStr ) @@ -503,7 +503,7 @@ void TransferDataContainer::CopyByteString( sal_uLong nFormatId, CopyAnyData( nFormatId, rStr.getStr(), rStr.getLength() ); } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyINetImage( const INetImage& rINtImg ) { @@ -514,7 +514,7 @@ void TransferDataContainer::CopyINetImage( const INetImage& rINtImg ) aMemStm.Seek( STREAM_SEEK_TO_END ) ); } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap ) { @@ -525,7 +525,7 @@ void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap ) aMemStm.Seek( STREAM_SEEK_TO_END ) ); } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyGraphic( const Graphic& rGrf ) { @@ -551,7 +551,7 @@ void TransferDataContainer::CopyGraphic( const Graphic& rGrf ) } } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyString( sal_uInt16 nFmt, const OUString& rStr ) { @@ -566,14 +566,14 @@ void TransferDataContainer::CopyString( sal_uInt16 nFmt, const OUString& rStr ) } } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyString( const OUString& rStr ) { CopyString( SOT_FORMAT_STRING, rStr ); } -// ----------------------------------------------------------------------------- + void TransferDataContainer::CopyAny( sal_uInt16 nFmt, const ::com::sun::star::uno::Any& rAny ) @@ -585,7 +585,7 @@ void TransferDataContainer::CopyAny( sal_uInt16 nFmt, AddFormat( aEntry.nId ); } -// ----------------------------------------------------------------------------- + sal_Bool TransferDataContainer::HasAnyData() const { @@ -593,7 +593,7 @@ sal_Bool TransferDataContainer::HasAnyData() const 0 != pImpl->pBookmk; } -// ----------------------------------------------------------------------------- + void TransferDataContainer::StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, @@ -604,7 +604,7 @@ void TransferDataContainer::StartDrag( nDragPointer, nDragImage ); } -// ----------------------------------------------------------------------------- + void TransferDataContainer::DragFinished( sal_Int8 nDropAction ) { diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index 1694ab9ac752..af3c2375cfa1 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -19,7 +19,7 @@ #include <svtools/unitconv.hxx> -// ----------------------------------------------------------------------- + void SetFieldUnit( MetricField& rField, FieldUnit eUnit, sal_Bool bAll ) { @@ -79,7 +79,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, sal_Bool bAll ) } } -// ----------------------------------------------------------------------- + void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, sal_Bool bAll ) { @@ -116,7 +116,7 @@ void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, sal_Bool bAll ) } } -// ----------------------------------------------------------------------- + void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit ) { sal_Int64 nVal = OutputDevice::LogicToLogic( nCoreValue, (MapUnit)eUnit, MAP_100TH_MM ); @@ -125,7 +125,7 @@ void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit ) } -// ----------------------------------------------------------------------- + long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) { @@ -151,7 +151,7 @@ long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) return static_cast<long>(nUnitVal); } -// ----------------------------------------------------------------------- + long CalcToUnit( float nIn, SfxMapUnit eUnit ) { @@ -183,7 +183,7 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) //! return (long)(nTmp * 20); } -// ----------------------------------------------------------------------- + long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ) { @@ -240,14 +240,14 @@ long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ) return nOut; } -// ----------------------------------------------------------------------- + long ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem ) { return ItemToControl( nIn, eItem, eCtrl ); } -// ----------------------------------------------------------------------- + FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) { @@ -277,7 +277,7 @@ FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) return FUNIT_NONE; } -// ----------------------------------------------------------------------- + long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) { @@ -316,7 +316,7 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) return nRet * nFactor / 20; } -// ----------------------------------------------------------------------- + long CMToTwips( long nIn ) { @@ -327,7 +327,7 @@ long CMToTwips( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long MMToTwips( long nIn ) { @@ -338,7 +338,7 @@ long MMToTwips( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long InchToTwips( long nIn ) { @@ -349,7 +349,7 @@ long InchToTwips( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PointToTwips( long nIn ) { @@ -360,7 +360,7 @@ long PointToTwips( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PicaToTwips( long nIn ) { @@ -371,7 +371,7 @@ long PicaToTwips( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long TwipsToCM( long nIn ) { @@ -379,7 +379,7 @@ long TwipsToCM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long InchToCM( long nIn ) { @@ -390,7 +390,7 @@ long InchToCM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long MMToCM( long nIn ) { @@ -398,7 +398,7 @@ long MMToCM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PointToCM( long nIn ) { @@ -409,7 +409,7 @@ long PointToCM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PicaToCM( long nIn) { @@ -420,7 +420,7 @@ long PicaToCM( long nIn) return nRet; } -// ----------------------------------------------------------------------- + long TwipsToMM( long nIn ) { @@ -431,7 +431,7 @@ long TwipsToMM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long CMToMM( long nIn ) { @@ -442,7 +442,7 @@ long CMToMM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long InchToMM( long nIn ) { @@ -453,7 +453,7 @@ long InchToMM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PointToMM( long nIn ) { @@ -464,7 +464,7 @@ long PointToMM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PicaToMM( long nIn ) { @@ -475,7 +475,7 @@ long PicaToMM( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long TwipsToInch( long nIn ) { @@ -483,7 +483,7 @@ long TwipsToInch( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long CMToInch( long nIn ) { @@ -494,7 +494,7 @@ long CMToInch( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long MMToInch( long nIn ) { @@ -505,7 +505,7 @@ long MMToInch( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PointToInch( long nIn ) { @@ -513,7 +513,7 @@ long PointToInch( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PicaToInch( long nIn ) { @@ -521,7 +521,7 @@ long PicaToInch( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long TwipsToPoint( long nIn ) { @@ -529,7 +529,7 @@ long TwipsToPoint( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long InchToPoint( long nIn ) { @@ -540,7 +540,7 @@ long InchToPoint( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long CMToPoint( long nIn ) { @@ -551,7 +551,7 @@ long CMToPoint( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long MMToPoint( long nIn ) { @@ -562,7 +562,7 @@ long MMToPoint( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PicaToPoint( long nIn ) { @@ -570,7 +570,7 @@ long PicaToPoint( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long TwipsToPica( long nIn ) { @@ -578,7 +578,7 @@ long TwipsToPica( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long InchToPica( long nIn ) { @@ -589,7 +589,7 @@ long InchToPica( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long PointToPica( long nIn ) { @@ -600,7 +600,7 @@ long PointToPica( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long CMToPica( long nIn ) { @@ -611,7 +611,7 @@ long CMToPica( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long MMToPica( long nIn ) { @@ -622,7 +622,7 @@ long MMToPica( long nIn ) return nRet; } -// ----------------------------------------------------------------------- + long Nothing( long nIn ) { @@ -641,7 +641,7 @@ FUNC_CONVERT ConvertTable[6][6] = { TwipsToCM, TwipsToMM, TwipsToInch, TwipsToPoint,TwipsToPica, Nothing } }; -// ----------------------------------------------------------------------- + long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) { diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index 06cb0759ec24..2aba8a64c362 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -64,7 +64,7 @@ namespace svt //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + double lcl_convertDateToDays( long const i_day, long const i_month, long const i_year ) { long const nNullDateDays = ::Date::DateToDays( 1, 1, 1900 ); @@ -73,7 +73,7 @@ namespace svt return nValueDateDays - nNullDateDays; } - //-------------------------------------------------------------------------------------------------------------- + double lcl_convertTimeToDays( long const i_hours, long const i_minutes, long const i_seconds, long const i_100thSeconds ) { return Time( i_hours, i_minutes, i_seconds, i_100thSeconds ).GetTimeInDays(); @@ -312,7 +312,7 @@ namespace svt //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + bool lcl_ensureNumberFormatter( CellValueConversion_Data & io_data ) { if ( io_data.bAttemptedFormatterCreation ) @@ -350,7 +350,7 @@ namespace svt return io_data.xNumberFormatter.is(); } - //-------------------------------------------------------------------------------------------------------------- + bool lcl_getValueNormalizer( CellValueConversion_Data & io_data, Type const & i_valueType, PValueNormalization & o_formatter ) { @@ -411,18 +411,18 @@ namespace svt //================================================================================================================== //= CellValueConversion //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + CellValueConversion::CellValueConversion() :m_pData( new CellValueConversion_Data ) { } - //------------------------------------------------------------------------------------------------------------------ + CellValueConversion::~CellValueConversion() { } - //------------------------------------------------------------------------------------------------------------------ + OUString CellValueConversion::convertToString( const Any& i_value ) { OUString sStringValue; diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx index ff098f243180..14ce3e8d1b56 100644 --- a/svtools/source/table/defaultinputhandler.cxx +++ b/svtools/source/table/defaultinputhandler.cxx @@ -43,7 +43,7 @@ namespace svt { namespace table //================================================================================================================== //= DefaultInputHandler //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + DefaultInputHandler::DefaultInputHandler() :m_pImpl( new DefaultInputHandler_Impl ) { @@ -52,12 +52,12 @@ namespace svt { namespace table m_pImpl->aMouseFunctions.push_back( new ColumnSortHandler ); } - //------------------------------------------------------------------------------------------------------------------ + DefaultInputHandler::~DefaultInputHandler() { } - //------------------------------------------------------------------------------------------------------------------ + namespace { bool lcl_delegateMouseEvent( DefaultInputHandler_Impl& i_impl, ITableControl& i_control, const MouseEvent& i_event, @@ -115,25 +115,25 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::MouseMove( ITableControl& i_tableControl, const MouseEvent& i_event ) { return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseMove ); } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::MouseButtonDown( ITableControl& i_tableControl, const MouseEvent& i_event ) { return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseDown ); } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::MouseButtonUp( ITableControl& i_tableControl, const MouseEvent& i_event ) { return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseUp ); } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::KeyInput( ITableControl& _rControl, const KeyEvent& rKEvt ) { bool bHandled = false; @@ -182,21 +182,21 @@ namespace svt { namespace table return bHandled; } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::GetFocus( ITableControl& _rControl ) { _rControl.showCursor(); return false; // continue processing } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::LoseFocus( ITableControl& _rControl ) { _rControl.hideCursor(); return false; // continue processing } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::RequestHelp( ITableControl& _rControl, const HelpEvent& _rHEvt ) { (void)_rControl; @@ -205,7 +205,7 @@ namespace svt { namespace table return false; } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::Command( ITableControl& _rControl, const CommandEvent& _rCEvt ) { (void)_rControl; @@ -214,7 +214,7 @@ namespace svt { namespace table return false; } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::PreNotify( ITableControl& _rControl, NotifyEvent& _rNEvt ) { (void)_rControl; @@ -223,7 +223,7 @@ namespace svt { namespace table return false; } - //------------------------------------------------------------------------------------------------------------------ + bool DefaultInputHandler::Notify( ITableControl& _rControl, NotifyEvent& _rNEvt ) { (void)_rControl; diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index 97bdd43ebe4d..dce27c49cf74 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -74,7 +74,7 @@ namespace svt { namespace table BitmapEx m_sortDescending; }; - //------------------------------------------------------------------------------------------------------------------ + BitmapEx const & CachedSortIndicator::getBitmapFor( OutputDevice const & i_device, long const i_headerHeight, StyleSettings const & i_style, bool const i_sortAscending ) { @@ -179,30 +179,30 @@ namespace svt { namespace table //================================================================================================================== //= GridTableRenderer //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + GridTableRenderer::GridTableRenderer( ITableModel& _rModel ) :m_pImpl( new GridTableRenderer_Impl( _rModel ) ) { } - //------------------------------------------------------------------------------------------------------------------ + GridTableRenderer::~GridTableRenderer() { } - //------------------------------------------------------------------------------------------------------------------ + bool GridTableRenderer::useGridLines() const { return m_pImpl->bUseGridLines; } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::useGridLines( bool const i_use ) { m_pImpl->bUseGridLines = i_use; } - //------------------------------------------------------------------------------------------------------------------ + namespace { Color lcl_getEffectiveColor( @@ -217,7 +217,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::PaintHeaderArea( OutputDevice& _rDevice, const Rectangle& _rArea, bool _bIsColHeaderArea, bool _bIsRowHeaderArea, const StyleSettings& _rStyle ) @@ -245,7 +245,7 @@ namespace svt { namespace table (void)_bIsRowHeaderArea; } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle ) { @@ -313,7 +313,7 @@ namespace svt { namespace table // selection for column header not yet implemented } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rRowArea, const StyleSettings& _rStyle ) { @@ -380,7 +380,7 @@ namespace svt { namespace table _rDevice.Pop(); } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::PaintRowHeader( bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle ) { @@ -411,7 +411,7 @@ namespace svt { namespace table _rDevice.Pop(); } - //------------------------------------------------------------------------------------------------------------------ + struct GridTableRenderer::CellRenderContext { OutputDevice& rDevice; @@ -433,7 +433,7 @@ namespace svt { namespace table } }; - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::PaintCell( ColPos const i_column, bool _bSelected, bool i_hasControlFocus, OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle ) { @@ -464,7 +464,7 @@ namespace svt { namespace table _rDevice.Pop(); } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::impl_paintCellImage( CellRenderContext const & i_context, Image const & i_image ) { Point imagePos( Point( i_context.aContentArea.Left(), i_context.aContentArea.Top() ) ); @@ -509,7 +509,7 @@ namespace svt { namespace table i_context.rDevice.DrawImage( imagePos, imageSize, i_image, nStyle ); } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::impl_paintCellContent( CellRenderContext const & i_context ) { Any aCellContent; @@ -534,7 +534,7 @@ namespace svt { namespace table impl_paintCellText( i_context, sText ); } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::impl_paintCellText( CellRenderContext const & i_context, OUString const & i_text ) { if ( i_context.bSelected ) @@ -557,20 +557,20 @@ namespace svt { namespace table i_context.rDevice.DrawText( textRect, i_text, nDrawTextFlags ); } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) { _rView.ShowFocus( _rCursorRect ); } - //------------------------------------------------------------------------------------------------------------------ + void GridTableRenderer::HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) { (void)_rCursorRect; _rView.HideFocus(); } - //------------------------------------------------------------------------------------------------------------------ + bool GridTableRenderer::FitsIntoCell( Any const & i_cellContent, ColPos const i_colPos, RowPos const i_rowPos, bool const i_active, bool const i_selected, OutputDevice& i_targetDevice, Rectangle const & i_targetArea ) const { @@ -613,7 +613,7 @@ namespace svt { namespace table return true; } - //------------------------------------------------------------------------------------------------------------------ + bool GridTableRenderer::GetFormattedCellString( Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, OUString & o_cellString ) const { o_cellString = m_pImpl->aStringConverter.convertToString( i_cellValue ); diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx index 1fe94b84d005..a015a82de44f 100644 --- a/svtools/source/table/mousefunction.cxx +++ b/svtools/source/table/mousefunction.cxx @@ -32,13 +32,13 @@ namespace svt { namespace table //================================================================================================================== //= MouseFunction //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + oslInterlockedCount MouseFunction::acquire() { return osl_atomic_increment( &m_refCount ); } - //------------------------------------------------------------------------------------------------------------------ + oslInterlockedCount MouseFunction::release() { oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount ); @@ -53,7 +53,7 @@ namespace svt { namespace table //================================================================================================================== //= ColumnResize //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + FunctionResult ColumnResize::handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) { Point const aPoint = i_event.GetPosPixel(); @@ -103,7 +103,7 @@ namespace svt { namespace table return ContinueFunction; } - //------------------------------------------------------------------------------------------------------------------ + FunctionResult ColumnResize::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) { if ( m_nResizingColumn != COL_INVALID ) @@ -128,7 +128,7 @@ namespace svt { namespace table return SkipFunction; } - //------------------------------------------------------------------------------------------------------------------ + FunctionResult ColumnResize::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) { if ( m_nResizingColumn == COL_INVALID ) @@ -183,7 +183,7 @@ namespace svt { namespace table //================================================================================================================== //= RowSelection //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + FunctionResult RowSelection::handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) { OSL_UNUSED( i_tableControl ); @@ -191,7 +191,7 @@ namespace svt { namespace table return SkipFunction; } - //------------------------------------------------------------------------------------------------------------------ + FunctionResult RowSelection::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) { bool handled = false; @@ -215,7 +215,7 @@ namespace svt { namespace table return handled ? ActivateFunction : SkipFunction; } - //------------------------------------------------------------------------------------------------------------------ + FunctionResult RowSelection::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) { TableCell const tableCell = i_tableControl.hitTest( i_event.GetPosPixel() ); @@ -237,7 +237,7 @@ namespace svt { namespace table //================================================================================================================== //= ColumnSortHandler //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + FunctionResult ColumnSortHandler::handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) { OSL_UNUSED( i_tableControl ); @@ -245,7 +245,7 @@ namespace svt { namespace table return SkipFunction; } - //------------------------------------------------------------------------------------------------------------------ + FunctionResult ColumnSortHandler::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) { if ( m_nActiveColumn != COL_INVALID ) @@ -268,7 +268,7 @@ namespace svt { namespace table return ActivateFunction; } - //------------------------------------------------------------------------------------------------------------------ + FunctionResult ColumnSortHandler::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) { if ( m_nActiveColumn == COL_INVALID ) diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index fe5b9d1595be..e874cfdb7231 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -45,7 +45,7 @@ namespace svt { namespace table //================================================================================================================== //= TableControl //================================================================================================================== - // ----------------------------------------------------------------------------------------------------------------- + TableControl::TableControl( Window* _pParent, WinBits _nStyle ) :Control( _pParent, _nStyle ) ,m_pImpl( new TableControl_Impl( *this ) ) @@ -61,7 +61,7 @@ namespace svt { namespace table SetCompoundControl( true ); } - // ----------------------------------------------------------------------------------------------------------------- + TableControl::~TableControl() { ImplCallEventListeners( VCLEVENT_OBJECT_DYING ); @@ -71,21 +71,21 @@ namespace svt { namespace table m_pImpl.reset(); } - // ----------------------------------------------------------------------------------------------------------------- + void TableControl::GetFocus() { if ( !m_pImpl->getInputHandler()->GetFocus( *m_pImpl ) ) Control::GetFocus(); } - // ----------------------------------------------------------------------------------------------------------------- + void TableControl::LoseFocus() { if ( !m_pImpl->getInputHandler()->LoseFocus( *m_pImpl ) ) Control::LoseFocus(); } - // ----------------------------------------------------------------------------------------------------------------- + void TableControl::KeyInput( const KeyEvent& rKEvt ) { if ( !m_pImpl->getInputHandler()->KeyInput( *m_pImpl, rKEvt ) ) @@ -114,7 +114,7 @@ namespace svt { namespace table } - // ----------------------------------------------------------------------------------------------------------------- + void TableControl::StateChanged( StateChangedType i_nStateChange ) { Control::StateChanged( i_nStateChange ); @@ -149,68 +149,68 @@ namespace svt { namespace table } } - // ----------------------------------------------------------------------------------------------------------------- + void TableControl::Resize() { Control::Resize(); m_pImpl->onResize(); } - // ----------------------------------------------------------------------------------------------------------------- + void TableControl::SetModel( PTableModel _pModel ) { m_pImpl->setModel( _pModel ); } - // ----------------------------------------------------------------------------------------------------------------- + PTableModel TableControl::GetModel() const { return m_pImpl->getModel(); } - // ----------------------------------------------------------------------------------------------------------------- + sal_Int32 TableControl::GetCurrentRow() const { return m_pImpl->getCurrentRow(); } - // ----------------------------------------------------------------------------------------------------------------- + sal_Int32 TableControl::GetCurrentColumn() const { return m_pImpl->getCurrentColumn(); } - // ----------------------------------------------------------------------------------------------------------------- + bool TableControl::GoTo( ColPos _nColumn, RowPos _nRow ) { return m_pImpl->goTo( _nColumn, _nRow ); } - // ----------------------------------------------------------------------------------------------------------------- + sal_Bool TableControl::GoToCell(sal_Int32 _nColPos, sal_Int32 _nRowPos) { return m_pImpl->goTo( _nColPos, _nRowPos ); } - //------------------------------------------------------------------------------------------------------------------ + sal_Int32 TableControl::GetSelectedRowCount() const { return sal_Int32( m_pImpl->getSelectedRowCount() ); } - //------------------------------------------------------------------------------------------------------------------ + sal_Int32 TableControl::GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const { return sal_Int32( m_pImpl->getSelectedRowIndex( i_selectionIndex ) ); } - //------------------------------------------------------------------------------------------------------------------ + bool TableControl::IsRowSelected( sal_Int32 const i_rowIndex ) const { return m_pImpl->isRowSelected( i_rowIndex ); } - // ----------------------------------------------------------------------------------------------------------------- + void TableControl::SelectRow( RowPos const i_rowIndex, bool const i_select ) { ENSURE_OR_RETURN_VOID( ( i_rowIndex >= 0 ) && ( i_rowIndex < m_pImpl->getModel()->getRowCount() ), @@ -231,7 +231,7 @@ namespace svt { namespace table Select(); } - // ----------------------------------------------------------------------------------------------------------------- + void TableControl::SelectAllRows( bool const i_select ) { if ( i_select ) @@ -253,25 +253,25 @@ namespace svt { namespace table Select(); } - // ----------------------------------------------------------------------------------------------------------------- + ITableControl& TableControl::getTableControlInterface() { return *m_pImpl; } - // ----------------------------------------------------------------------------------------------------------------- + SelectionEngine* TableControl::getSelEngine() { return m_pImpl->getSelEngine(); } - // ----------------------------------------------------------------------------------------------------------------- + Window& TableControl::getDataWindow() { return m_pImpl->getDataWindow(); } - // ----------------------------------------------------------------------------------------------------------------- + Reference< XAccessible > TableControl::CreateAccessible() { Window* pParent = GetAccessibleParentWindow(); @@ -280,7 +280,7 @@ namespace svt { namespace table return m_pImpl->getAccessible( *pParent ); } - // ----------------------------------------------------------------------------------------------------------------- + Reference<XAccessible> TableControl::CreateAccessibleControl( sal_Int32 _nIndex ) { (void)_nIndex; @@ -288,7 +288,7 @@ namespace svt { namespace table return NULL; } - // ----------------------------------------------------------------------------------------------------------------- + OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const { OUString aRetText; @@ -332,7 +332,7 @@ namespace svt { namespace table return aRetText; } - //------------------------------------------------------------------------------------------------------------------ + OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType, sal_Int32 ) const { OUString aRetText; @@ -372,14 +372,14 @@ namespace svt { namespace table return aRetText; } - //------------------------------------------------------------------------------------------------------------------ + OUString TableControl::GetRowDescription( sal_Int32 _nRow) const { (void)_nRow; return OUString( "row description" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString TableControl::GetRowName( sal_Int32 _nIndex) const { OUString sRowName; @@ -387,20 +387,20 @@ namespace svt { namespace table return sRowName; } - //------------------------------------------------------------------------------------------------------------------ + OUString TableControl::GetColumnDescription( sal_uInt16 _nColumn) const { (void)_nColumn; return OUString( "col description" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString TableControl::GetColumnName( sal_Int32 _nIndex) const { return GetModel()->getColumnModel(_nIndex)->getName(); } - //------------------------------------------------------------------------------------------------------------------ + ::com::sun::star::uno::Any TableControl::GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos ) const { Any aCellContent; @@ -408,13 +408,13 @@ namespace svt { namespace table return aCellContent; } - //------------------------------------------------------------------------------------------------------------------ + OUString TableControl::GetAccessibleCellText( sal_Int32 _nRowPos, sal_Int32 _nColPos) const { return m_pImpl->getCellContentAsString( _nRowPos, _nColPos ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const @@ -485,63 +485,63 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableControl::commitCellEventIfAccessibleAlive( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue ) { if ( m_pImpl->isAccessibleAlive() ) m_pImpl->commitCellEvent( i_eventID, i_newValue, i_oldValue ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl::commitTableEventIfAccessibleAlive( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue ) { if ( m_pImpl->isAccessibleAlive() ) m_pImpl->commitTableEvent( i_eventID, i_newValue, i_oldValue ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle TableControl::GetWindowExtentsRelative( Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl::GrabFocus() { Control::GrabFocus(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > TableControl::GetAccessible( sal_Bool bCreate ) { return Control::GetAccessible( bCreate ); } - //------------------------------------------------------------------------------------------------------------------ + Window* TableControl::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } - //------------------------------------------------------------------------------------------------------------------ + Window* TableControl::GetWindowInstance() { return this; } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool TableControl::HasRowHeader() { return GetModel()->hasRowHeaders(); } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool TableControl::HasColHeader() { return GetModel()->hasColumnHeaders(); } - //------------------------------------------------------------------------------------------------------------------ + sal_Int32 TableControl::GetAccessibleControlCount() const { // TC_TABLE is always defined, no matter whether empty or not @@ -553,7 +553,7 @@ namespace svt { namespace table return count; } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool TableControl::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) { sal_Int32 nRow = m_pImpl->getRowAtPoint( _rPoint ); @@ -562,25 +562,25 @@ namespace svt { namespace table return nRow >= 0 ? sal_True : sal_False; } - //------------------------------------------------------------------------------------------------------------------ + long TableControl::GetRowCount() const { return GetModel()->getRowCount(); } - //------------------------------------------------------------------------------------------------------------------ + long TableControl::GetColumnCount() const { return GetModel()->getColumnCount(); } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool TableControl::HasRowHeader() const { return GetModel()->hasRowHeaders(); } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool TableControl::ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ) { _rnRow = m_pImpl->getRowAtPoint( _rPoint ); @@ -588,7 +588,7 @@ namespace svt { namespace table return _rnRow >= 0 ? sal_True : sal_False; } - //------------------------------------------------------------------------------------------------------------------ + void TableControl::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const { if ( IsRowSelected( _nRow ) ) @@ -607,7 +607,7 @@ namespace svt { namespace table (void)_nColumnPos; } - //------------------------------------------------------------------------------------------------------------------ + Rectangle TableControl::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) { (void)_nRow; @@ -615,7 +615,7 @@ namespace svt { namespace table return GetCharacterBounds(nIndex); } - //------------------------------------------------------------------------------------------------------------------ + sal_Int32 TableControl::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) { (void)_nRow; @@ -623,40 +623,40 @@ namespace svt { namespace table return GetIndexForPoint(_rPoint); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle TableControl::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen) { (void)_bOnScreen; return m_pImpl->calcHeaderRect( _bIsColumnBar ? false : true ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle TableControl::calcHeaderCellRect( sal_Bool _bIsColumnBar, sal_Int32 nPos ) { return m_pImpl->calcHeaderCellRect( _bIsColumnBar, nPos ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle TableControl::calcTableRect(sal_Bool _bOnScreen) { (void)_bOnScreen; return m_pImpl->calcTableRect(); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle TableControl::calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos ) { return m_pImpl->calcCellRect( _nRowPos, _nColPos ); } - //------------------------------------------------------------------------------------------------------------------ + IMPL_LINK_NOARG(TableControl, ImplSelectHdl) { Select(); return 1; } - //------------------------------------------------------------------------------------------------------------------ + void TableControl::Select() { ImplCallEventListenersAndHandler( VCLEVENT_TABLEROW_SELECT, m_pImpl->getSelectHandler(), this ); diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 81334babb123..e1437e05258a 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -294,7 +294,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + const sal_Char* TableControl_Impl::impl_checkInvariants() const { if ( !m_pModel ) @@ -426,7 +426,7 @@ namespace svt { namespace table #define DBG_CHECK_ME() \ DBG_CHKTHIS( TableControl_Impl, TableControl_Impl_checkInvariants ) - //------------------------------------------------------------------------------------------------------------------ + TableControl_Impl::TableControl_Impl( TableControl& _rAntiImpl ) :m_rAntiImpl ( _rAntiImpl ) ,m_pModel ( new EmptyTableModel ) @@ -462,7 +462,7 @@ namespace svt { namespace table m_pDataWindow->Show(); } - //------------------------------------------------------------------------------------------------------------------ + TableControl_Impl::~TableControl_Impl() { DBG_DTOR( TableControl_Impl, TableControl_Impl_checkInvariants ); @@ -474,7 +474,7 @@ namespace svt { namespace table DELETEZ( m_pSelEngine ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::setModel( PTableModel _pModel ) { DBG_CHECK_ME(); @@ -505,7 +505,7 @@ namespace svt { namespace table if ( m_nColumnCount ) m_nCurColumn = 0; } - //------------------------------------------------------------------------------------------------------------------ + namespace { bool lcl_adjustSelectedRows( ::std::vector< RowPos >& io_selectionIndexes, RowPos const i_firstAffectedRowIndex, TableSize const i_offset ) @@ -525,7 +525,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::rowsInserted( RowPos i_first, RowPos i_last ) { DBG_CHECK_ME(); @@ -563,7 +563,7 @@ namespace svt { namespace table m_rAntiImpl.Select(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::rowsRemoved( RowPos i_first, RowPos i_last ) { sal_Int32 firstRemovedRow = i_first; @@ -639,7 +639,7 @@ namespace svt { namespace table m_rAntiImpl.Select(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::columnInserted( ColPos const i_colIndex ) { m_nColumnCount = m_pModel->getColumnCount(); @@ -650,7 +650,7 @@ namespace svt { namespace table OSL_UNUSED( i_colIndex ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::columnRemoved( ColPos const i_colIndex ) { m_nColumnCount = m_pModel->getColumnCount(); @@ -671,7 +671,7 @@ namespace svt { namespace table OSL_UNUSED( i_colIndex ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::allColumnsRemoved() { m_nColumnCount = m_pModel->getColumnCount(); @@ -680,7 +680,7 @@ namespace svt { namespace table m_rAntiImpl.Invalidate(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::cellsUpdated( ColPos const i_firstCol, ColPos i_lastCol, RowPos const i_firstRow, RowPos const i_lastRow ) { invalidateRowRange( i_firstRow, i_lastRow ); @@ -689,7 +689,7 @@ namespace svt { namespace table OSL_UNUSED( i_lastCol ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::tableMetricsChanged() { impl_ni_updateCachedTableMetrics(); @@ -697,7 +697,7 @@ namespace svt { namespace table m_rAntiImpl.Invalidate(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::impl_invalidateColumn( ColPos const i_column ) { DBG_CHECK_ME(); @@ -709,7 +709,7 @@ namespace svt { namespace table m_rAntiImpl.Invalidate( aColumn.getRect() ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::columnChanged( ColPos const i_column, ColumnAttributeGroup const i_attributeGroup ) { ColumnAttributeGroup nGroup( i_attributeGroup ); @@ -734,7 +734,7 @@ namespace svt { namespace table "TableControl_Impl::columnChanged: don't know how to handle this change!" ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle TableControl_Impl::impl_getAllVisibleCellsArea() const { DBG_CHECK_ME(); @@ -772,7 +772,7 @@ namespace svt { namespace table return aArea; } - //------------------------------------------------------------------------------------------------------------------ + Rectangle TableControl_Impl::impl_getAllVisibleDataCellArea() const { DBG_CHECK_ME(); @@ -783,7 +783,7 @@ namespace svt { namespace table return aArea; } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::impl_ni_updateCachedTableMetrics() { m_nRowHeightPixel = m_rAntiImpl.LogicToPixel( Size( 0, m_pModel->getRowHeight() ), MAP_APPFONT ).Height(); @@ -797,7 +797,7 @@ namespace svt { namespace table m_nRowHeaderWidthPixel = m_rAntiImpl.LogicToPixel( Size( m_pModel->getRowHeaderWidth(), 0 ), MAP_APPFONT).Width(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::impl_ni_updateCachedModelValues() { m_pInputHandler = m_pModel->getInputHandler(); @@ -815,7 +815,7 @@ namespace svt { namespace table impl_ni_updateCachedTableMetrics(); } - //------------------------------------------------------------------------------------------------------------------ + namespace { //.............................................................................................................. @@ -923,7 +923,7 @@ namespace svt { namespace table } - //------------------------------------------------------------------------------------------------------------------ + long TableControl_Impl::impl_ni_calculateColumnWidths( ColPos const i_assumeInflexibleColumnsUpToIncluding, bool const i_assumeVerticalScrollbar, ::std::vector< long >& o_newColWidthsPixel ) const { @@ -1176,7 +1176,7 @@ namespace svt { namespace table return gridWidthPixel; } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::impl_ni_relayout( ColPos const i_assumeInflexibleColumnsUpToIncluding ) { ENSURE_OR_RETURN_VOID( !m_bUpdatingColWidths, "TableControl_Impl::impl_ni_relayout: recursive call detected!" ); @@ -1310,7 +1310,7 @@ namespace svt { namespace table impl_ni_positionChildWindows( aDataCellPlayground, bNeedVerticalScrollbar, bNeedHorizontalScrollbar ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::impl_ni_positionChildWindows( Rectangle const & i_dataCellPlayground, bool const i_verticalScrollbar, bool const i_horizontalScrollbar ) { @@ -1403,7 +1403,7 @@ namespace svt { namespace table ) ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::onResize() { DBG_CHECK_ME(); @@ -1412,7 +1412,7 @@ namespace svt { namespace table checkCursorPosition(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::doPaintContent( const Rectangle& _rUpdateRect ) { DBG_CHECK_ME(); @@ -1536,7 +1536,7 @@ namespace svt { namespace table } } } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::hideCursor() { DBG_CHECK_ME(); @@ -1545,7 +1545,7 @@ namespace svt { namespace table impl_ni_doSwitchCursor( false ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::showCursor() { DBG_CHECK_ME(); @@ -1555,7 +1555,7 @@ namespace svt { namespace table impl_ni_doSwitchCursor( true ); } - //------------------------------------------------------------------------------------------------------------------ + bool TableControl_Impl::dispatchAction( TableControlAction _eAction ) { DBG_CHECK_ME(); @@ -1929,7 +1929,7 @@ namespace svt { namespace table return bSuccess; } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::impl_ni_doSwitchCursor( bool _bShow ) { PTableRenderer pRenderer = !!m_pModel ? m_pModel->getRenderer() : PTableRenderer(); @@ -1944,7 +1944,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::impl_getCellRect( ColPos _nColumn, RowPos _nRow, Rectangle& _rCellRect ) const { DBG_CHECK_ME(); @@ -1962,21 +1962,21 @@ namespace svt { namespace table _rCellRect = aCell.getRect(); } - //------------------------------------------------------------------------------------------------------------------ + RowPos TableControl_Impl::getRowAtPoint( const Point& rPoint ) const { DBG_CHECK_ME(); return impl_getRowForAbscissa( rPoint.Y() ); } - //------------------------------------------------------------------------------------------------------------------ + ColPos TableControl_Impl::getColAtPoint( const Point& rPoint ) const { DBG_CHECK_ME(); return impl_getColumnForOrdinate( rPoint.X() ); } - //------------------------------------------------------------------------------------------------------------------ + TableCell TableControl_Impl::hitTest( Point const & i_point ) const { TableCell aCell( getColAtPoint( i_point ), getRowAtPoint( i_point ) ); @@ -1995,7 +1995,7 @@ namespace svt { namespace table return aCell; } - //------------------------------------------------------------------------------------------------------------------ + ColumnMetrics TableControl_Impl::getColumnMetrics( ColPos const i_column ) const { DBG_CHECK_ME(); @@ -2005,50 +2005,50 @@ namespace svt { namespace table return (ColumnMetrics const &)m_aColumnWidths[ i_column ]; } - //------------------------------------------------------------------------------------------------------------------ + PTableModel TableControl_Impl::getModel() const { return m_pModel; } - //------------------------------------------------------------------------------------------------------------------ + RowPos TableControl_Impl::getCurrentColumn() const { return m_nCurColumn; } - //------------------------------------------------------------------------------------------------------------------ + RowPos TableControl_Impl::getCurrentRow() const { return m_nCurRow; } - //------------------------------------------------------------------------------------------------------------------ + ::Size TableControl_Impl::getTableSizePixel() const { return m_pDataWindow->GetOutputSizePixel(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::setPointer( Pointer const & i_pointer ) { DBG_CHECK_ME(); m_pDataWindow->SetPointer( i_pointer ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::captureMouse() { m_pDataWindow->CaptureMouse(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::releaseMouse() { m_pDataWindow->ReleaseMouse(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::invalidate( TableArea const i_what ) { switch ( i_what ) @@ -2072,38 +2072,38 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + long TableControl_Impl::pixelWidthToAppFont( long const i_pixels ) const { return m_pDataWindow->PixelToLogic( Size( i_pixels, 0 ), MAP_APPFONT ).Width(); } - //------------------------------------------------------------------------------------------------------------------ + long TableControl_Impl::appFontWidthToPixel( long const i_appFontUnits ) const { return m_pDataWindow->LogicToPixel( Size( i_appFontUnits, 0 ), MAP_APPFONT ).Width(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::hideTracking() { m_pDataWindow->HideTracking(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::showTracking( Rectangle const & i_location, sal_uInt16 const i_flags ) { m_pDataWindow->ShowTracking( i_location, i_flags ); } - //------------------------------------------------------------------------------------------------------------------ + bool TableControl_Impl::activateCell( ColPos const i_col, RowPos const i_row ) { DBG_CHECK_ME(); return goTo( i_col, i_row ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::invalidateSelectedRegion( RowPos _nPrevRow, RowPos _nCurRow ) { DBG_CHECK_ME(); @@ -2149,7 +2149,7 @@ namespace svt { namespace table m_pDataWindow->GetControlBackground().GetTransparency() ? INVALIDATE_TRANSPARENT : 0 ); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::invalidateSelectedRows() { for ( ::std::vector< RowPos >::iterator selRow = m_aSelectedRows.begin(); @@ -2161,7 +2161,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::invalidateRowRange( RowPos const i_firstRow, RowPos const i_lastRow ) { RowPos const firstRow = i_firstRow < m_nTopRow ? m_nTopRow : i_firstRow; @@ -2184,7 +2184,7 @@ namespace svt { namespace table invalidateRect(aInvalidateRect); } - //------------------------------------------------------------------------------ + void TableControl_Impl::checkCursorPosition() { DBG_CHECK_ME(); @@ -2216,7 +2216,7 @@ namespace svt { namespace table m_pDataWindow->Invalidate(); } - //-------------------------------------------------------------------- + TableSize TableControl_Impl::impl_getVisibleRows( bool _bAcceptPartialRow ) const { DBG_CHECK_ME(); @@ -2230,7 +2230,7 @@ namespace svt { namespace table ); } - //-------------------------------------------------------------------- + TableSize TableControl_Impl::impl_getVisibleColumns( bool _bAcceptPartialCol ) const { DBG_CHECK_ME(); @@ -2245,7 +2245,7 @@ namespace svt { namespace table ); } - //-------------------------------------------------------------------- + bool TableControl_Impl::goTo( ColPos _nColumn, RowPos _nRow ) { DBG_CHECK_ME(); @@ -2269,7 +2269,7 @@ namespace svt { namespace table return true; } - //-------------------------------------------------------------------- + void TableControl_Impl::ensureVisible( ColPos _nColumn, RowPos _nRow, bool _bAcceptPartialVisibility ) { DBG_CHECK_ME(); @@ -2302,7 +2302,7 @@ namespace svt { namespace table } } - //-------------------------------------------------------------------- + OUString TableControl_Impl::getCellContentAsString( RowPos const i_row, ColPos const i_col ) { Any aCellValue; @@ -2314,7 +2314,7 @@ namespace svt { namespace table return sCellStringContent; } - //-------------------------------------------------------------------- + TableSize TableControl_Impl::impl_ni_ScrollRows( TableSize _nRowDelta ) { // compute new top row @@ -2373,14 +2373,14 @@ namespace svt { namespace table return (TableSize)( m_nTopRow - nOldTopRow ); } - //-------------------------------------------------------------------- + TableSize TableControl_Impl::impl_scrollRows( TableSize const i_rowDelta ) { DBG_CHECK_ME(); return impl_ni_ScrollRows( i_rowDelta ); } - //-------------------------------------------------------------------- + TableSize TableControl_Impl::impl_ni_ScrollColumns( TableSize _nColumnDelta ) { // compute new left column @@ -2447,38 +2447,38 @@ namespace svt { namespace table return (TableSize)( m_nLeftColumn - nOldLeftColumn ); } - //------------------------------------------------------------------------------------------------------------------ + TableSize TableControl_Impl::impl_scrollColumns( TableSize const i_columnDelta ) { DBG_CHECK_ME(); return impl_ni_ScrollColumns( i_columnDelta ); } - //------------------------------------------------------------------------------------------------------------------ + SelectionEngine* TableControl_Impl::getSelEngine() { return m_pSelEngine; } - //------------------------------------------------------------------------------------------------------------------ + ScrollBar* TableControl_Impl::getHorzScrollbar() { return m_pHScroll; } - //------------------------------------------------------------------------------------------------------------------ + ScrollBar* TableControl_Impl::getVertScrollbar() { return m_pVScroll; } - //------------------------------------------------------------------------------------------------------------------ + bool TableControl_Impl::isRowSelected( RowPos i_row ) const { return ::std::find( m_aSelectedRows.begin(), m_aSelectedRows.end(), i_row ) != m_aSelectedRows.end(); } - //------------------------------------------------------------------------------------------------------------------ + RowPos TableControl_Impl::getSelectedRowIndex( size_t const i_selectionIndex ) const { if ( i_selectionIndex < m_aSelectedRows.size() ) @@ -2486,7 +2486,7 @@ namespace svt { namespace table return ROW_INVALID; } - //------------------------------------------------------------------------------------------------------------------ + int TableControl_Impl::getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current) { std::vector<RowPos>::const_iterator it = ::std::find(selectedRows.begin(),selectedRows.end(),current); @@ -2497,7 +2497,7 @@ namespace svt { namespace table return -1; } - //-------------------------------------------------------------------- + ColPos TableControl_Impl::impl_getColumnForOrdinate( long const i_ordinate ) const { DBG_CHECK_ME(); @@ -2525,7 +2525,7 @@ namespace svt { namespace table return lowerBound - m_aColumnWidths.begin(); } - //-------------------------------------------------------------------- + RowPos TableControl_Impl::impl_getRowForAbscissa( long const i_abscissa ) const { DBG_CHECK_ME(); @@ -2541,7 +2541,7 @@ namespace svt { namespace table return row < m_pModel->getRowCount() ? row : ROW_INVALID; } - //-------------------------------------------------------------------- + bool TableControl_Impl::markRowAsDeselected( RowPos const i_rowIndex ) { DBG_CHECK_ME(); @@ -2554,7 +2554,7 @@ namespace svt { namespace table return true; } - //-------------------------------------------------------------------- + bool TableControl_Impl::markRowAsSelected( RowPos const i_rowIndex ) { DBG_CHECK_ME(); @@ -2586,7 +2586,7 @@ namespace svt { namespace table return true; } - //-------------------------------------------------------------------- + bool TableControl_Impl::markAllRowsAsDeselected() { if ( m_aSelectedRows.empty() ) @@ -2596,7 +2596,7 @@ namespace svt { namespace table return true; } - //-------------------------------------------------------------------- + bool TableControl_Impl::markAllRowsAsSelected() { DBG_CHECK_ME(); @@ -2623,13 +2623,13 @@ namespace svt { namespace table return true; } - //-------------------------------------------------------------------- + void TableControl_Impl::commitAccessibleEvent( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue ) { impl_commitAccessibleEvent( i_eventID, i_newValue, i_oldValue ); } - //-------------------------------------------------------------------- + void TableControl_Impl::commitCellEvent( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue ) { DBG_CHECK_ME(); @@ -2637,7 +2637,7 @@ namespace svt { namespace table m_pAccessibleTable->commitCellEvent( i_eventID, i_newValue, i_oldValue ); } - //-------------------------------------------------------------------- + void TableControl_Impl::commitTableEvent( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue ) { DBG_CHECK_ME(); @@ -2645,7 +2645,7 @@ namespace svt { namespace table m_pAccessibleTable->commitTableEvent( i_eventID, i_newValue, i_oldValue ); } - //-------------------------------------------------------------------- + Rectangle TableControl_Impl::calcHeaderRect(bool bColHeader) { Rectangle const aRectTableWithHeaders( impl_getAllVisibleCellsArea() ); @@ -2656,7 +2656,7 @@ namespace svt { namespace table return Rectangle( aRectTableWithHeaders.TopLeft(), Size( m_nRowHeaderWidthPixel, aSizeTableWithHeaders.Height() ) ); } - //-------------------------------------------------------------------- + Rectangle TableControl_Impl::calcHeaderCellRect( bool bColHeader, sal_Int32 nPos ) { Rectangle const aHeaderRect = calcHeaderRect( bColHeader ); @@ -2668,13 +2668,13 @@ namespace svt { namespace table return aGeometry.getRect(); } - //-------------------------------------------------------------------- + Rectangle TableControl_Impl::calcTableRect() { return impl_getAllVisibleDataCellArea(); } - //-------------------------------------------------------------------- + Rectangle TableControl_Impl::calcCellRect( sal_Int32 nRow, sal_Int32 nCol ) { Rectangle aCellRect; @@ -2682,7 +2682,7 @@ namespace svt { namespace table return aCellRect; } - //-------------------------------------------------------------------- + IMPL_LINK( TableControl_Impl, OnUpdateScrollbars, void*, /**/ ) { DBG_CHECK_ME(); @@ -2692,7 +2692,7 @@ namespace svt { namespace table return 1L; } - //-------------------------------------------------------------------- + IMPL_LINK( TableControl_Impl, OnScroll, ScrollBar*, _pScrollbar ) { DBG_ASSERT( ( _pScrollbar == m_pVScroll ) || ( _pScrollbar == m_pHScroll ), @@ -2706,7 +2706,7 @@ namespace svt { namespace table return 0L; } - //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > TableControl_Impl::getAccessible( Window& i_parentWindow ) { DBG_TESTSOLARMUTEX(); @@ -2727,7 +2727,7 @@ namespace svt { namespace table return xAccessible; } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::disposeAccessible() { if ( m_pAccessibleTable ) @@ -2735,14 +2735,14 @@ namespace svt { namespace table m_pAccessibleTable = NULL; } - //------------------------------------------------------------------------------------------------------------------ + bool TableControl_Impl::impl_isAccessibleAlive() const { DBG_CHECK_ME(); return ( NULL != m_pAccessibleTable ) && m_pAccessibleTable->isAlive(); } - //------------------------------------------------------------------------------------------------------------------ + void TableControl_Impl::impl_commitAccessibleEvent( sal_Int16 const i_eventID, Any const & i_newValue, Any const & i_oldValue ) { DBG_CHECK_ME(); @@ -2753,33 +2753,33 @@ namespace svt { namespace table //================================================================================================================== //= TableFunctionSet //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + TableFunctionSet::TableFunctionSet(TableControl_Impl* _pTableControl) :m_pTableControl( _pTableControl) ,m_nCurrentRow( ROW_INVALID ) { } - //------------------------------------------------------------------------------------------------------------------ + TableFunctionSet::~TableFunctionSet() { } - //------------------------------------------------------------------------------------------------------------------ + void TableFunctionSet::BeginDrag() { } - //------------------------------------------------------------------------------------------------------------------ + void TableFunctionSet::CreateAnchor() { m_pTableControl->setAnchor( m_pTableControl->getCurRow() ); } - //------------------------------------------------------------------------------------------------------------------ + void TableFunctionSet::DestroyAnchor() { m_pTableControl->setAnchor( ROW_INVALID ); } - //------------------------------------------------------------------------------------------------------------------ + bool TableFunctionSet::SetCursorAtPoint(const Point& rPoint, sal_Bool bDontSelectAtCursor) { sal_Bool bHandled = sal_False; @@ -2857,7 +2857,7 @@ namespace svt { namespace table m_pTableControl->goTo( newCol, newRow ); return bHandled; } - //------------------------------------------------------------------------------------------------------------------ + bool TableFunctionSet::IsSelectionAtPoint( const Point& rPoint ) { m_pTableControl->getSelEngine()->AddAlways(false); @@ -2872,7 +2872,7 @@ namespace svt { namespace table return selected; } } - //------------------------------------------------------------------------------------------------------------------ + void TableFunctionSet::DeselectAtPoint( const Point& rPoint ) { (void)rPoint; @@ -2880,7 +2880,7 @@ namespace svt { namespace table m_pTableControl->markRowAsDeselected( m_nCurrentRow ); } - //------------------------------------------------------------------------------------------------------------------ + void TableFunctionSet::DeselectAll() { if ( m_pTableControl->hasRowSelection() ) diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index 91280fe857cc..e9c8a981321c 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -37,7 +37,7 @@ namespace svt { namespace table //================================================================================================================== //= TableDataWindow //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + TableDataWindow::TableDataWindow( TableControl_Impl& _rTableControl ) :Window( &_rTableControl.getAntiImpl() ) ,m_rTableControl( _rTableControl ) @@ -49,34 +49,34 @@ namespace svt { namespace table SetFillColor( aWindowColor ); } - //------------------------------------------------------------------------------------------------------------------ + TableDataWindow::~TableDataWindow() { impl_hideTipWindow(); } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::Paint( const Rectangle& rUpdateRect ) { m_rTableControl.doPaintContent( rUpdateRect ); } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::SetBackground( const Wallpaper& rColor ) { Window::SetBackground( rColor ); } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::SetControlBackground( const Color& rColor ) { Window::SetControlBackground( rColor ); } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::SetControlBackground() { Window::SetControlBackground(); } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::RequestHelp( const HelpEvent& rHEvt ) { sal_uInt16 const nHelpMode = rHEvt.GetMode(); @@ -155,7 +155,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::impl_hideTipWindow() { if ( m_nTipWindowHandle != 0 ) @@ -165,7 +165,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::MouseMove( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeaveWindow() ) @@ -176,7 +176,7 @@ namespace svt { namespace table Window::MouseMove( rMEvt ); } } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::MouseButtonDown( const MouseEvent& rMEvt ) { impl_hideTipWindow(); @@ -200,7 +200,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableDataWindow::MouseButtonUp( const MouseEvent& rMEvt ) { if ( !m_rTableControl.getInputHandler()->MouseButtonUp( m_rTableControl, rMEvt ) ) @@ -209,7 +209,7 @@ namespace svt { namespace table m_rTableControl.getAntiImpl().GrabFocus(); } - //------------------------------------------------------------------------------------------------------------------ + bool TableDataWindow::Notify(NotifyEvent& rNEvt ) { bool nDone = false; diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx index 98749e567d6d..e47928309fae 100644 --- a/svtools/source/table/tablegeometry.cxx +++ b/svtools/source/table/tablegeometry.cxx @@ -29,7 +29,7 @@ namespace svt { namespace table //================================================================================================================== //= TableRowGeometry //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + TableRowGeometry::TableRowGeometry( TableControl_Impl const & _rControl, Rectangle const & _rBoundaries, RowPos const _nRow, bool const i_allowVirtualRows ) :TableGeometry( _rControl, _rBoundaries ) @@ -47,7 +47,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableRowGeometry::impl_initRect() { if ( ( m_nRowPos >= m_rControl.m_nTopRow ) && impl_isValidRow( m_nRowPos ) ) @@ -59,13 +59,13 @@ namespace svt { namespace table m_aRect.SetEmpty(); } - //------------------------------------------------------------------------------------------------------------------ + bool TableRowGeometry::impl_isValidRow( RowPos const i_row ) const { return m_bAllowVirtualRows || ( i_row < m_rControl.m_pModel->getRowCount() ); } - //------------------------------------------------------------------------------------------------------------------ + bool TableRowGeometry::moveDown() { if ( m_nRowPos == ROW_COL_HEADERS ) @@ -86,7 +86,7 @@ namespace svt { namespace table //================================================================================================================== //= TableColumnGeometry //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + TableColumnGeometry::TableColumnGeometry( TableControl_Impl const & _rControl, Rectangle const & _rBoundaries, ColPos const _nCol, bool const i_allowVirtualColumns ) :TableGeometry( _rControl, _rBoundaries ) @@ -104,7 +104,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void TableColumnGeometry::impl_initRect() { ColPos nLeftColumn = m_rControl.m_nLeftColumn; @@ -121,13 +121,13 @@ namespace svt { namespace table m_aRect.SetEmpty(); } - //------------------------------------------------------------------------------------------------------------------ + bool TableColumnGeometry::impl_isValidColumn( ColPos const i_column ) const { return m_bAllowVirtualColumns || ( i_column < ColPos( m_rControl.m_aColumnWidths.size() ) ); } - //------------------------------------------------------------------------------------------------------------------ + bool TableColumnGeometry::moveRight() { if ( m_nColPos == COL_ROW_HEADERS ) diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx index ce92da80cc72..1a023bf9a8fd 100644 --- a/svtools/source/toolpanel/drawerlayouter.cxx +++ b/svtools/source/toolpanel/drawerlayouter.cxx @@ -37,7 +37,7 @@ namespace svt //================================================================================================================== //= DrawerDeckLayouter //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + DrawerDeckLayouter::DrawerDeckLayouter( ::Window& i_rParentWindow, IToolPanelDeck& i_rPanels ) :m_rParentWindow( i_rParentWindow ) ,m_rPanelDeck( i_rPanels ) @@ -51,15 +51,15 @@ namespace svt PanelInserted( m_rPanelDeck.GetPanel( i ), i ); } - //------------------------------------------------------------------------------------------------------------------ + DrawerDeckLayouter::~DrawerDeckLayouter() { } - //------------------------------------------------------------------------------------------------------------------ + IMPLEMENT_IREFERENCE( DrawerDeckLayouter ) - //------------------------------------------------------------------------------------------------------------------ + Rectangle DrawerDeckLayouter::Layout( const Rectangle& i_rDeckPlayground ) { const size_t nPanelCount( m_rPanelDeck.GetPanelCount() ); @@ -102,7 +102,7 @@ namespace svt ); } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::Destroy() { while ( !m_aDrawers.empty() ) @@ -110,7 +110,7 @@ namespace svt m_rPanelDeck.RemoveListener( *this ); } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::SetFocusToPanelSelector() { const size_t nPanelCount( m_rPanelDeck.GetPanelCount() ); @@ -124,13 +124,13 @@ namespace svt m_aDrawers[ *aActivePanel ]->GrabFocus(); } - //------------------------------------------------------------------------------------------------------------------ + size_t DrawerDeckLayouter::GetAccessibleChildCount() const { return m_aDrawers.size(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessible > DrawerDeckLayouter::GetAccessibleChild( const size_t i_nChildIndex, const Reference< XAccessible >& i_rParentAccessible ) { ENSURE_OR_RETURN( i_nChildIndex < m_aDrawers.size(), "illegal index", NULL ); @@ -149,7 +149,7 @@ namespace svt return xItemAccessible; } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) { OSL_PRECOND( i_nPosition <= m_aDrawers.size(), "DrawerDeckLayouter::PanelInserted: inconsistency!" ); @@ -173,14 +173,14 @@ namespace svt impl_triggerRearrange(); } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::PanelRemoved( const size_t i_nPosition ) { impl_removeDrawer( i_nPosition ); impl_triggerRearrange(); } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::impl_triggerRearrange() const { // this is somewhat hacky, it assumes that the parent of our panels is a tool panel deck, which, in its @@ -188,7 +188,7 @@ namespace svt m_rParentWindow.Resize(); } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { if ( !!i_rOldActive ) @@ -206,14 +206,14 @@ namespace svt impl_triggerRearrange(); } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::LayouterChanged( const PDeckLayouter& i_rNewLayouter ) { // not interested in (void)i_rNewLayouter; } - //------------------------------------------------------------------------------------------------------------------ + size_t DrawerDeckLayouter::impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const { for ( ::std::vector< PToolPanelDrawer >::const_iterator drawerPos = m_aDrawers.begin(); @@ -227,7 +227,7 @@ namespace svt return m_aDrawers.size(); } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::impl_removeDrawer( const size_t i_nPosition ) { OSL_PRECOND( i_nPosition < m_aDrawers.size(), "DrawerDeckLayouter::impl_removeDrawer: invalid panel position!" ); @@ -236,7 +236,7 @@ namespace svt m_aDrawers.erase( m_aDrawers.begin() + i_nPosition ); } - //------------------------------------------------------------------------------------------------------------------ + IMPL_LINK( DrawerDeckLayouter, OnWindowEvent, VclSimpleEvent*, i_pEvent ) { const VclWindowEvent* pWindowEvent = PTR_CAST( VclWindowEvent, i_pEvent ); @@ -284,7 +284,7 @@ namespace svt return 0L; } - //------------------------------------------------------------------------------------------------------------------ + void DrawerDeckLayouter::Dying() { Destroy(); diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx index 9be075276538..3a8ca8677333 100644 --- a/svtools/source/toolpanel/dummypanel.cxx +++ b/svtools/source/toolpanel/dummypanel.cxx @@ -31,63 +31,63 @@ namespace svt //==================================================================== //= DummyPanel //==================================================================== - //-------------------------------------------------------------------- + DummyPanel::DummyPanel() { } - //-------------------------------------------------------------------- + DummyPanel::~DummyPanel() { } - //-------------------------------------------------------------------- + IMPLEMENT_IREFERENCE( DummyPanel ) - //-------------------------------------------------------------------- + void DummyPanel::Activate( Window& ) { } - //-------------------------------------------------------------------- + void DummyPanel::Deactivate() { } - //-------------------------------------------------------------------- + void DummyPanel::SetSizePixel( const Size& ) { } - //-------------------------------------------------------------------- + OUString DummyPanel::GetDisplayName() const { return OUString(); } - //-------------------------------------------------------------------- + Image DummyPanel::GetImage() const { return Image(); } - //-------------------------------------------------------------------- + OString DummyPanel::GetHelpID() const { return OString(); } - //-------------------------------------------------------------------- + void DummyPanel::GrabFocus() { } - //-------------------------------------------------------------------- + void DummyPanel::Dispose() { } - //-------------------------------------------------------------------- + Reference< XAccessible > DummyPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ) { (void)i_rParentAccessible; diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx index d16d6d05ddb7..ae1c90f94cf8 100644 --- a/svtools/source/toolpanel/paneldecklisteners.cxx +++ b/svtools/source/toolpanel/paneldecklisteners.cxx @@ -29,17 +29,17 @@ namespace svt //==================================================================== //= PanelDeckListeners //==================================================================== - //-------------------------------------------------------------------- + PanelDeckListeners::PanelDeckListeners() { } - //-------------------------------------------------------------------- + PanelDeckListeners::~PanelDeckListeners() { } - //-------------------------------------------------------------------- + void PanelDeckListeners::PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) { ::std::vector< IToolPanelDeckListener* > aListeners( m_aListeners ); @@ -52,7 +52,7 @@ namespace svt } } - //-------------------------------------------------------------------- + void PanelDeckListeners::PanelRemoved( const size_t i_nPosition ) { ::std::vector< IToolPanelDeckListener* > aListeners( m_aListeners ); @@ -65,7 +65,7 @@ namespace svt } } - //-------------------------------------------------------------------- + void PanelDeckListeners::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { ::std::vector< IToolPanelDeckListener* > aListeners( m_aListeners ); @@ -78,7 +78,7 @@ namespace svt } } - //-------------------------------------------------------------------- + void PanelDeckListeners::LayouterChanged( const PDeckLayouter& i_rNewLayouter ) { ::std::vector< IToolPanelDeckListener* > aListeners( m_aListeners ); @@ -91,7 +91,7 @@ namespace svt } } - //-------------------------------------------------------------------- + void PanelDeckListeners::Dying() { while ( !m_aListeners.empty() ) @@ -102,13 +102,13 @@ namespace svt } } - //-------------------------------------------------------------------- + void PanelDeckListeners::AddListener( IToolPanelDeckListener& i_rListener ) { m_aListeners.push_back( &i_rListener ); } - //-------------------------------------------------------------------- + void PanelDeckListeners::RemoveListener( IToolPanelDeckListener& i_rListener ) { for ( ::std::vector< IToolPanelDeckListener* >::iterator lookup = m_aListeners.begin(); diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index f041b33057f3..3a19a335bcc0 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -127,13 +127,13 @@ namespace svt //================================================================================================================== //= VCLItemRenderer - implementation //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + void VCLItemRenderer::renderBackground() const { getTargetDevice().DrawRect( Rectangle( Point(), getTargetDevice().GetOutputSizePixel() ) ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle VCLItemRenderer::calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const { (void)i_nItemFlags; @@ -141,14 +141,14 @@ namespace svt return i_rContentArea; } - //------------------------------------------------------------------------------------------------------------------ + void VCLItemRenderer::preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const { (void)i_rContentRect; (void)i_nItemFlags; } - //------------------------------------------------------------------------------------------------------------------ + void VCLItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { const bool bActive = ( ( i_nItemFlags & ITEM_STATE_ACTIVE ) != 0 ); @@ -202,13 +202,13 @@ namespace svt //================================================================================================================== //= NWFToolboxItemRenderer - implementation //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + void NWFToolboxItemRenderer::renderBackground() const { getTargetDevice().DrawRect( Rectangle( Point(), getTargetDevice().GetOutputSizePixel() ) ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle NWFToolboxItemRenderer::calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const { // don't ask GetNativeControlRegion, this will not deliver proper results in all cases. @@ -228,7 +228,7 @@ namespace svt ); } - //------------------------------------------------------------------------------------------------------------------ + void NWFToolboxItemRenderer::preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const { const ControlState nState = lcl_ItemToControlState( i_nItemFlags ); @@ -242,7 +242,7 @@ namespace svt // IsNativeControlSupported returned true, previously, otherwise we would not be here ... } - //------------------------------------------------------------------------------------------------------------------ + void NWFToolboxItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { (void)i_rActualWindow; @@ -279,7 +279,7 @@ namespace svt //================================================================================================================== //= NWFTabItemRenderer - implementation //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + void NWFTabItemRenderer::renderBackground() const { Rectangle aBackground( Point(), getTargetDevice().GetOutputSizePixel() ); @@ -290,7 +290,7 @@ namespace svt CTRL_STATE_ENABLED, ImplControlValue(), OUString() ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle NWFTabItemRenderer::calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const { const ControlState nState( lcl_ItemToControlState( i_nItemFlags ) ); @@ -310,7 +310,7 @@ namespace svt return aBoundingRegion; } - //------------------------------------------------------------------------------------------------------------------ + void NWFTabItemRenderer::preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const { const ControlState nState = lcl_ItemToControlState( i_nItemFlags ); @@ -328,7 +328,7 @@ namespace svt // IsNativeControlSupported returned true, previously, otherwise we would not be here ... } - //------------------------------------------------------------------------------------------------------------------ + void NWFTabItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { (void)i_rActualWindow; @@ -435,7 +435,7 @@ namespace svt //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + #if OSL_DEBUG_LEVEL > 0 static void lcl_checkConsistency( const PanelTabBar_Impl& i_rImpl ) { @@ -464,7 +464,7 @@ namespace svt (void)data; #endif - //-------------------------------------------------------------------------------------------------------------- + class ClipItemRegion { public: @@ -491,7 +491,7 @@ namespace svt //================================================================================================================== //= PanelTabBar_Impl - implementation //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + PanelTabBar_Impl::PanelTabBar_Impl( PanelTabBar& i_rTabBar, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :m_rTabBar( i_rTabBar ) ,m_aGeometry( i_eItemContent ) @@ -539,7 +539,7 @@ namespace svt m_aScrollForward.SetAccessibleName( m_aScrollForward.GetAccessibleDescription() ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::impl_calcItemRects() { m_aItems.resize(0); @@ -579,7 +579,7 @@ namespace svt m_bItemsDirty = false; } - //------------------------------------------------------------------------------------------------------------------ + Size PanelTabBar_Impl::impl_calculateItemContentSize( const PToolPanel& i_pPanel, const TabItemContent i_eItemContent ) const { // calculate the size needed for the content @@ -623,7 +623,7 @@ namespace svt return aItemContentSize; } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::impl_renderItemContent( const PToolPanel& i_pPanel, const Rectangle& i_rContentArea, const TabItemContent i_eItemContent ) const { OSL_ENSURE( i_eItemContent != TABITEM_AUTO, "PanelTabBar_Impl::impl_renderItemContent: illegal TabItemContent value!" ); @@ -706,7 +706,7 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::CopyFromRenderDevice( const Rectangle& i_rLogicalRect ) const { BitmapEx aBitmap( m_aRenderDevice.GetBitmapEx( @@ -731,7 +731,7 @@ namespace svt m_rTabBar.DrawBitmapEx( aActualRect.TopLeft(), aBitmap ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::InvalidateItem( const size_t i_nItemIndex, const ItemFlags i_nAdditionalItemFlags ) const { const ItemDescriptor& rItem( m_aItems[ i_nItemIndex ] ); @@ -744,7 +744,7 @@ namespace svt m_rTabBar.Invalidate( aActualBounds ); } - //------------------------------------------------------------------------------------------------------------------ + ItemFlags PanelTabBar_Impl::impl_getItemFlags( const size_t i_nItemIndex ) const { ItemFlags nItemFlags( ITEM_STATE_NORMAL ); @@ -770,7 +770,7 @@ namespace svt return nItemFlags; } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::DrawItem( const size_t i_nItemIndex, const Rectangle& i_rBoundaries ) const { const ItemDescriptor& rItem( m_aItems[ i_nItemIndex ] ); @@ -809,7 +809,7 @@ namespace svt m_rTabBar.SetUpdateMode( true ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::EnsureItemsCache() { if ( m_bItemsDirty == false ) @@ -822,7 +822,7 @@ namespace svt DBG_CHECK( *this ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::Relayout() { EnsureItemsCache(); @@ -862,7 +862,7 @@ namespace svt UpdateScrollButtons(); } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< size_t > PanelTabBar_Impl::FindItemForPoint( const Point& i_rPoint ) const { Point aPoint( IsVertical() ? i_rPoint.Y() : i_rPoint.X(), IsVertical() ? i_rPoint.X() : i_rPoint.Y() ); @@ -885,7 +885,7 @@ namespace svt return ::boost::optional< size_t >(); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle PanelTabBar_Impl::GetItemScreenRect( const size_t i_nItemPos ) const { ENSURE_OR_RETURN( i_nItemPos < m_aItems.size(), "PanelTabBar_Impl::GetItemScreenRect: invalid item pos!", Rectangle() ); @@ -901,7 +901,7 @@ namespace svt ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::FocusItem( const ::boost::optional< size_t >& i_rItemPos ) { // reset old focus item @@ -917,7 +917,7 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + IMPL_LINK( PanelTabBar_Impl, OnScroll, const PushButton*, i_pButton ) { if ( i_pButton == &m_aScrollBack ) @@ -938,7 +938,7 @@ namespace svt return 0L; } - //------------------------------------------------------------------------------------------------------------------ + Rectangle PanelTabBar_Impl::GetActualLogicalItemRect( const Rectangle& i_rLogicalItemRect ) const { // care for the offset imposed by our geometry, i.e. whether or not we have scroll buttons @@ -960,7 +960,7 @@ namespace svt //================================================================================================================== //= PanelTabBar_Impl //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { EnsureItemsCache(); @@ -971,14 +971,14 @@ namespace svt InvalidateItem( *i_rNewActive ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::LayouterChanged( const PDeckLayouter& i_rNewLayouter ) { // not interested in (void)i_rNewLayouter; } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar_Impl::Dying() { // not interested in - the notifier is a member of this instance here, so we're dying ourself at the moment @@ -987,7 +987,7 @@ namespace svt //================================================================================================================== //= PanelTabBar //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + PanelTabBar::PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :Control( &i_rParentWindow, 0 ) ,m_pImpl( new PanelTabBar_Impl( *this, i_rPanelDeck, i_eAlignment, i_eItemContent ) ) @@ -995,18 +995,18 @@ namespace svt DBG_CHECK( *m_pImpl ); } - //------------------------------------------------------------------------------------------------------------------ + PanelTabBar::~PanelTabBar() { } - //------------------------------------------------------------------------------------------------------------------ + TabItemContent PanelTabBar::GetTabItemContent() const { return m_pImpl->m_aGeometry.getItemContent(); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::SetTabItemContent( const TabItemContent& i_eItemContent ) { m_pImpl->m_aGeometry.setItemContent( i_eItemContent ); @@ -1014,14 +1014,14 @@ namespace svt Invalidate(); } - //------------------------------------------------------------------------------------------------------------------ + IToolPanelDeck& PanelTabBar::GetPanelDeck() const { DBG_CHECK( *m_pImpl ); return m_pImpl->m_rPanelDeck; } - //------------------------------------------------------------------------------------------------------------------ + Size PanelTabBar::GetOptimalSize() const { m_pImpl->EnsureItemsCache(); @@ -1031,14 +1031,14 @@ namespace svt return aOptimalSize; } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::Resize() { Control::Resize(); m_pImpl->Relayout(); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::Paint( const Rectangle& i_rRect ) { m_pImpl->EnsureItemsCache(); @@ -1089,7 +1089,7 @@ namespace svt m_pImpl->DrawItem( *aHoveredPanel, aLogicalPaintRect ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::MouseMove( const MouseEvent& i_rMouseEvent ) { m_pImpl->EnsureItemsCache(); @@ -1117,7 +1117,7 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::MouseButtonDown( const MouseEvent& i_rMouseEvent ) { Control::MouseButtonDown( i_rMouseEvent ); @@ -1137,7 +1137,7 @@ namespace svt m_pImpl->InvalidateItem( *aHitItem ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::MouseButtonUp( const MouseEvent& i_rMouseEvent ) { Control::MouseButtonUp( i_rMouseEvent ); @@ -1160,7 +1160,7 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::RequestHelp( const HelpEvent& i_rHelpEvent ) { m_pImpl->EnsureItemsCache(); @@ -1181,7 +1181,7 @@ namespace svt Help::ShowQuickHelp( this, rItem.GetCurrentRect(), sItemText ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::GetFocus() { Control::GetFocus(); @@ -1189,7 +1189,7 @@ namespace svt m_pImpl->FocusItem( m_pImpl->m_rPanelDeck.GetActivePanel() ); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::LoseFocus() { Control::LoseFocus(); @@ -1202,7 +1202,7 @@ namespace svt m_pImpl->m_aFocusedItem.reset(); } - //------------------------------------------------------------------------------------------------------------------ + class KeyInputHandler { public: @@ -1230,7 +1230,7 @@ namespace svt bool m_bHandled; }; - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::KeyInput( const KeyEvent& i_rKeyEvent ) { KeyInputHandler aKeyInputHandler( *this, i_rKeyEvent ); @@ -1291,7 +1291,7 @@ namespace svt aKeyInputHandler.setHandled(); } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::DataChanged( const DataChangedEvent& i_rDataChanedEvent ) { Control::DataChanged( i_rDataChanedEvent ); @@ -1304,25 +1304,25 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + bool PanelTabBar::IsVertical() const { return m_pImpl->IsVertical(); } - //------------------------------------------------------------------------------------------------------------------ + PushButton& PanelTabBar::GetScrollButton( const bool i_bForward ) { return i_bForward ? m_pImpl->m_aScrollForward : m_pImpl->m_aScrollBack; } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< size_t > PanelTabBar::GetFocusedPanelItem() const { return m_pImpl->m_aFocusedItem; } - //------------------------------------------------------------------------------------------------------------------ + void PanelTabBar::FocusPanelItem( const size_t i_nItemPos ) { ENSURE_OR_RETURN_VOID( i_nItemPos < m_pImpl->m_rPanelDeck.GetPanelCount(), "PanelTabBar::FocusPanelItem: illegal item pos!" ); @@ -1337,13 +1337,13 @@ namespace svt m_pImpl->m_aFocusedItem.reset( i_nItemPos ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle PanelTabBar::GetItemScreenRect( const size_t i_nItemPos ) const { return m_pImpl->GetItemScreenRect( i_nItemPos ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XWindowPeer > PanelTabBar::GetComponentInterface( sal_Bool i_bCreate ) { Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( sal_False ) ); diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx index 31c307476f46..d265d0ecf63a 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.cxx +++ b/svtools/source/toolpanel/paneltabbarpeer.cxx @@ -48,19 +48,19 @@ namespace svt //================================================================================================================== //= PanelTabBarPeer //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + PanelTabBarPeer::PanelTabBarPeer( PanelTabBar& i_rTabBar ) :VCLXWindow() ,m_pTabBar( &i_rTabBar ) { } - //------------------------------------------------------------------------------------------------------------------ + PanelTabBarPeer::~PanelTabBarPeer() { } - //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessibleContext > PanelTabBarPeer::CreateAccessibleContext() { SolarMutexGuard aSolarGuard; @@ -75,7 +75,7 @@ namespace svt return m_aAccessibleFactory.getFactory().createAccessibleToolPanelTabBar( xAccessibleParent, m_pTabBar->GetPanelDeck(), *m_pTabBar ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL PanelTabBarPeer::dispose() throw(RuntimeException) { { diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx index 92a85224d0a9..a1de1d738e33 100644 --- a/svtools/source/toolpanel/refbase.cxx +++ b/svtools/source/toolpanel/refbase.cxx @@ -28,13 +28,13 @@ namespace svt //==================================================================== //= RefBase //==================================================================== - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL RefBase::acquire() { return osl_atomic_increment( &m_refCount ); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL RefBase::release() { oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount ); diff --git a/svtools/source/toolpanel/tabbargeometry.cxx b/svtools/source/toolpanel/tabbargeometry.cxx index 43036233ed90..15934dd36c64 100644 --- a/svtools/source/toolpanel/tabbargeometry.cxx +++ b/svtools/source/toolpanel/tabbargeometry.cxx @@ -55,7 +55,7 @@ namespace svt //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + static void lcl_transform( Rectangle& io_rRect, const ::basegfx::B2DHomMatrix& i_rTransformation ) { ::basegfx::B2DRange aRect( io_rRect.Left(), io_rRect.Top(), io_rRect.Right(), io_rRect.Bottom() ); @@ -66,7 +66,7 @@ namespace svt io_rRect.Bottom() = long( aRect.getMaxY() ); } - //-------------------------------------------------------------------------------------------------------------- + /** transforms the given, possible rotated playground, */ void lcl_rotate( const Rectangle& i_rReference, Rectangle& io_rArea, const bool i_bRight ) @@ -92,7 +92,7 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + void lcl_mirrorHorizontally( const Rectangle& i_rReferenceArea, Rectangle& io_rArea ) { io_rArea.Left() = i_rReferenceArea.Left() + i_rReferenceArea.Right() - io_rArea.Left(); @@ -100,7 +100,7 @@ namespace svt ::std::swap( io_rArea.Left(), io_rArea.Right() ); } - //------------------------------------------------------------------------------------------------------------------ + void lcl_mirrorVertically( const Rectangle& i_rReferenceArea, Rectangle& io_rArea ) { io_rArea.Top() = i_rReferenceArea.Top() + i_rReferenceArea.Bottom() - io_rArea.Top(); @@ -111,19 +111,19 @@ namespace svt //================================================================================================================== //= NormalizedArea //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + NormalizedArea::NormalizedArea() :m_aReference() { } - //------------------------------------------------------------------------------------------------------------------ + NormalizedArea::NormalizedArea( const Rectangle& i_rReference, const bool i_bIsVertical ) :m_aReference( i_bIsVertical ? Rectangle( i_rReference.TopLeft(), Size( i_rReference.GetHeight(), i_rReference.GetWidth() ) ) : i_rReference ) { } - //------------------------------------------------------------------------------------------------------------------ + Rectangle NormalizedArea::getTransformed( const Rectangle& i_rArea, const TabAlignment i_eTargetAlignment ) const { Rectangle aResult( i_rArea ); @@ -149,7 +149,7 @@ namespace svt return aResult; } - //------------------------------------------------------------------------------------------------------------------ + Rectangle NormalizedArea::getNormalized( const Rectangle& i_rArea, const TabAlignment i_eTargetAlignment ) const { Rectangle aResult( i_rArea ); @@ -178,7 +178,7 @@ namespace svt //================================================================================================================== //= TabBarGeometry //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + TabBarGeometry::TabBarGeometry( const TabItemContent i_eItemContent ) :m_eTabItemContent( i_eItemContent ) ,m_aItemsInset() @@ -192,12 +192,12 @@ namespace svt m_aItemsInset.Bottom() = ITEMS_INSET_BOTTOM; } - //------------------------------------------------------------------------------------------------------------------ + TabBarGeometry::~TabBarGeometry() { } - //------------------------------------------------------------------------------------------------------------------ + bool TabBarGeometry::impl_fitItems( ItemDescriptors& io_rItems ) const { if ( io_rItems.empty() ) @@ -253,7 +253,7 @@ namespace svt && aFitInto.Right() >= aLastItemBottomRight.X(); } - //------------------------------------------------------------------------------------------------------------------ + Size TabBarGeometry::getOptimalSize(ItemDescriptors& io_rItems) const { if ( io_rItems.empty() ) @@ -270,7 +270,7 @@ namespace svt ); } - //------------------------------------------------------------------------------------------------------------------ + void TabBarGeometry::relayout( const Size& i_rActualOutputSize, ItemDescriptors& io_rItems ) { // assume all items fit @@ -307,7 +307,7 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + Point TabBarGeometry::getFirstItemPosition() const { return Point( m_aItemsInset.Left(), m_aItemsInset.Top() ); diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx index 2d7cafa89a44..818aa48e2a3e 100644 --- a/svtools/source/toolpanel/tablayouter.cxx +++ b/svtools/source/toolpanel/tablayouter.cxx @@ -79,22 +79,22 @@ namespace svt //==================================================================== //= TabDeckLayouter //==================================================================== - //-------------------------------------------------------------------- + TabDeckLayouter::TabDeckLayouter( Window& i_rParent, IToolPanelDeck& i_rPanels, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :m_pData( new TabDeckLayouter_Data( i_rParent, i_rPanels, i_eAlignment, i_eItemContent ) ) { } - //-------------------------------------------------------------------- + TabDeckLayouter::~TabDeckLayouter() { } - //-------------------------------------------------------------------- + IMPLEMENT_IREFERENCE( TabDeckLayouter ) - //-------------------------------------------------------------------- + TabItemContent TabDeckLayouter::GetTabItemContent() const { if ( lcl_checkDisposed( *m_pData ) ) @@ -102,7 +102,7 @@ namespace svt return m_pData->pTabBar->GetTabItemContent(); } - //-------------------------------------------------------------------- + void TabDeckLayouter::SetTabItemContent( const TabItemContent& i_eItemContent ) { if ( lcl_checkDisposed( *m_pData ) ) @@ -110,7 +110,7 @@ namespace svt m_pData->pTabBar->SetTabItemContent( i_eItemContent ); } - //-------------------------------------------------------------------- + TabAlignment TabDeckLayouter::GetTabAlignment() const { if ( lcl_checkDisposed( *m_pData ) ) @@ -118,7 +118,7 @@ namespace svt return m_pData->eAlignment; } - //-------------------------------------------------------------------- + Rectangle TabDeckLayouter::Layout( const Rectangle& i_rDeckPlayground ) { if ( lcl_checkDisposed( *m_pData ) ) @@ -169,13 +169,13 @@ namespace svt return aPanelRect; } - //-------------------------------------------------------------------- + void TabDeckLayouter::Destroy() { m_pData->pTabBar.reset(); } - //-------------------------------------------------------------------- + void TabDeckLayouter::SetFocusToPanelSelector() { if ( lcl_checkDisposed( *m_pData ) ) @@ -183,7 +183,7 @@ namespace svt m_pData->pTabBar->GrabFocus(); } - //-------------------------------------------------------------------- + size_t TabDeckLayouter::GetAccessibleChildCount() const { if ( lcl_checkDisposed( *m_pData ) ) @@ -192,7 +192,7 @@ namespace svt return 1; } - //-------------------------------------------------------------------- + Reference< XAccessible > TabDeckLayouter::GetAccessibleChild( const size_t i_nChildIndex, const Reference< XAccessible >& i_rParentAccessible ) { (void)i_nChildIndex; diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx index 02024f24ad9a..c52997390002 100644 --- a/svtools/source/toolpanel/toolpanel.cxx +++ b/svtools/source/toolpanel/toolpanel.cxx @@ -28,17 +28,17 @@ namespace svt //==================================================================== //= ToolPanelBase //==================================================================== - //-------------------------------------------------------------------- + ToolPanelBase::ToolPanelBase() { } - //-------------------------------------------------------------------- + ToolPanelBase::~ToolPanelBase() { } - //-------------------------------------------------------------------- + IMPLEMENT_IREFERENCE( ToolPanelBase ) //........................................................................ diff --git a/svtools/source/toolpanel/toolpanelcollection.cxx b/svtools/source/toolpanel/toolpanelcollection.cxx index 616a04e18af0..c96d51838788 100644 --- a/svtools/source/toolpanel/toolpanelcollection.cxx +++ b/svtools/source/toolpanel/toolpanelcollection.cxx @@ -43,31 +43,31 @@ namespace svt //==================================================================== //= ToolPanelCollection //==================================================================== - //-------------------------------------------------------------------- + ToolPanelCollection::ToolPanelCollection() :m_pData( new ToolPanelCollection_Data ) { } - //-------------------------------------------------------------------- + ToolPanelCollection::~ToolPanelCollection() { m_pData->aListeners.Dying(); } - //-------------------------------------------------------------------- + size_t ToolPanelCollection::GetPanelCount() const { return m_pData->aPanels.size(); } - //-------------------------------------------------------------------- + ::boost::optional< size_t > ToolPanelCollection::GetActivePanel() const { return m_pData->aActivePanel; } - //-------------------------------------------------------------------- + void ToolPanelCollection::ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) { if ( !!i_rPanel ) @@ -87,7 +87,7 @@ namespace svt m_pData->aListeners.ActivePanelChanged( aOldPanel, m_pData->aActivePanel ); } - //-------------------------------------------------------------------- + PToolPanel ToolPanelCollection::GetPanel( const size_t i_nPos ) const { OSL_ENSURE( i_nPos < m_pData->aPanels.size(), "ToolPanelCollection::GetPanel: illegal position!" ); @@ -96,7 +96,7 @@ namespace svt return m_pData->aPanels[ i_nPos ]; } - //-------------------------------------------------------------------- + size_t ToolPanelCollection::InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) { OSL_ENSURE( i_pPanel.get(), "ToolPanelCollection::InsertPanel: illegal panel!" ); @@ -120,7 +120,7 @@ namespace svt return position; } - //-------------------------------------------------------------------- + PToolPanel ToolPanelCollection::RemovePanel( const size_t i_nPosition ) { OSL_ENSURE( i_nPosition < m_pData->aPanels.size(), "ToolPanelCollection::RemovePanel: illegal position!" ); @@ -168,13 +168,13 @@ namespace svt return pRemovedPanel; } - //-------------------------------------------------------------------- + void ToolPanelCollection::AddListener( IToolPanelDeckListener& i_rListener ) { m_pData->aListeners.AddListener( i_rListener ); } - //-------------------------------------------------------------------- + void ToolPanelCollection::RemoveListener( IToolPanelDeckListener& i_rListener ) { m_pData->aListeners.RemoveListener( i_rListener ); diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index 8564c1f457f9..a991618d872e 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -139,7 +139,7 @@ namespace svt bool m_bInDtor; }; - //-------------------------------------------------------------------- + PToolPanel ToolPanelDeck_Impl::GetActiveOrDummyPanel_Impl() { ::boost::optional< size_t > aActivePanel( m_aPanels.GetActivePanel() ); @@ -148,7 +148,7 @@ namespace svt return m_aPanels.GetPanel( *aActivePanel ); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::SetLayouter( const PDeckLayouter& i_pNewLayouter ) { ENSURE_OR_RETURN_VOID( i_pNewLayouter.get(), "invalid layouter" ); @@ -163,43 +163,43 @@ namespace svt m_aListeners.LayouterChanged( m_pLayouter ); } - //-------------------------------------------------------------------- + size_t ToolPanelDeck_Impl::GetPanelCount() const { return m_aPanels.GetPanelCount(); } - //-------------------------------------------------------------------- + PToolPanel ToolPanelDeck_Impl::GetPanel( const size_t i_nPos ) const { return m_aPanels.GetPanel( i_nPos ); } - //-------------------------------------------------------------------- + ::boost::optional< size_t > ToolPanelDeck_Impl::GetActivePanel() const { return m_aPanels.GetActivePanel(); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) { m_aPanels.ActivatePanel( i_rPanel ); } - //-------------------------------------------------------------------- + size_t ToolPanelDeck_Impl::InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) { return m_aPanels.InsertPanel( i_pPanel, i_nPosition ); } - //-------------------------------------------------------------------- + PToolPanel ToolPanelDeck_Impl::RemovePanel( const size_t i_nPosition ) { return m_aPanels.RemovePanel( i_nPosition ); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::ImplDoLayout() { const Rectangle aDeckPlayground( Point(), m_rDeck.GetOutputSizePixel() ); @@ -218,19 +218,19 @@ namespace svt pActive->SetSizePixel( m_aPanelAnchor.GetOutputSizePixel() ); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::AddListener( IToolPanelDeckListener& i_rListener ) { m_aListeners.AddListener( i_rListener ); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::RemoveListener( IToolPanelDeckListener& i_rListener ) { m_aListeners.RemoveListener( i_rListener ); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::DoAction( const DeckAction i_eAction ) { const size_t nPanelCount( m_aPanels.GetPanelCount() ); @@ -276,7 +276,7 @@ namespace svt } } - //-------------------------------------------------------------------- + bool ToolPanelDeck_Impl::FocusActivePanel() { ::boost::optional< size_t > aActivePanel( m_aPanels.GetActivePanel() ); @@ -288,21 +288,21 @@ namespace svt return true; } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) { // multiplex to our own listeners m_aListeners.PanelInserted( i_pPanel, i_nPosition ); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::PanelRemoved( const size_t i_nPosition ) { // multiplex to our own listeners m_aListeners.PanelRemoved( i_nPosition ); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { // hide the old panel @@ -324,14 +324,14 @@ namespace svt m_aListeners.ActivePanelChanged( i_rOldActive, i_rNewActive ); } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::LayouterChanged( const PDeckLayouter& i_rNewLayouter ) { // not interested in (void)i_rNewLayouter; } - //-------------------------------------------------------------------- + void ToolPanelDeck_Impl::Dying() { // not interested in. Since the ToolPanelCollection is our member, this just means we ourself @@ -341,7 +341,7 @@ namespace svt //==================================================================== //= ToolPanelDeck //==================================================================== - //-------------------------------------------------------------------- + ToolPanelDeck::ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle ) :Control( &i_rParent, i_nStyle ) ,m_pImpl( new ToolPanelDeck_Impl( *this ) ) @@ -351,7 +351,7 @@ namespace svt SetLayouter( PDeckLayouter( new DrawerDeckLayouter( *this, *this ) ) ); } - //-------------------------------------------------------------------- + ToolPanelDeck::~ToolPanelDeck() { m_pImpl->NotifyDying(); @@ -365,86 +365,86 @@ namespace svt } } - //-------------------------------------------------------------------- + size_t ToolPanelDeck::GetPanelCount() const { return m_pImpl->GetPanelCount(); } - //-------------------------------------------------------------------- + PToolPanel ToolPanelDeck::GetPanel( const size_t i_nPos ) const { return m_pImpl->GetPanel( i_nPos ); } - //-------------------------------------------------------------------- + ::boost::optional< size_t > ToolPanelDeck::GetActivePanel() const { return m_pImpl->GetActivePanel(); } - //-------------------------------------------------------------------- + void ToolPanelDeck::ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) { m_pImpl->ActivatePanel( i_rPanel ); } - //-------------------------------------------------------------------- + size_t ToolPanelDeck::InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) { return m_pImpl->InsertPanel( i_pPanel, i_nPosition ); } - //-------------------------------------------------------------------- + PToolPanel ToolPanelDeck::RemovePanel( const size_t i_nPosition ) { return m_pImpl->RemovePanel( i_nPosition ); } - //-------------------------------------------------------------------- + PDeckLayouter ToolPanelDeck::GetLayouter() const { return m_pImpl->GetLayouter(); } - //-------------------------------------------------------------------- + void ToolPanelDeck::SetLayouter( const PDeckLayouter& i_pNewLayouter ) { return m_pImpl->SetLayouter( i_pNewLayouter ); } - //-------------------------------------------------------------------- + void ToolPanelDeck::AddListener( IToolPanelDeckListener& i_rListener ) { m_pImpl->AddListener( i_rListener ); } - //-------------------------------------------------------------------- + void ToolPanelDeck::RemoveListener( IToolPanelDeckListener& i_rListener ) { m_pImpl->RemoveListener( i_rListener ); } - //-------------------------------------------------------------------- + Window& ToolPanelDeck::GetPanelWindowAnchor() { return m_pImpl->GetPanelWindowAnchor(); } - //-------------------------------------------------------------------- + const Window& ToolPanelDeck::GetPanelWindowAnchor() const { return m_pImpl->GetPanelWindowAnchor(); } - //-------------------------------------------------------------------- + void ToolPanelDeck::Resize() { Control::Resize(); m_pImpl->LayoutAll(); } - //-------------------------------------------------------------------- + bool ToolPanelDeck::Notify( NotifyEvent& i_rNotifyEvent ) { bool bHandled = false; @@ -490,7 +490,7 @@ namespace svt return Control::Notify( i_rNotifyEvent ); } - //-------------------------------------------------------------------- + void ToolPanelDeck::GetFocus() { Control::GetFocus(); @@ -504,7 +504,7 @@ namespace svt } } - //-------------------------------------------------------------------- + Reference< XWindowPeer > ToolPanelDeck::GetComponentInterface( sal_Bool i_bCreate ) { Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( sal_False ) ); diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index f5a18d039272..5ac3b3d9265e 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx @@ -48,19 +48,19 @@ namespace svt //================================================================================================================== //= ToolPanelDeckPeer //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + ToolPanelDeckPeer::ToolPanelDeckPeer( ToolPanelDeck& i_rDeck ) :VCLXWindow() ,m_pDeck( &i_rDeck ) { } - //------------------------------------------------------------------------------------------------------------------ + ToolPanelDeckPeer::~ToolPanelDeckPeer() { } - //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessibleContext > ToolPanelDeckPeer::CreateAccessibleContext() { SolarMutexGuard aSolarGuard; @@ -73,7 +73,7 @@ namespace svt return m_aAccessibleFactory.getFactory().createAccessibleToolPanelDeck( xAccessibleParent, *m_pDeck ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL ToolPanelDeckPeer::dispose() throw(RuntimeException) { { diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index bd1fef83d577..06f1c7fd48f5 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -45,7 +45,7 @@ namespace svt //================================================================================================================== //= DrawerVisualization //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + DrawerVisualization::DrawerVisualization( ToolPanelDrawer& i_rParent ) :Window( &i_rParent ) ,m_rDrawer( i_rParent ) @@ -55,12 +55,12 @@ namespace svt SetAccessibleRole( AccessibleRole::LABEL ); } - //------------------------------------------------------------------------------------------------------------------ + DrawerVisualization::~DrawerVisualization() { } - //------------------------------------------------------------------------------------------------------------------ + void DrawerVisualization::Paint( const Rectangle& i_rBoundingBox ) { Window::Paint( i_rBoundingBox ); @@ -70,7 +70,7 @@ namespace svt //================================================================================================================== //= ToolPanelDrawer //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + ToolPanelDrawer::ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ) :Window( &i_rParent, WB_TABSTOP ) ,m_pPaintDevice( new VirtualDevice( *this ) ) @@ -92,19 +92,19 @@ namespace svt m_aVisualization.SetAccessibleDescription( i_rTitle ); } - //------------------------------------------------------------------------------------------------------------------ + ToolPanelDrawer::~ToolPanelDrawer() { } - //------------------------------------------------------------------------------------------------------------------ + long ToolPanelDrawer::GetPreferredHeightPixel() const { Rectangle aTitleBarBox( impl_calcTitleBarBox( impl_calcTextBoundingBox() ) ); return aTitleBarBox.GetHeight(); } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::Paint() { m_pPaintDevice->SetMapMode( GetMapMode() ); @@ -130,7 +130,7 @@ namespace svt ); } - //------------------------------------------------------------------------------------------------------------------ + Rectangle ToolPanelDrawer::impl_paintExpansionIndicator( const Rectangle& i_rTextBox ) { Rectangle aExpansionIndicatorArea; @@ -175,7 +175,7 @@ namespace svt return nBasicStyle | TEXT_DRAW_DISABLE; } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::impl_paintBackground( const Rectangle& i_rTitleBarBox ) { m_pPaintDevice->SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() ); @@ -191,7 +191,7 @@ namespace svt m_pPaintDevice->DrawLine( i_rTitleBarBox.TopRight(), i_rTitleBarBox.BottomRight() ); } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::impl_paintFocusIndicator( const Rectangle& i_rTextBox ) { if ( m_bFocused ) @@ -221,28 +221,28 @@ namespace svt HideFocus(); } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::GetFocus() { m_bFocused = true; Invalidate(); } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::LoseFocus() { m_bFocused = false; Invalidate(); } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::Resize() { Window::Resize(); m_aVisualization.SetPosSizePixel( Point(), GetOutputSizePixel() ); } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::MouseButtonDown( const MouseEvent& i_rMouseEvent ) { // consume this event, and do not forward to the base class - it would sent a NotifyEvent, which in turn, when @@ -250,7 +250,7 @@ namespace svt (void)i_rMouseEvent; } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::DataChanged( const DataChangedEvent& i_rEvent ) { Window::DataChanged( i_rEvent ); @@ -291,7 +291,7 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + Reference< XWindowPeer > ToolPanelDrawer::GetComponentInterface( sal_Bool i_bCreate ) { Reference< XWindowPeer > xWindowPeer( Window::GetComponentInterface( sal_False ) ); @@ -303,7 +303,7 @@ namespace svt return xWindowPeer; } - //------------------------------------------------------------------------------------------------------------------ + Rectangle ToolPanelDrawer::impl_calcTextBoundingBox() const { Font aFont( GetFont() ); @@ -328,7 +328,7 @@ namespace svt return aTextBox; } - //------------------------------------------------------------------------------------------------------------------ + Rectangle ToolPanelDrawer::impl_calcTitleBarBox( const Rectangle& i_rTextBox ) const { Rectangle aTitleBarBox( i_rTextBox ); @@ -343,7 +343,7 @@ namespace svt return aTitleBarBox; } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawer::SetExpanded( const bool i_bExpanded ) { if ( m_bExpanded != i_bExpanded ) diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx index 8c9c27150ef4..cb9be0b023aa 100644 --- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx @@ -71,7 +71,7 @@ namespace svt } }; - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawerContext::ProcessWindowEvent( const VclWindowEvent& i_rVclWindowEvent ) { VCLXAccessibleComponent::ProcessWindowEvent( i_rVclWindowEvent ); @@ -87,7 +87,7 @@ namespace svt } } - //------------------------------------------------------------------------------------------------------------------ + void ToolPanelDrawerContext::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( i_rStateSet ); @@ -109,18 +109,18 @@ namespace svt //================================================================================================================== //= ToolPanelDrawerPeer //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + ToolPanelDrawerPeer::ToolPanelDrawerPeer() :VCLXWindow() { } - //------------------------------------------------------------------------------------------------------------------ + ToolPanelDrawerPeer::~ToolPanelDrawerPeer() { } - //------------------------------------------------------------------------------------------------------------------ + Reference< XAccessibleContext > ToolPanelDrawerPeer::CreateAccessibleContext() { SolarMutexGuard aSolarGuard; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 85706cf350cc..65f20900e9ea 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -78,7 +78,7 @@ namespace { virtual void executedDialog(sal_Int16 _nExecutionResult); }; - //------------------------------------------------------------------------- + OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) { @@ -86,20 +86,20 @@ namespace { &m_aAliases, getCppuType(&m_aAliases)); } - //------------------------------------------------------------------------- + Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId( ) throw(RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } - //------------------------------------------------------------------------- + OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException) { return OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" ); } - //------------------------------------------------------------------------- + ::comphelper::StringSequence SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); @@ -107,20 +107,20 @@ namespace { return aSupported; } - //------------------------------------------------------------------------- + Reference<XPropertySetInfo> SAL_CALL OAddressBookSourceDialogUno::getPropertySetInfo() throw(RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& OAddressBookSourceDialogUno::getInfoHelper() { return *getArrayHelper(); } - //------------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper* OAddressBookSourceDialogUno::createArrayHelper( ) const { Sequence< Property > aProps; @@ -128,7 +128,7 @@ namespace { return new ::cppu::OPropertyArrayHelper(aProps); } - //------------------------------------------------------------------------------ + void OAddressBookSourceDialogUno::executedDialog(sal_Int16 _nExecutionResult) { OAddressBookSourceDialogUnoBase::executedDialog(_nExecutionResult); @@ -137,7 +137,7 @@ namespace { if ( m_pDialog ) static_cast< AddressBookSourceDialog* >( m_pDialog )->getFieldMapping( m_aAliases ); } - //------------------------------------------------------------------------------ + void SAL_CALL OAddressBookSourceDialogUno::initialize(const Sequence< Any >& rArguments) throw(Exception, RuntimeException) { if( rArguments.getLength() == 5 ) @@ -172,7 +172,7 @@ namespace { } OGenericUnoDialog::initialize(rArguments); } - //------------------------------------------------------------------------------ + void OAddressBookSourceDialogUno::implInitialize(const com::sun::star::uno::Any& _rValue) { PropertyValue aVal; @@ -212,7 +212,7 @@ namespace { OAddressBookSourceDialogUnoBase::implInitialize( _rValue ); } - //------------------------------------------------------------------------------ + Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent) { if ( m_xDataSource.is() && !m_sTable.isEmpty() ) diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 2e821bf42937..3f225cd7a591 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -45,7 +45,7 @@ namespace svt { //......................................................................... -//------------------------------------------------------------------------- + OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext) :OPropertyContainer(GetBroadcastHelper()) ,m_pDialog(NULL) @@ -62,7 +62,7 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo &m_xParent, getCppuType(&m_xParent)); } -//------------------------------------------------------------------------- + OGenericUnoDialog::~OGenericUnoDialog() { if ( m_pDialog ) @@ -74,7 +74,7 @@ OGenericUnoDialog::~OGenericUnoDialog() } } -//------------------------------------------------------------------------- + Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) throw (RuntimeException) { Any aReturn = OGenericUnoDialogBase::queryInterface(_rType); @@ -89,7 +89,7 @@ Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) throw (Runtim return aReturn; } -//------------------------------------------------------------------------- + Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes( ) throw(RuntimeException) { return ::comphelper::concatSequences( @@ -103,7 +103,7 @@ sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName return cppu::supportsService(this, ServiceName); } -//------------------------------------------------------------------------- + void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception) { // TODO : need some handling if we're currently executing ... @@ -120,7 +120,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con } } -//------------------------------------------------------------------------- + sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw(IllegalArgumentException) { switch (nHandle) @@ -141,7 +141,7 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& return OPropertyContainer::convertFastPropertyValue(rConvertedValue, rOldValue, nHandle, rValue); } -//------------------------------------------------------------------------- + void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(RuntimeException) { UnoDialogEntryGuard aGuard( *this ); @@ -162,7 +162,7 @@ void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(Runti } } -//------------------------------------------------------------------------- + bool OGenericUnoDialog::impl_ensureDialog_lck() { if ( m_pDialog ) @@ -197,7 +197,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck() return true; } -//------------------------------------------------------------------------- + sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException) { // both creation and execution of the dialog must be guarded with the SolarMutex, so be generous here @@ -248,7 +248,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException) } #ifdef AWT_DIALOG -//------------------------------------------------------------------------- + void SAL_CALL OGenericUnoDialog::endExecute( ) throw(RuntimeException) { UnoDialogEntryGuard aGuard( *this ); @@ -275,7 +275,7 @@ void SAL_CALL OGenericUnoDialog::endExecute( ) throw(RuntimeException) } #endif -//------------------------------------------------------------------------- + void OGenericUnoDialog::implInitialize(const Any& _rValue) { try @@ -297,7 +297,7 @@ void OGenericUnoDialog::implInitialize(const Any& _rValue) } } -//------------------------------------------------------------------------- + void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -311,14 +311,14 @@ void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments ) m_bInitialized = true; } -//------------------------------------------------------------------------- + void OGenericUnoDialog::destroyDialog() { delete m_pDialog; m_pDialog = NULL; } -//------------------------------------------------------------------------- + IMPL_LINK( OGenericUnoDialog, OnDialogDying, VclWindowEvent*, _pEvent ) { OSL_ENSURE( _pEvent->GetWindow() == m_pDialog, "OGenericUnoDialog::OnDialogDying: where does this come from?" ); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 772577aa4f25..3b8d1ce77b81 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -120,7 +120,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclSimpleEvent*, pEve return 1; } -//-------------------------------------------------------------------- + IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, Window*, pWindow ) { diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 261bd72855bf..2074eb22c0fc 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -75,7 +75,7 @@ using namespace ::svt::table; typedef ::com::sun::star::util::Color UnoColor; -// --------------------------------------------------------------------------------------------------------------------- + SVTXGridControl::SVTXGridControl() :m_pTableModel( new UnoControlTableModel() ) ,m_bTableModelInitCompleted( false ) @@ -83,33 +83,33 @@ SVTXGridControl::SVTXGridControl() { } -// --------------------------------------------------------------------------------------------------------------------- + SVTXGridControl::~SVTXGridControl() { } -// --------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::SetWindow( Window* pWindow ) { SVTXGridControl_Base::SetWindow( pWindow ); impl_checkTableModelInit(); } -// --------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::impl_checkColumnIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_columnIndex ) const { if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= i_table.GetColumnCount() ) ) throw IndexOutOfBoundsException( OUString(), *const_cast< SVTXGridControl* >( this ) ); } -// --------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::impl_checkRowIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_rowIndex ) const { if ( ( i_rowIndex < 0 ) || ( i_rowIndex >= i_table.GetRowCount() ) ) throw IndexOutOfBoundsException( OUString(), *const_cast< SVTXGridControl* >( this ) ); } -// --------------------------------------------------------------------------------------------------------------------- + sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -121,7 +121,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) return ( tableCell.nRow >= 0 ) ? tableCell.nRow : -1; } -// --------------------------------------------------------------------------------------------------------------------- + sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -133,7 +133,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 return ( tableCell.nColumn >= 0 ) ? tableCell.nColumn : -1; } -// --------------------------------------------------------------------------------------------------------------------- + sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn( ) throw (RuntimeException return ( nColumn >= 0 ) ? nColumn : -1; } -// --------------------------------------------------------------------------------------------------------------------- + sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -157,7 +157,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow( ) throw (RuntimeException) return ( nRow >= 0 ) ? nRow : -1; } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException) { SolarMutexGuard aGuard; @@ -171,19 +171,19 @@ void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 pTable->GoTo( i_columnIndex, i_rowIndex ); } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::addSelectionListener(const Reference< XGridSelectionListener > & listener) throw (RuntimeException) { m_aSelectionListeners.addInterface(listener); } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::removeSelectionListener(const Reference< XGridSelectionListener > & listener) throw (RuntimeException) { m_aSelectionListeners.removeInterface(listener); } -// --------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -601,22 +601,22 @@ Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeEx return aPropertyValue; } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; m_pTableModel->notifyRowsInserted( i_event ); } -//---------------------------------------------------------------------------------------------------------------------- -void SAL_CALL//---------------------------------------------------------------------------------------------------------------------- + +void SAL_CALL SVTXGridControl::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; m_pTableModel->notifyRowsRemoved( i_event ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -630,7 +630,7 @@ void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw pTable->getTableControlInterface().invalidate( TableAreaColumnHeaders ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -643,7 +643,7 @@ void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& i_event ) pTable->getTableControlInterface().invalidate( TableAreaRowHeaders ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -655,7 +655,7 @@ void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event ) m_pTableModel->insertColumn( nIndex, xGridColumn ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -665,7 +665,7 @@ void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) t m_pTableModel->removeColumn( nIndex ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException) { OSL_ENSURE( false, "SVTXGridControl::elementReplaced: not implemented!" ); @@ -675,13 +675,13 @@ void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& i_event ) } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::disposing( const EventObject& Source ) throw(RuntimeException) { VCLXWindow::disposing( Source ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException ) { SolarMutexGuard aGuard; @@ -694,7 +694,7 @@ void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (Runtim pTable->SelectRow( i_rowIndex, true ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::selectAllRows() throw (RuntimeException) { SolarMutexGuard aGuard; @@ -705,7 +705,7 @@ void SAL_CALL SVTXGridControl::selectAllRows() throw (RuntimeException) pTable->SelectAllRows( true ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException ) { SolarMutexGuard aGuard; @@ -718,7 +718,7 @@ void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (Runt pTable->SelectRow( i_rowIndex, false ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL SVTXGridControl::deselectAllRows() throw (RuntimeException) { SolarMutexGuard aGuard; @@ -729,7 +729,7 @@ void SAL_CALL SVTXGridControl::deselectAllRows() throw (RuntimeException) pTable->SelectAllRows( false ); } -//---------------------------------------------------------------------------------------------------------------------- + Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (RuntimeException) { SolarMutexGuard aGuard; @@ -744,7 +744,7 @@ Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (Runti return selectedRows; } -//---------------------------------------------------------------------------------------------------------------------- + ::sal_Bool SAL_CALL SVTXGridControl::hasSelectedRows() throw (RuntimeException) { SolarMutexGuard aGuard; @@ -755,7 +755,7 @@ Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (Runti return pTable->GetSelectedRowCount() > 0; } -//---------------------------------------------------------------------------------------------------------------------- + ::sal_Bool SAL_CALL SVTXGridControl::isRowSelected( ::sal_Int32 index ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -766,7 +766,7 @@ Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (Runti return pTable->IsRowSelected( index ); } -//---------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::dispose() throw(RuntimeException) { EventObject aObj; @@ -775,7 +775,7 @@ void SVTXGridControl::dispose() throw(RuntimeException) VCLXWindow::dispose(); } -//---------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { SolarMutexGuard aGuard; @@ -852,7 +852,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent VCLXWindow::ProcessWindowEvent( rVclWindowEvent ); } -//---------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -867,7 +867,7 @@ void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno: } } -//---------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::ImplCallItemListeners() { TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() ); @@ -886,7 +886,7 @@ void SVTXGridControl::ImplCallItemListeners() } } -//---------------------------------------------------------------------------------------------------------------------- + void SVTXGridControl::impl_updateColumnsFromModel_nothrow() { Reference< XGridColumnModel > const xColumnModel( m_pTableModel->getColumnModel() ); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 7b8f9af6c1c8..9b33040067ea 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -707,19 +707,19 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ } // -//------------------------------------------------------------------------- + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL ToolboxController::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -//------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& ToolboxController::getInfoHelper() { return *const_cast<ToolboxController*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper* ToolboxController::createArrayHelper( ) const { com::sun::star::uno::Sequence< Property > aProps; @@ -769,7 +769,7 @@ throw( com::sun::star::uno::Exception) } } -//-------------------------------------------------------------------- + IMPL_STATIC_LINK_NOINSTANCE( ToolboxController, ExecuteHdl_Impl, DispatchInfo*, pDispatchInfo ) { diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 12f2f206a6b3..4557c2443674 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -67,7 +67,7 @@ public: }; -// -------------------------------------------------------------------- + class ImplContextGraphicItem : public SvLBoxContextBmp { @@ -79,7 +79,7 @@ public: OUString msCollapsedGraphicURL; }; -// -------------------------------------------------------------------- + class UnoTreeListBoxImpl : public SvTreeListBox { @@ -102,7 +102,7 @@ private: rtl::Reference< TreeControlPeer > mxPeer; }; -// -------------------------------------------------------------------- + class UnoTreeListItem : public SvLBoxString { @@ -125,7 +125,7 @@ private: Image maImage; }; -// -------------------------------------------------------------------- + class UnoTreeListEntry : public SvTreeListEntry { @@ -148,7 +148,7 @@ TreeControlPeer::TreeControlPeer() { } -// -------------------------------------------------------------------- + TreeControlPeer::~TreeControlPeer() { @@ -157,7 +157,7 @@ TreeControlPeer::~TreeControlPeer() delete mpTreeNodeMap; } -// -------------------------------------------------------------------- + void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) { @@ -172,7 +172,7 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) } } -// -------------------------------------------------------------------- + void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) { @@ -186,7 +186,7 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) } } -// -------------------------------------------------------------------- + UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ ) throw( IllegalArgumentException ) { @@ -203,7 +203,7 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode return 0; } -// -------------------------------------------------------------------- + Window* TreeControlPeer::createVclControl( Window* pParent, sal_Int64 nWinStyle ) { @@ -211,7 +211,7 @@ Window* TreeControlPeer::createVclControl( Window* pParent, sal_Int64 nWinStyle return mpTreeImpl; } -// -------------------------------------------------------------------- + /** called from the UnoTreeListBoxImpl when it gets deleted */ void TreeControlPeer::disposeControl() @@ -221,14 +221,14 @@ void TreeControlPeer::disposeControl() mpTreeImpl = 0; } -// -------------------------------------------------------------------- + void TreeControlPeer::SetWindow( Window* pWindow ) { VCLXWindow::SetWindow( pWindow ); } -// -------------------------------------------------------------------- + UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos /* = LIST_APPEND */ ) { @@ -267,7 +267,7 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN return pEntry; } -// -------------------------------------------------------------------- + bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) { @@ -335,7 +335,7 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) return bChanged; } -// -------------------------------------------------------------------- + void TreeControlPeer::onSelectionChanged() { @@ -344,7 +344,7 @@ void TreeControlPeer::onSelectionChanged() maSelectionListeners.selectionChanged( aEvent ); } -// -------------------------------------------------------------------- + void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode ) { @@ -359,7 +359,7 @@ void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode ) } } -// -------------------------------------------------------------------- + bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bExpanding ) { @@ -383,7 +383,7 @@ bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bEx return true; } -// -------------------------------------------------------------------- + void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExpanding ) { @@ -406,7 +406,7 @@ void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExp } } -// -------------------------------------------------------------------- + void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTreeDataModel >& xDataModel ) { @@ -431,7 +431,7 @@ void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTre } } -// -------------------------------------------------------------------- + void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParentEntry ) { @@ -444,7 +444,7 @@ void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTree } } -// -------------------------------------------------------------------- + UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (RuntimeException ) { @@ -453,7 +453,7 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim return *mpTreeImpl; } -// -------------------------------------------------------------------- + void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException ) { @@ -512,9 +512,9 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, } } -// ------------------------------------------------------------------- + // ::com::sun::star::view::XSelectionSupplier -// ------------------------------------------------------------------- + sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) { @@ -523,7 +523,7 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega return sal_True; } -// ------------------------------------------------------------------- + Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException) { @@ -559,23 +559,23 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException) return aRet; } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException) { maSelectionListeners.addInterface( xListener ); } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException) { maSelectionListeners.addInterface( xListener ); } -// ------------------------------------------------------------------- + // ::com::sun::star::view::XMultiSelectionSupplier -// ------------------------------------------------------------------- + sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) { @@ -583,14 +583,14 @@ sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw ( return sal_True; } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) { ChangeNodesSelection( rSelection, false, false ); } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException) { @@ -598,7 +598,7 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException) getTreeListBoxOrThrow().SelectAll( sal_False ); } -// ------------------------------------------------------------------- + sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException) { @@ -606,7 +606,7 @@ sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException) return getTreeListBoxOrThrow().GetSelectionCount(); } -// ------------------------------------------------------------------- + class TreeSelectionEnumeration : public ::cppu::WeakImplHelper1< XEnumeration > { @@ -619,7 +619,7 @@ public: std::list< Any >::iterator maIter; }; -// ------------------------------------------------------------------- + TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection ) { @@ -627,14 +627,14 @@ TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection maIter = maSelection.begin(); } -// ------------------------------------------------------------------- + ::sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements() throw (RuntimeException) { return maIter != maSelection.end(); } -// ------------------------------------------------------------------- + Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -644,7 +644,7 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti return (*maIter++); } -// ------------------------------------------------------------------- + Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException) { @@ -668,7 +668,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) ); } -// ------------------------------------------------------------------- + Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException) { @@ -692,9 +692,9 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) ); } -// -------------------------------------------------------------------- + // ::com::sun::star::awt::XTreeControl -// -------------------------------------------------------------------- + OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException) { @@ -702,7 +702,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com:: return msDefaultExpandedGraphicURL; } -// -------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) { @@ -732,7 +732,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe } } -// -------------------------------------------------------------------- + OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException) { @@ -740,7 +740,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com: return msDefaultCollapsedGraphicURL; } -// -------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) { @@ -770,7 +770,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sD } } -// -------------------------------------------------------------------- + sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { @@ -781,7 +781,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& return ( pEntry && rTree.IsExpanded( pEntry ) ) ? sal_True : sal_False; } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { @@ -789,7 +789,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode > return !isNodeExpanded( xNode ); } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { @@ -801,7 +801,7 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN rTree.MakeVisible( pEntry ); } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { @@ -812,7 +812,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& return ( pEntry && rTree.IsEntryVisible( pEntry ) ) ? sal_True : sal_False; } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { @@ -824,7 +824,7 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) rTree.Expand( pEntry ); } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { @@ -836,21 +836,21 @@ void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode rTree.Collapse( pEntry ); } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException) { maTreeExpansionListeners.addInterface( xListener ); } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException) { maTreeExpansionListeners.removeInterface( xListener ); } -// ------------------------------------------------------------------- + Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException) { @@ -868,7 +868,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x return xNode; } -// ------------------------------------------------------------------- + Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException) { @@ -886,7 +886,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_ return xNode; } -// ------------------------------------------------------------------- + awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException) { @@ -899,7 +899,7 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode return VCLUnoHelper::ConvertToAWTRect( aEntryRect ); } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException) { @@ -909,7 +909,7 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException) return rTree.IsEditingActive() ? sal_True : sal_False; } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException) { @@ -927,7 +927,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException) } } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException) { @@ -937,7 +937,7 @@ void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException) rTree.EndEditing(false); } -// ------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException) { @@ -1004,9 +1004,9 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const OUString& r return true; } -// -------------------------------------------------------------------- + // ::com::sun::star::awt::tree::TreeDataModelListener -// -------------------------------------------------------------------- + void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException) { @@ -1234,9 +1234,9 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere mxDataModel->addTreeDataModelListener( xListener ); } -// -------------------------------------------------------------------- + // ::com::sun::star::awt::XLayoutConstrains -// -------------------------------------------------------------------- + ::com::sun::star::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException) { @@ -1269,9 +1269,9 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere return aSz; } -// -------------------------------------------------------------------- + // ::com::sun::star::awt::XVclWindowPeer -// -------------------------------------------------------------------- + void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException) { @@ -1492,7 +1492,7 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, } -// -------------------------------------------------------------------- + UnoTreeListBoxImpl::~UnoTreeListBoxImpl() { @@ -1500,7 +1500,7 @@ UnoTreeListBoxImpl::~UnoTreeListBoxImpl() mxPeer->disposeControl(); } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl) { @@ -1509,7 +1509,7 @@ IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl) return 0; } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl) { @@ -1522,7 +1522,7 @@ IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl) return 0; } -// -------------------------------------------------------------------- + IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl) { @@ -1534,7 +1534,7 @@ IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl) return 0; } -// -------------------------------------------------------------------- + sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos ) { @@ -1544,7 +1544,7 @@ sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* return SvTreeListBox::Insert( pEntry, nPos ); } -// -------------------------------------------------------------------- + void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) { @@ -1553,14 +1553,14 @@ void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) mxPeer->onRequestChildNodes( pEntry->mxNode ); } -// -------------------------------------------------------------------- + sal_Bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { return mxPeer.is() ? mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ) : false; } -// -------------------------------------------------------------------- + sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { @@ -1576,20 +1576,20 @@ UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry ) { } -// -------------------------------------------------------------------- + UnoTreeListItem::UnoTreeListItem() : SvLBoxString() { } -// -------------------------------------------------------------------- + UnoTreeListItem::~UnoTreeListItem() { } -// -------------------------------------------------------------------- + void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry) @@ -1618,14 +1618,14 @@ void UnoTreeListItem::Paint( } } -// -------------------------------------------------------------------- + SvLBoxItem* UnoTreeListItem::Create() const { return new UnoTreeListItem; } -// -------------------------------------------------------------------- + void UnoTreeListItem::Clone( SvLBoxItem* pSource ) { @@ -1637,28 +1637,28 @@ void UnoTreeListItem::Clone( SvLBoxItem* pSource ) } } -// -------------------------------------------------------------------- + void UnoTreeListItem::SetImage( const Image& rImage ) { maImage = rImage; } -// -------------------------------------------------------------------- + OUString UnoTreeListItem::GetGraphicURL() const { return maGraphicURL; } -// -------------------------------------------------------------------- + void UnoTreeListItem::SetGraphicURL( const OUString& rGraphicURL ) { maGraphicURL = rGraphicURL; } -// -------------------------------------------------------------------- + void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { @@ -1680,7 +1680,7 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry } } -// -------------------------------------------------------------------- + UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer ) : SvTreeListEntry() @@ -1691,7 +1691,7 @@ UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeCon mpPeer->addEntry( this ); } -// -------------------------------------------------------------------- + UnoTreeListEntry::~UnoTreeListEntry() { diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx index bf0836254f08..0e596489dc53 100644 --- a/svtools/source/uno/unocontroltablemodel.cxx +++ b/svtools/source/uno/unocontroltablemodel.cxx @@ -132,7 +132,7 @@ namespace svt { namespace table return static_cast< const UnoControlTableModel* >( _pInstance )->checkInvariants(); } - //------------------------------------------------------------------------------------------------------------------ + const char* UnoControlTableModel::checkInvariants() const { Reference< XGridDataModel > const xDataModel( m_pImpl->m_aDataModel ); @@ -149,7 +149,7 @@ namespace svt { namespace table DBG_TESTSOLARMUTEX(); \ DBG_CHKTHIS( UnoControlTableModel, UnoControlTableModel_checkInvariants ) - //------------------------------------------------------------------------------------------------------------------ + DBG_NAME( UnoControlTableModel ) UnoControlTableModel::UnoControlTableModel() :m_pImpl( new UnoControlTableModel_Impl ) @@ -162,21 +162,21 @@ namespace svt { namespace table m_pImpl->pInputHandler.reset( new DefaultInputHandler ); } - //------------------------------------------------------------------------------------------------------------------ + UnoControlTableModel::~UnoControlTableModel() { DBG_DTOR( UnoControlTableModel, UnoControlTableModel_checkInvariants ); DELETEZ( m_pImpl ); } - //------------------------------------------------------------------------------------------------------------------ + TableSize UnoControlTableModel::getColumnCount() const { DBG_CHECK_ME(); return (TableSize)m_pImpl->aColumns.size(); } - //------------------------------------------------------------------------------------------------------------------ + TableSize UnoControlTableModel::getRowCount() const { DBG_CHECK_ME(); @@ -195,21 +195,21 @@ namespace svt { namespace table return nRowCount; } - //------------------------------------------------------------------------------------------------------------------ + bool UnoControlTableModel::hasColumnHeaders() const { DBG_CHECK_ME(); return m_pImpl->bHasColumnHeaders; } - //------------------------------------------------------------------------------------------------------------------ + bool UnoControlTableModel::hasRowHeaders() const { DBG_CHECK_ME(); return m_pImpl->bHasRowHeaders; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setRowHeaders(bool _bRowHeaders) { DBG_CHECK_ME(); @@ -220,7 +220,7 @@ namespace svt { namespace table impl_notifyTableMetricsChanged(); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setColumnHeaders(bool _bColumnHeaders) { DBG_CHECK_ME(); @@ -231,7 +231,7 @@ namespace svt { namespace table impl_notifyTableMetricsChanged(); } - //------------------------------------------------------------------------------------------------------------------ + bool UnoControlTableModel::isCellEditable( ColPos col, RowPos row ) const { DBG_CHECK_ME(); @@ -240,7 +240,7 @@ namespace svt { namespace table return false; } - //------------------------------------------------------------------------------------------------------------------ + PColumnModel UnoControlTableModel::getColumnModel( ColPos column ) { DBG_CHECK_ME(); @@ -249,14 +249,14 @@ namespace svt { namespace table return m_pImpl->aColumns[ column ]; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::appendColumn( Reference< XGridColumn > const & i_column ) { DBG_CHECK_ME(); insertColumn( m_pImpl->aColumns.size(), i_column ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::insertColumn( ColPos const i_position, Reference< XGridColumn > const & i_column ) { DBG_CHECK_ME(); @@ -277,7 +277,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::removeColumn( ColPos const i_position ) { DBG_CHECK_ME(); @@ -306,7 +306,7 @@ namespace svt { namespace table pColumnImpl->dispose(); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::removeAllColumns() { DBG_CHECK_ME(); @@ -341,7 +341,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::impl_notifyTableMetricsChanged() const { ModellListeners aListeners( m_pImpl->m_aListeners ); @@ -354,28 +354,28 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + PTableRenderer UnoControlTableModel::getRenderer() const { DBG_CHECK_ME(); return m_pImpl->pRenderer; } - //------------------------------------------------------------------------------------------------------------------ + PTableInputHandler UnoControlTableModel::getInputHandler() const { DBG_CHECK_ME(); return m_pImpl->pInputHandler; } - //------------------------------------------------------------------------------------------------------------------ + TableMetrics UnoControlTableModel::getRowHeight() const { DBG_CHECK_ME(); return m_pImpl->nRowHeight; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setRowHeight(TableMetrics _nRowHeight) { DBG_CHECK_ME(); @@ -386,7 +386,7 @@ namespace svt { namespace table impl_notifyTableMetricsChanged(); } - //------------------------------------------------------------------------------------------------------------------ + TableMetrics UnoControlTableModel::getColumnHeaderHeight() const { DBG_CHECK_ME(); @@ -394,14 +394,14 @@ namespace svt { namespace table return m_pImpl->nColumnHeaderHeight; } - //------------------------------------------------------------------------------------------------------------------ + TableMetrics UnoControlTableModel::getRowHeaderWidth() const { DBG_CHECK_ME(); DBG_ASSERT( hasRowHeaders(), "DefaultTableModel::getRowHeaderWidth: invalid call!" ); return m_pImpl->nRowHeaderWidth; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setColumnHeaderHeight(TableMetrics _nHeight) { DBG_CHECK_ME(); @@ -412,7 +412,7 @@ namespace svt { namespace table impl_notifyTableMetricsChanged(); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setRowHeaderWidth(TableMetrics _nWidth) { DBG_CHECK_ME(); @@ -423,21 +423,21 @@ namespace svt { namespace table impl_notifyTableMetricsChanged(); } - //------------------------------------------------------------------------------------------------------------------ + ScrollbarVisibility UnoControlTableModel::getVerticalScrollbarVisibility() const { DBG_CHECK_ME(); return m_pImpl->eVScrollMode; } - //------------------------------------------------------------------------------------------------------------------ + ScrollbarVisibility UnoControlTableModel::getHorizontalScrollbarVisibility() const { DBG_CHECK_ME(); return m_pImpl->eHScrollMode; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::addTableModelListener( const PTableModelListener& i_listener ) { DBG_CHECK_ME(); @@ -445,7 +445,7 @@ namespace svt { namespace table m_pImpl->m_aListeners.push_back( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::removeTableModelListener( const PTableModelListener& i_listener ) { DBG_CHECK_ME(); @@ -463,21 +463,21 @@ namespace svt { namespace table OSL_ENSURE( false, "UnoControlTableModel::removeTableModelListener: listener is not registered - sure you're doing the right thing here?" ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setVerticalScrollbarVisibility( ScrollbarVisibility const i_visibility ) const { DBG_CHECK_ME(); m_pImpl->eVScrollMode = i_visibility; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setHorizontalScrollbarVisibility( ScrollbarVisibility const i_visibility ) const { DBG_CHECK_ME(); m_pImpl->eHScrollMode = i_visibility; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setDataModel( Reference< XGridDataModel > const & i_gridDataModel ) { DBG_CHECK_ME(); @@ -486,40 +486,40 @@ namespace svt { namespace table // own listeners } - //------------------------------------------------------------------------------------------------------------------ + Reference< XGridDataModel > UnoControlTableModel::getDataModel() const { Reference< XGridDataModel > const xDataModel( m_pImpl->m_aDataModel ); return xDataModel; } - //------------------------------------------------------------------------------------------------------------------ + bool UnoControlTableModel::hasDataModel() const { return getDataModel().is(); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setColumnModel( Reference< XGridColumnModel > const & i_gridColumnModel ) { DBG_CHECK_ME(); m_pImpl->m_aColumnModel = i_gridColumnModel; } - //------------------------------------------------------------------------------------------------------------------ + Reference< XGridColumnModel > UnoControlTableModel::getColumnModel() const { Reference< XGridColumnModel > const xColumnModel( m_pImpl->m_aColumnModel ); return xColumnModel; } - //------------------------------------------------------------------------------------------------------------------ + bool UnoControlTableModel::hasColumnModel() const { return getColumnModel().is(); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::getCellContent( ColPos const i_col, RowPos const i_row, Any& o_cellContent ) { DBG_CHECK_ME(); @@ -559,7 +559,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::getCellToolTip( ColPos const i_col, RowPos const i_row, Any& o_cellToolTip ) { DBG_CHECK_ME(); @@ -576,7 +576,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + Any UnoControlTableModel::getRowHeading( RowPos const i_rowPos ) const { DBG_CHECK_ME(); @@ -597,7 +597,7 @@ namespace svt { namespace table return aRowHeading; } - //------------------------------------------------------------------------------------------------------------------ + namespace { void lcl_setColor( Any const & i_color, ::boost::optional< ::Color > & o_convertedColor ) @@ -619,140 +619,140 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getLineColor() const { DBG_CHECK_ME(); return m_pImpl->m_aGridLineColor; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setLineColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aGridLineColor ); } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getHeaderBackgroundColor() const { DBG_CHECK_ME(); return m_pImpl->m_aHeaderBackgroundColor; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setHeaderBackgroundColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aHeaderBackgroundColor ); } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getHeaderTextColor() const { DBG_CHECK_ME(); return m_pImpl->m_aHeaderTextColor; } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getActiveSelectionBackColor() const { DBG_CHECK_ME(); return m_pImpl->m_aActiveSelectionBackColor; } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getInactiveSelectionBackColor() const { DBG_CHECK_ME(); return m_pImpl->m_aInactiveSelectionBackColor; } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getActiveSelectionTextColor() const { DBG_CHECK_ME(); return m_pImpl->m_aActiveSelectionTextColor; } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getInactiveSelectionTextColor() const { DBG_CHECK_ME(); return m_pImpl->m_aInactiveSelectionTextColor; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setHeaderTextColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aHeaderTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setActiveSelectionBackColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aActiveSelectionBackColor ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setInactiveSelectionBackColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aInactiveSelectionBackColor ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setActiveSelectionTextColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aActiveSelectionTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setInactiveSelectionTextColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aInactiveSelectionTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getTextColor() const { DBG_CHECK_ME(); return m_pImpl->m_aTextColor; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setTextColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::Color > UnoControlTableModel::getTextLineColor() const { DBG_CHECK_ME(); return m_pImpl->m_aTextColor; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setTextLineColor( Any const & i_color ) { DBG_CHECK_ME(); lcl_setColor( i_color, m_pImpl->m_aTextLineColor ); } - //------------------------------------------------------------------------------------------------------------------ + ::boost::optional< ::std::vector< ::Color > > UnoControlTableModel::getRowBackgroundColors() const { DBG_CHECK_ME(); return m_pImpl->m_aRowColors; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setRowBackgroundColors( ::com::sun::star::uno::Any const & i_APIValue ) { DBG_CHECK_ME(); @@ -770,21 +770,21 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + VerticalAlignment UnoControlTableModel::getVerticalAlign() const { DBG_CHECK_ME(); return m_pImpl->m_eVerticalAlign; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setVerticalAlign( VerticalAlignment _xAlign ) { DBG_CHECK_ME(); m_pImpl->m_eVerticalAlign = _xAlign; } - //------------------------------------------------------------------------------------------------------------------ + ColPos UnoControlTableModel::getColumnPos( UnoGridColumnFacade const & i_column ) const { DBG_CHECK_ME(); @@ -800,7 +800,7 @@ namespace svt { namespace table return COL_INVALID; } - //------------------------------------------------------------------------------------------------------------------ + ITableDataSort* UnoControlTableModel::getSortAdapter() { DBG_CHECK_ME(); @@ -811,21 +811,21 @@ namespace svt { namespace table return NULL; } - //------------------------------------------------------------------------------------------------------------------ + bool UnoControlTableModel::isEnabled() const { DBG_CHECK_ME(); return m_pImpl->bEnabled; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::setEnabled( bool _bEnabled ) { DBG_CHECK_ME(); m_pImpl->bEnabled = _bEnabled; } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::sortByColumn( ColPos const i_column, ColumnSortDirection const i_sortDirection ) { DBG_CHECK_ME(); @@ -841,7 +841,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + ColumnSort UnoControlTableModel::getCurrentSortOrder() const { DBG_CHECK_ME(); @@ -861,7 +861,7 @@ namespace svt { namespace table return currentSort; } - //-------------------------------------------------------------------- + void UnoControlTableModel::notifyColumnChange( ColPos const i_columnPos, ColumnAttributeGroup const i_attributeGroup ) const { DBG_CHECK_ME(); @@ -878,7 +878,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::notifyRowsInserted( GridDataEvent const & i_event ) const { // check sanity of the event @@ -915,7 +915,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::notifyRowsRemoved( GridDataEvent const & i_event ) const { ModellListeners aListeners( m_pImpl->m_aListeners ); @@ -928,7 +928,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::notifyDataChanged( ::com::sun::star::awt::grid::GridDataEvent const & i_event ) const { ColPos const firstCol = i_event.FirstColumn == -1 ? 0 : i_event.FirstColumn; @@ -946,7 +946,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void UnoControlTableModel::notifyAllDataChanged() const { ModellListeners aListeners( m_pImpl->m_aListeners ); diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx index 3c63cbcb2c3d..626792c3431f 100644 --- a/svtools/source/uno/unogridcolumnfacade.cxx +++ b/svtools/source/uno/unogridcolumnfacade.cxx @@ -53,7 +53,7 @@ namespace svt { namespace table using ::com::sun::star::style::HorizontalAlignment_LEFT; using ::com::sun::star::style::HorizontalAlignment; - //------------------------------------------------------------------------------------------------------------------ + namespace { template< class ATTRIBUTE_TYPE > @@ -112,25 +112,25 @@ namespace svt { namespace table UnoGridColumnFacade* m_pColumnImplementation; }; - //------------------------------------------------------------------------------------------------------------------ + ColumnChangeMultiplexer::ColumnChangeMultiplexer( UnoGridColumnFacade& i_colImpl ) :m_pColumnImplementation( &i_colImpl ) { } - //------------------------------------------------------------------------------------------------------------------ + ColumnChangeMultiplexer::~ColumnChangeMultiplexer() { } - //------------------------------------------------------------------------------------------------------------------ + void ColumnChangeMultiplexer::dispose() { DBG_TESTSOLARMUTEX(); m_pColumnImplementation = NULL; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL ColumnChangeMultiplexer::columnChanged( const GridColumnEvent& i_event ) throw (RuntimeException) { if ( i_event.AttributeName == "DataColumnIndex" ) @@ -163,7 +163,7 @@ namespace svt { namespace table m_pColumnImplementation->columnChanged( nChangedAttributes ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL ColumnChangeMultiplexer::disposing( const EventObject& i_event ) throw (RuntimeException) { OSL_UNUSED( i_event ); @@ -172,7 +172,7 @@ namespace svt { namespace table //================================================================================================================== //= UnoGridColumnFacade //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + UnoGridColumnFacade::UnoGridColumnFacade( UnoControlTableModel const & i_owner, Reference< XGridColumn > const & i_gridColumn ) :m_pOwner( &i_owner ) ,m_nDataColumnIndex( -1 ) @@ -183,12 +183,12 @@ namespace svt { namespace table impl_updateDataColumnIndex_nothrow(); } - //------------------------------------------------------------------------------------------------------------------ + UnoGridColumnFacade::~UnoGridColumnFacade() { } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::dispose() { DBG_TESTSOLARMUTEX(); @@ -201,7 +201,7 @@ namespace svt { namespace table m_pOwner = NULL; } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::impl_updateDataColumnIndex_nothrow() { m_nDataColumnIndex = -1; @@ -216,7 +216,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::dataColumnIndexChanged() { DBG_TESTSOLARMUTEX(); @@ -225,7 +225,7 @@ namespace svt { namespace table m_pOwner->notifyAllDataChanged(); } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::columnChanged( ColumnAttributeGroup const i_attributeGroup ) { DBG_TESTSOLARMUTEX(); @@ -233,7 +233,7 @@ namespace svt { namespace table m_pOwner->notifyColumnChange( m_pOwner->getColumnPos( *this ), i_attributeGroup ); } - //------------------------------------------------------------------------------------------------------------------ + Any UnoGridColumnFacade::getID() const { Any aID; @@ -249,7 +249,7 @@ namespace svt { namespace table return aID; } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setID( const Any& i_ID ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); @@ -263,7 +263,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + OUString UnoGridColumnFacade::getName() const { OUString sName; @@ -279,7 +279,7 @@ namespace svt { namespace table return sName; } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setName( const OUString& _rName ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); @@ -293,7 +293,7 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + OUString UnoGridColumnFacade::getHelpText() const { OUString sHelpText; @@ -309,7 +309,7 @@ namespace svt { namespace table return sHelpText; } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setHelpText( const OUString& i_helpText ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); @@ -323,84 +323,84 @@ namespace svt { namespace table } } - //------------------------------------------------------------------------------------------------------------------ + bool UnoGridColumnFacade::isResizable() const { ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", false ); return lcl_get( m_xGridColumn, &XGridColumn::getResizeable ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setResizable( bool i_resizable ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); lcl_set( m_xGridColumn, &XGridColumn::setResizeable, sal_Bool( i_resizable ) ); } - //------------------------------------------------------------------------------------------------------------------ + sal_Int32 UnoGridColumnFacade::getFlexibility() const { ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", 1 ); return lcl_get( m_xGridColumn, &XGridColumn::getFlexibility ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setFlexibility( sal_Int32 const i_flexibility ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); lcl_set( m_xGridColumn, &XGridColumn::setFlexibility, i_flexibility ); } - //------------------------------------------------------------------------------------------------------------------ + TableMetrics UnoGridColumnFacade::getWidth() const { ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", 0 ); return lcl_get( m_xGridColumn, &XGridColumn::getColumnWidth ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setWidth( TableMetrics _nWidth ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); lcl_set( m_xGridColumn, &XGridColumn::setColumnWidth, _nWidth ); } - //------------------------------------------------------------------------------------------------------------------ + TableMetrics UnoGridColumnFacade::getMinWidth() const { ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", 0 ); return lcl_get( m_xGridColumn, &XGridColumn::getMinWidth ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setMinWidth( TableMetrics _nMinWidth ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); lcl_set( m_xGridColumn, &XGridColumn::setMinWidth, _nMinWidth ); } - //------------------------------------------------------------------------------------------------------------------ + TableMetrics UnoGridColumnFacade::getMaxWidth() const { ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", 0 ); return lcl_get( m_xGridColumn, &XGridColumn::getMaxWidth ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setMaxWidth( TableMetrics _nMaxWidth ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); lcl_set( m_xGridColumn, &XGridColumn::setMinWidth, _nMaxWidth ); } - //------------------------------------------------------------------------------------------------------------------ + ::com::sun::star::style::HorizontalAlignment UnoGridColumnFacade::getHorizontalAlign() { ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", HorizontalAlignment_LEFT ); return lcl_get( m_xGridColumn, &XGridColumn::getHorizontalAlign ); } - //------------------------------------------------------------------------------------------------------------------ + void UnoGridColumnFacade::setHorizontalAlign( com::sun::star::style::HorizontalAlignment _align ) { ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" ); diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index ae3270b6ccb0..597e43a71806 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -804,7 +804,7 @@ void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) // ---------------------------------------------------- // class SVTXFormattedField // ---------------------------------------------------- -// -------------------------------------------------------------------------------------- + SVTXFormattedField::SVTXFormattedField() :m_pCurrentSupplier(NULL) ,bIsStandardSupplier(sal_True) @@ -812,7 +812,7 @@ SVTXFormattedField::SVTXFormattedField() { } -// -------------------------------------------------------------------------------------- + SVTXFormattedField::~SVTXFormattedField() { if (m_pCurrentSupplier) @@ -822,7 +822,7 @@ SVTXFormattedField::~SVTXFormattedField() } } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::SetWindow( Window* _pWindow ) { VCLXSpinField::SetWindow(_pWindow); @@ -830,7 +830,7 @@ void SVTXFormattedField::SetWindow( Window* _pWindow ) GetFormattedField()->SetAutoColor(sal_True); } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -955,7 +955,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com: VCLXSpinField::setProperty( PropertyName, Value ); } -// -------------------------------------------------------------------------------------- + ::com::sun::star::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1023,7 +1023,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com: return aReturn; } -// -------------------------------------------------------------------------------------- + ::com::sun::star::uno::Any SVTXFormattedField::convertEffectiveValue(const ::com::sun::star::uno::Any& rValue) { ::com::sun::star::uno::Any aReturn; @@ -1083,7 +1083,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com: return aReturn; } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue) { FormattedField* pField = GetFormattedField(); @@ -1112,7 +1112,7 @@ void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue) } } -// -------------------------------------------------------------------------------------- + ::com::sun::star::uno::Any SVTXFormattedField::GetMinValue() { FormattedField* pField = GetFormattedField(); @@ -1124,7 +1124,7 @@ void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue) return aReturn; } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue) { FormattedField* pField = GetFormattedField(); @@ -1152,7 +1152,7 @@ void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue) } } -// -------------------------------------------------------------------------------------- + ::com::sun::star::uno::Any SVTXFormattedField::GetMaxValue() { FormattedField* pField = GetFormattedField(); @@ -1164,7 +1164,7 @@ void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue) return aReturn; } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValue) { FormattedField* pField = GetFormattedField(); @@ -1197,7 +1197,7 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu } } -// -------------------------------------------------------------------------------------- + ::com::sun::star::uno::Any SVTXFormattedField::GetDefaultValue() { FormattedField* pField = GetFormattedField(); @@ -1212,7 +1212,7 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu return aReturn; } -// -------------------------------------------------------------------------------------- + sal_Bool SVTXFormattedField::GetTreatAsNumber() { FormattedField* pField = GetFormattedField(); @@ -1222,7 +1222,7 @@ sal_Bool SVTXFormattedField::GetTreatAsNumber() return sal_True; } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet) { FormattedField* pField = GetFormattedField(); @@ -1230,7 +1230,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet) pField->TreatAsNumber(bSet); } -// -------------------------------------------------------------------------------------- + ::com::sun::star::uno::Any SVTXFormattedField::GetValue() { FormattedField* pField = GetFormattedField(); @@ -1252,7 +1252,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet) return aReturn; } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue) { FormattedField* pField = GetFormattedField(); @@ -1286,13 +1286,13 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue) // NotifyTextListeners(); } -// -------------------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > SVTXFormattedField::getFormatsSupplier(void) const { return ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > ((::com::sun::star::util::XNumberFormatsSupplier*)m_pCurrentSupplier); } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier) { FormattedField* pField = GetFormattedField(); @@ -1334,14 +1334,14 @@ void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Referen } } -// -------------------------------------------------------------------------------------- + sal_Int32 SVTXFormattedField::getFormatKey(void) const { FormattedField* pField = GetFormattedField(); return pField ? pField->GetFormatKey() : 0; } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::setFormatKey(sal_Int32 nKey) { FormattedField* pField = GetFormattedField(); @@ -1360,7 +1360,7 @@ void SVTXFormattedField::setFormatKey(sal_Int32 nKey) } } -// -------------------------------------------------------------------------------------- + void SVTXFormattedField::NotifyTextListeners() { if ( GetTextListeners().getLength() ) @@ -1402,12 +1402,12 @@ void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) using namespace svt; -// -------------------------------------------------------------------------------------- + SVTXRoadmap::SVTXRoadmap() : maItemListeners( *this ) { } -// -------------------------------------------------------------------------------------- + SVTXRoadmap::~SVTXRoadmap() { } @@ -1552,7 +1552,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE -// -------------------------------------------------------------------------------------- + void SVTXRoadmap::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -1607,7 +1607,7 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const ::com::sun::s } -// -------------------------------------------------------------------------------------- + ::com::sun::star::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index ee1961955cde..a92815518134 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -737,9 +737,9 @@ sal_Bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const return sal_True; } -// ------------------------------------------------------------------- + // factory helper methods -// ------------------------------------------------------------------- + Reference< XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems ) { diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index ae2d96b9b526..5f5faaf9033e 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -69,7 +69,7 @@ namespace { namespace WizardButton = ::com::sun::star::ui::dialogs::WizardButton; - //------------------------------------------------------------------------------------------------------------------ + namespace { sal_uInt32 lcl_convertWizardButtonToWZB( const sal_Int16 i_nWizardButton ) @@ -150,7 +150,7 @@ namespace { { } - //-------------------------------------------------------------------- + Wizard::~Wizard() { // we do this here cause the base class' call to destroyDialog won't reach us anymore : we're within an dtor, @@ -163,7 +163,7 @@ namespace { } } - //-------------------------------------------------------------------- + namespace { static void lcl_checkPaths( const Sequence< Sequence< sal_Int16 > >& i_rPaths, const Reference< XInterface >& i_rContext ) @@ -212,7 +212,7 @@ namespace { } } - //-------------------------------------------------------------------- + void SAL_CALL Wizard::initialize( const Sequence< Any >& i_Arguments ) throw (Exception, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -254,7 +254,7 @@ namespace { return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } - //------------------------------------------------------------------------ + static OUString lcl_getHelpURL( const OString& sHelpId ) { OUStringBuffer aBuffer; @@ -267,7 +267,7 @@ namespace { return aBuffer.makeStringAndClear(); } - //-------------------------------------------------------------------- + Dialog* Wizard::createDialog( Window* i_pParent ) { WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) ); @@ -276,7 +276,7 @@ namespace { return pDialog; } - //-------------------------------------------------------------------- + void Wizard::destroyDialog() { if ( m_pDialog ) @@ -285,13 +285,13 @@ namespace { Wizard_Base::destroyDialog(); } - //-------------------------------------------------------------------- + OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException) { return OUString("com.sun.star.comp.svtools.uno.Wizard"); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServices(1); @@ -299,19 +299,19 @@ namespace { return aServices; } - //-------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo() throw(RuntimeException) { return createPropertySetInfo( getInfoHelper() ); } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& SAL_CALL Wizard::getInfoHelper() { return *const_cast< Wizard* >( this )->getArrayHelper(); } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* Wizard::createArrayHelper( ) const { Sequence< Property > aProps; @@ -319,7 +319,7 @@ namespace { return new ::cppu::OPropertyArrayHelper( aProps ); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -331,7 +331,7 @@ namespace { return lcl_getHelpURL( m_pDialog->GetHelpId() ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Wizard::setHelpURL( const OUString& i_HelpURL ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -343,7 +343,7 @@ namespace { m_pDialog->SetHelpId( lcl_getHelpId( i_HelpURL ) ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XWindow > SAL_CALL Wizard::getDialogWindow() throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -353,7 +353,7 @@ namespace { return Reference< XWindow >( m_pDialog->GetComponentInterface(), UNO_QUERY ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Wizard::enableButton( ::sal_Int16 i_WizardButton, ::sal_Bool i_Enable ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -365,7 +365,7 @@ namespace { pWizardImpl->enableButtons( lcl_convertWizardButtonToWZB( i_WizardButton ), i_Enable ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -377,7 +377,7 @@ namespace { pWizardImpl->defaultButton( lcl_convertWizardButtonToWZB( i_WizardButton ) ); } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool SAL_CALL Wizard::travelNext( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -389,7 +389,7 @@ namespace { return pWizardImpl->travelNext(); } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool SAL_CALL Wizard::travelPrevious( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -401,7 +401,7 @@ namespace { return pWizardImpl->travelPrevious(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, ::sal_Bool i_Enable ) throw (NoSuchElementException, InvalidStateException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -419,7 +419,7 @@ namespace { pWizardImpl->enablePage( i_PageID, i_Enable ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Wizard::updateTravelUI( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -431,7 +431,7 @@ namespace { pWizardImpl->updateTravelUI(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL Wizard::advanceTo( ::sal_Int16 i_PageId ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -443,7 +443,7 @@ namespace { return pWizardImpl->advanceTo( i_PageId ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -455,7 +455,7 @@ namespace { return pWizardImpl->goBackTo( i_PageId ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -467,7 +467,7 @@ namespace { return pWizardImpl->getCurrentWizardPage(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Wizard::activatePath( ::sal_Int16 i_PathIndex, ::sal_Bool i_Final ) throw (NoSuchElementException, InvalidStateException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -482,14 +482,14 @@ namespace { pWizardImpl->activatePath( i_PathIndex, i_Final ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Wizard::setTitle( const OUString& i_Title ) throw (RuntimeException) { // simply disambiguate Wizard_Base::OGenericUnoDialog::setTitle( i_Title ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int16 SAL_CALL Wizard::execute( ) throw (RuntimeException) { return Wizard_Base::OGenericUnoDialog::execute(); diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx index 105c75bb035b..1a1cd17b5a69 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.cxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx @@ -53,7 +53,7 @@ namespace svt { namespace uno //================================================================================================================== //= WizardPageController //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + WizardPageController::WizardPageController( WizardShell& i_rParent, const Reference< XWizardController >& i_rController, const sal_Int16 i_nPageId ) :m_xController( i_rController ) @@ -81,7 +81,7 @@ namespace svt { namespace uno } } - //------------------------------------------------------------------------------------------------------------------ + WizardPageController::~WizardPageController() { try @@ -95,7 +95,7 @@ namespace svt { namespace uno } } - //------------------------------------------------------------------------------------------------------------------ + TabPage* WizardPageController::getTabPage() const { ENSURE_OR_RETURN( m_xWizardPage.is(), "WizardPageController::getTabPage: no external wizard page!", NULL ); @@ -122,7 +122,7 @@ namespace svt { namespace uno return NULL; } - //------------------------------------------------------------------------------------------------------------------ + void WizardPageController::initializePage() { if ( !m_xWizardPage.is() ) @@ -138,7 +138,7 @@ namespace svt { namespace uno } } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool WizardPageController::commitPage( WizardTypes::CommitPageReason i_eReason ) { if ( !m_xWizardPage.is() ) @@ -156,7 +156,7 @@ namespace svt { namespace uno return sal_True; } - //------------------------------------------------------------------------------------------------------------------ + bool WizardPageController::canAdvance() const { if ( !m_xWizardPage.is() ) diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 8054e4bf86fe..6223e77a7040 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -52,7 +52,7 @@ namespace svt { namespace uno //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + sal_Int16 lcl_determineFirstPageID( const Sequence< Sequence< sal_Int16 > >& i_rPaths ) { ENSURE_OR_THROW( ( i_rPaths.getLength() > 0 ) && ( i_rPaths[0].getLength() > 0 ), "illegal paths" ); @@ -63,7 +63,7 @@ namespace svt { namespace uno //================================================================================================================== //= WizardShell //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + WizardShell::WizardShell( Window* i_pParent, const Reference< XWizard >& i_rWizard, const Reference< XWizardController >& i_rController, const Sequence< Sequence< sal_Int16 > >& i_rPaths ) :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE ) @@ -93,19 +93,19 @@ namespace svt { namespace uno enableAutomaticNextButtonState(); } - //------------------------------------------------------------------------------------------------------------------ + WizardShell::~WizardShell() { } - //------------------------------------------------------------------------------------------------------------------ + short WizardShell::Execute() { ActivatePage(); return WizardShell_Base::Execute(); } - //------------------------------------------------------------------------------------------------------------------ + sal_Int16 WizardShell::convertCommitReasonToTravelType( const CommitPageReason i_eReason ) { switch ( i_eReason ) @@ -126,7 +126,7 @@ namespace svt { namespace uno return WizardTravelType::FINISH; } - //------------------------------------------------------------------------------------------------------------------ + void WizardShell::enterState( WizardState i_nState ) { WizardShell_Base::enterState( i_nState ); @@ -144,7 +144,7 @@ namespace svt { namespace uno } } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool WizardShell::leaveState( WizardState i_nState ) { if ( !WizardShell_Base::leaveState( i_nState ) ) @@ -165,7 +165,7 @@ namespace svt { namespace uno return sal_True; } - //------------------------------------------------------------------------------------------------------------------ + PWizardPageController WizardShell::impl_getController( TabPage* i_pPage ) const { Page2ControllerMap::const_iterator pos = m_aPageControllers.find( i_pPage ); @@ -173,7 +173,7 @@ namespace svt { namespace uno return pos->second; } - //------------------------------------------------------------------------------------------------------------------ + Reference< XWizardPage > WizardShell::getCurrentWizardPage() const { const WizardState eState = getCurrentState(); @@ -184,13 +184,13 @@ namespace svt { namespace uno return pController->getWizardPage(); } - //------------------------------------------------------------------------------------------------------------------ + void WizardShell::enablePage( const sal_Int16 i_nPageID, const sal_Bool i_bEnable ) { enableState( impl_pageIdToState( i_nPageID ), i_bEnable ); } - //------------------------------------------------------------------------------------------------------------------ + TabPage* WizardShell::createPage( WizardState i_nState ) { ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", NULL ); @@ -209,13 +209,13 @@ namespace svt { namespace uno return pPage; } - //------------------------------------------------------------------------------------------------------------------ + IWizardPageController* WizardShell::getPageController( TabPage* i_pCurrentPage ) const { return impl_getController( i_pCurrentPage ).get(); } - //------------------------------------------------------------------------------------------------------------------ + OUString WizardShell::getStateDisplayName( WizardState i_nState ) const { try @@ -231,7 +231,7 @@ namespace svt { namespace uno return OUString::number(i_nState); } - //------------------------------------------------------------------------------------------------------------------ + bool WizardShell::canAdvance() const { try @@ -247,7 +247,7 @@ namespace svt { namespace uno return WizardShell_Base::canAdvance(); } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool WizardShell::onFinish() { try |