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 /vcl/source/window | |
| 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 'vcl/source/window')
33 files changed, 970 insertions, 970 deletions
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 4ded993eb491..61b5763f6646 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -95,7 +95,7 @@ sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId, return ACCELENTRY_NOTFOUND; } -// ----------------------------------------------------------------------- + static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry ) { @@ -134,7 +134,7 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry ) } } -// ----------------------------------------------------------------------- + static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nId ) { @@ -165,7 +165,7 @@ void Accelerator::ImplInit() mpDel = NULL; } -// ----------------------------------------------------------------------- + ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const { @@ -176,7 +176,7 @@ ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const return NULL; } -// ----------------------------------------------------------------------- + void Accelerator::ImplCopyData( ImplAccelData& rAccelData ) { @@ -199,7 +199,7 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData ) } } -// ----------------------------------------------------------------------- + void Accelerator::ImplDeleteData() { @@ -214,7 +214,7 @@ void Accelerator::ImplDeleteData() mpData->maIdList.clear(); } -// ----------------------------------------------------------------------- + void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, bool bEnable, Accelerator* pAutoAccel ) @@ -269,7 +269,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, ImplAccelEntryInsert( &(mpData->maIdList), pEntry ); } -// ----------------------------------------------------------------------- + Accelerator::Accelerator() { @@ -278,7 +278,7 @@ Accelerator::Accelerator() mpData = new ImplAccelData; } -// ----------------------------------------------------------------------- + Accelerator::Accelerator( const Accelerator& rAccel ) : Resource(), @@ -291,7 +291,7 @@ Accelerator::Accelerator( const Accelerator& rAccel ) : ImplCopyData( *((ImplAccelData*)(rAccel.mpData)) ); } -// ----------------------------------------------------------------------- + Accelerator::Accelerator( const ResId& rResId ) { @@ -302,7 +302,7 @@ Accelerator::Accelerator( const ResId& rResId ) ImplLoadRes( rResId ); } -// ----------------------------------------------------------------------- + void Accelerator::ImplLoadRes( const ResId& rResId ) { @@ -318,7 +318,7 @@ void Accelerator::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + Accelerator::~Accelerator() { @@ -331,35 +331,35 @@ Accelerator::~Accelerator() delete mpData; } -// ----------------------------------------------------------------------- + void Accelerator::Activate() { maActivateHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Accelerator::Deactivate() { maDeactivateHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Accelerator::Select() { maSelectHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Accelerator::InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode ) { ImplInsertAccel( nItemId, rKeyCode, true, NULL ); } -// ----------------------------------------------------------------------- + void Accelerator::InsertItem( const ResId& rResId ) { @@ -393,7 +393,7 @@ void Accelerator::InsertItem( const ResId& rResId ) ImplInsertAccel( nAccelKeyId, aKeyCode, !bDisable, pAutoAccel ); } -// ----------------------------------------------------------------------- + sal_uInt16 Accelerator::GetItemCount() const { @@ -401,7 +401,7 @@ sal_uInt16 Accelerator::GetItemCount() const return (sal_uInt16)mpData->maIdList.size(); } -// ----------------------------------------------------------------------- + KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const { @@ -413,7 +413,7 @@ KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const return KeyCode(); } -// ----------------------------------------------------------------------- + sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const { @@ -425,7 +425,7 @@ sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const return 0; } -// ----------------------------------------------------------------------- + Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const { @@ -437,7 +437,7 @@ Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const return NULL; } -// ----------------------------------------------------------------------- + Accelerator& Accelerator::operator=( const Accelerator& rAccel ) { diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 5fe29c0e3341..66ce04be9c19 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -35,7 +35,7 @@ ImplAccelManager::~ImplAccelManager() delete mpSequenceList; } -// ----------------------------------------------------------------------- + bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) { @@ -53,7 +53,7 @@ bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) return true; } -// ----------------------------------------------------------------------- + void ImplAccelManager::RemoveAccel( Accelerator* pAccel ) { @@ -90,7 +90,7 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel ) } } -// ----------------------------------------------------------------------- + void ImplAccelManager::EndSequence( bool bCancel ) { @@ -118,7 +118,7 @@ void ImplAccelManager::EndSequence( bool bCancel ) mpSequenceList = NULL; } -// ----------------------------------------------------------------------- + bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) { diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index b68b4ab9ae51..27eafacfaac5 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -79,7 +79,7 @@ static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage ) rImage = pSVData->maCtrlData.mpPinImgList->GetImage( nId ); } -// ----------------------------------------------------------------------- + void Window::ImplCalcSymbolRect( Rectangle& rRect ) { @@ -99,7 +99,7 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect ) rRect.Bottom() -= nExtraHeight; } -// ----------------------------------------------------------------------- + static void ImplDrawBrdWinSymbol( OutputDevice* pDev, const Rectangle& rRect, SymbolType eSymbol ) @@ -112,7 +112,7 @@ static void ImplDrawBrdWinSymbol( OutputDevice* pDev, pDev->GetSettings().GetStyleSettings().GetButtonTextColor(), 0 ); } -// ----------------------------------------------------------------------- + static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, const Rectangle& rRect, @@ -151,50 +151,50 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, // ======================================================================= -// ------------------------ + // - ImplBorderWindowView - -// ------------------------ + ImplBorderWindowView::~ImplBorderWindowView() { } -// ----------------------------------------------------------------------- + bool ImplBorderWindowView::MouseMove( const MouseEvent& ) { return false; } -// ----------------------------------------------------------------------- + bool ImplBorderWindowView::MouseButtonDown( const MouseEvent& ) { return false; } -// ----------------------------------------------------------------------- + bool ImplBorderWindowView::Tracking( const TrackingEvent& ) { return false; } -// ----------------------------------------------------------------------- + OUString ImplBorderWindowView::RequestHelp( const Point&, Rectangle& ) { return OUString(); } -// ----------------------------------------------------------------------- + Rectangle ImplBorderWindowView::GetMenuRect() const { return Rectangle(); } -// ----------------------------------------------------------------------- + void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData ) { @@ -230,7 +230,7 @@ void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData ) } } -// ----------------------------------------------------------------------- + sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Point& rPos ) { @@ -309,7 +309,7 @@ sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const return 0; } -// ----------------------------------------------------------------------- + bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) { @@ -351,7 +351,7 @@ bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const Mous return true; } -// ----------------------------------------------------------------------- + bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) { @@ -471,7 +471,7 @@ bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons return true; } -// ----------------------------------------------------------------------- + bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ) { @@ -924,7 +924,7 @@ bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track return true; } -// ----------------------------------------------------------------------- + OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, @@ -995,7 +995,7 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData, return aHelpStr; } -// ----------------------------------------------------------------------- + long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const { @@ -1018,21 +1018,21 @@ long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData // ======================================================================= -// -------------------------- + // - ImplNoBorderWindowView - -// -------------------------- + ImplNoBorderWindowView::ImplNoBorderWindowView( ImplBorderWindow* ) { } -// ----------------------------------------------------------------------- + void ImplNoBorderWindowView::Init( OutputDevice*, long, long ) { } -// ----------------------------------------------------------------------- + void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const @@ -1043,14 +1043,14 @@ void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopB rBottomBorder = 0; } -// ----------------------------------------------------------------------- + long ImplNoBorderWindowView::CalcTitleWidth() const { return 0; } -// ----------------------------------------------------------------------- + void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point* ) { @@ -1058,9 +1058,9 @@ void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point* // ======================================================================= -// ----------------------------- + // - ImplSmallBorderWindowView - -// ----------------------------- + // ======================================================================= @@ -1073,7 +1073,7 @@ ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderW { } -// ----------------------------------------------------------------------- + void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight ) { @@ -1234,7 +1234,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei } } -// ----------------------------------------------------------------------- + void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const @@ -1245,14 +1245,14 @@ void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rT rBottomBorder = mnBottomBorder; } -// ----------------------------------------------------------------------- + long ImplSmallBorderWindowView::CalcTitleWidth() const { return 0; } -// ----------------------------------------------------------------------- + void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*, const Point* ) { @@ -1416,9 +1416,9 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* // ======================================================================= -// --------------------------- + // - ImplStdBorderWindowView - -// --------------------------- + ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ) { @@ -1438,7 +1438,7 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo mpDTitleVirDev = NULL; } -// ----------------------------------------------------------------------- + ImplStdBorderWindowView::~ImplStdBorderWindowView() { @@ -1446,42 +1446,42 @@ ImplStdBorderWindowView::~ImplStdBorderWindowView() delete mpDTitleVirDev; } -// ----------------------------------------------------------------------- + bool ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt ) { return ImplMouseMove( &maFrameData, rMEvt ); } -// ----------------------------------------------------------------------- + bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt ) { return ImplMouseButtonDown( &maFrameData, rMEvt ); } -// ----------------------------------------------------------------------- + bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) { return ImplTracking( &maFrameData, rTEvt ); } -// ----------------------------------------------------------------------- + OUString ImplStdBorderWindowView::RequestHelp( const Point& rPos, Rectangle& rHelpRect ) { return ImplRequestHelp( &maFrameData, rPos, rHelpRect ); } -// ----------------------------------------------------------------------- + Rectangle ImplStdBorderWindowView::GetMenuRect() const { return maFrameData.maMenuRect; } -// ----------------------------------------------------------------------- + void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight ) { @@ -1629,7 +1629,7 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh } } -// ----------------------------------------------------------------------- + void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const @@ -1640,14 +1640,14 @@ void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTop rBottomBorder = maFrameData.mnBottomBorder; } -// ----------------------------------------------------------------------- + long ImplStdBorderWindowView::CalcTitleWidth() const { return ImplCalcTitleWidth( &maFrameData ); } -// ----------------------------------------------------------------------- + void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ) { @@ -1943,7 +1943,7 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, ImplInit( pParent, nStyle, nTypeStyle, pSystemParentData ); } -// ----------------------------------------------------------------------- + ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle , sal_uInt16 nTypeStyle ) : @@ -1952,35 +1952,35 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle , ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() ); } -// ----------------------------------------------------------------------- + ImplBorderWindow::~ImplBorderWindow() { delete mpBorderView; } -// ----------------------------------------------------------------------- + void ImplBorderWindow::MouseMove( const MouseEvent& rMEvt ) { mpBorderView->MouseMove( rMEvt ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::MouseButtonDown( const MouseEvent& rMEvt ) { mpBorderView->MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::Tracking( const TrackingEvent& rTEvt ) { mpBorderView->Tracking( rTEvt ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::Paint( const Rectangle& ) { @@ -1992,7 +1992,7 @@ void ImplBorderWindow::Draw( const Rectangle&, OutputDevice* pOutDev, const Poin mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL, pOutDev, &rPos ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::Activate() { @@ -2000,7 +2000,7 @@ void ImplBorderWindow::Activate() Window::Activate(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::Deactivate() { @@ -2011,7 +2011,7 @@ void ImplBorderWindow::Deactivate() Window::Deactivate(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt ) { @@ -2037,7 +2037,7 @@ void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::Resize() { @@ -2091,7 +2091,7 @@ void ImplBorderWindow::Resize() Window::Resize(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::StateChanged( StateChangedType nType ) { @@ -2111,7 +2111,7 @@ void ImplBorderWindow::StateChanged( StateChangedType nType ) Window::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -2127,7 +2127,7 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::InitView() { @@ -2148,7 +2148,7 @@ void ImplBorderWindow::InitView() mpBorderView->Init( this, aSize.Width(), aSize.Height() ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) { @@ -2191,7 +2191,7 @@ void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) } } -// ----------------------------------------------------------------------- + void ImplBorderWindow::InvalidateBorder() { @@ -2224,7 +2224,7 @@ void ImplBorderWindow::InvalidateBorder() } } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetDisplayActive( bool bActive ) { @@ -2236,7 +2236,7 @@ void ImplBorderWindow::SetDisplayActive( bool bActive ) } } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize ) { @@ -2244,7 +2244,7 @@ void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize ) UpdateView( false, rSize ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) { @@ -2255,7 +2255,7 @@ void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) } } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetPin( bool bPin ) { @@ -2263,7 +2263,7 @@ void ImplBorderWindow::SetPin( bool bPin ) InvalidateBorder(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize ) { @@ -2272,7 +2272,7 @@ void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize ) UpdateView( false, rSize ); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetCloser() { @@ -2282,7 +2282,7 @@ void ImplBorderWindow::SetCloser() InvalidateBorder(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetDockButton( bool bDockButton ) { @@ -2292,7 +2292,7 @@ void ImplBorderWindow::SetDockButton( bool bDockButton ) InvalidateBorder(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetHideButton( bool bHideButton ) { @@ -2302,7 +2302,7 @@ void ImplBorderWindow::SetHideButton( bool bHideButton ) InvalidateBorder(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetMenuButton( bool bMenuButton ) { @@ -2312,14 +2312,14 @@ void ImplBorderWindow::SetMenuButton( bool bMenuButton ) InvalidateBorder(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::UpdateMenuHeight() { Resize(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetMenuBarWindow( Window* pWindow ) { @@ -2329,7 +2329,7 @@ void ImplBorderWindow::SetMenuBarWindow( Window* pWindow ) pWindow->Show(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::SetMenuBarMode( bool bHide ) { @@ -2337,7 +2337,7 @@ void ImplBorderWindow::SetMenuBarMode( bool bHide ) UpdateMenuHeight(); } -// ----------------------------------------------------------------------- + void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const @@ -2347,7 +2347,7 @@ void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, rTopBorder += mpMenuBarWindow->GetSizePixel().Height(); } -// ----------------------------------------------------------------------- + long ImplBorderWindow::CalcTitleWidth() const { diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx index 9f1b4677403a..9c7f010931c7 100644 --- a/vcl/source/window/cmdevt.cxx +++ b/vcl/source/window/cmdevt.cxx @@ -39,7 +39,7 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, mbOnlyCursor = bOnlyCursor; } -// ----------------------------------------------------------------------- + CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& rData ) : maText( rData.maText ) @@ -56,7 +56,7 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& mbOnlyCursor = rData.mbOnlyCursor; } -// ----------------------------------------------------------------------- + CommandExtTextInputData::~CommandExtTextInputData() { diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 64c3ee9b2e8f..bfd3cb5ea2c0 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -120,7 +120,7 @@ static void ImplCursorInvert( ImplCursorData* pData ) pWindow->EnableMapMode( bMapMode ); } -// ----------------------------------------------------------------------- + void Cursor::ImplDraw() { @@ -150,7 +150,7 @@ void Cursor::ImplDraw() } } -// ----------------------------------------------------------------------- + void Cursor::ImplRestore() { @@ -260,7 +260,7 @@ void Cursor::ImplNew() } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Cursor, ImplTimerHdl) { @@ -285,7 +285,7 @@ Cursor::Cursor() mbVisible = false; } -// ----------------------------------------------------------------------- + Cursor::Cursor( const Cursor& rCursor ) : maSize( rCursor.maSize ), @@ -300,7 +300,7 @@ Cursor::Cursor( const Cursor& rCursor ) : mbVisible = rCursor.mbVisible; } -// ----------------------------------------------------------------------- + Cursor::~Cursor() { @@ -313,7 +313,7 @@ Cursor::~Cursor() } } -// ----------------------------------------------------------------------- + void Cursor::SetStyle( sal_uInt16 nStyle ) { @@ -324,7 +324,7 @@ void Cursor::SetStyle( sal_uInt16 nStyle ) } } -// ----------------------------------------------------------------------- + void Cursor::Show() { @@ -335,7 +335,7 @@ void Cursor::Show() } } -// ----------------------------------------------------------------------- + void Cursor::Hide() { @@ -346,7 +346,7 @@ void Cursor::Hide() } } -// ----------------------------------------------------------------------- + void Cursor::SetWindow( Window* pWindow ) { @@ -357,7 +357,7 @@ void Cursor::SetWindow( Window* pWindow ) } } -// ----------------------------------------------------------------------- + void Cursor::SetPos( const Point& rPoint ) { @@ -368,7 +368,7 @@ void Cursor::SetPos( const Point& rPoint ) } } -// ----------------------------------------------------------------------- + void Cursor::SetSize( const Size& rSize ) { @@ -379,7 +379,7 @@ void Cursor::SetSize( const Size& rSize ) } } -// ----------------------------------------------------------------------- + void Cursor::SetWidth( long nNewWidth ) { @@ -390,7 +390,7 @@ void Cursor::SetWidth( long nNewWidth ) } } -// ----------------------------------------------------------------------- + void Cursor::SetOrientation( short nNewOrientation ) { @@ -401,7 +401,7 @@ void Cursor::SetOrientation( short nNewOrientation ) } } -// ----------------------------------------------------------------------- + void Cursor::SetDirection( unsigned char nNewDirection ) { @@ -412,7 +412,7 @@ void Cursor::SetDirection( unsigned char nNewDirection ) } } -// ----------------------------------------------------------------------- + Cursor& Cursor::operator=( const Cursor& rCursor ) { @@ -427,7 +427,7 @@ Cursor& Cursor::operator=( const Cursor& rCursor ) return *this; } -// ----------------------------------------------------------------------- + bool Cursor::operator==( const Cursor& rCursor ) const { diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 169aeb2dea96..adcc3bd49292 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -830,7 +830,7 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, } -// ----------------------------------------------------------------------- + void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType, const Color& rColor, sal_uInt16 nStyle ) @@ -1056,7 +1056,7 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle return aRect; } -// ----------------------------------------------------------------------- + void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical ) { diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index e2a18ba7f977..334a155a5f80 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -108,7 +108,7 @@ static bool ImplIsMnemonicCtrl( Window* pWindow ) return false; } -// ----------------------------------------------------------------------- + // Called by native error dialog popup implementations void ImplHideSplash() @@ -182,7 +182,7 @@ Window * firstLogicalChildOfParent(Window *pTopLevel) return pChild; } -// ----------------------------------------------------------------------- + void ImplWindowAutoMnemonic( Window* pWindow ) { @@ -281,7 +281,7 @@ static PushButton* ImplGetDefaultButton( Dialog* pDialog ) return NULL; } -// ----------------------------------------------------------------------- + static PushButton* ImplGetOKButton( Dialog* pDialog ) { @@ -297,7 +297,7 @@ static PushButton* ImplGetOKButton( Dialog* pDialog ) return NULL; } -// ----------------------------------------------------------------------- + static PushButton* ImplGetCancelButton( Dialog* pDialog ) { @@ -314,7 +314,7 @@ static PushButton* ImplGetCancelButton( Dialog* pDialog ) return NULL; } -// ----------------------------------------------------------------------- + static void ImplMouseAutoPos( Dialog* pDialog ) { @@ -371,7 +371,7 @@ void Dialog::ImplInitDialogData() maLayoutTimer.SetTimeoutHdl( LINK( this, Dialog, ImplHandleLayoutTimerHdl ) ); } -// ----------------------------------------------------------------------- + void Dialog::ImplInit( Window* pParent, WinBits nStyle ) { @@ -456,7 +456,7 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } -// ----------------------------------------------------------------------- + void Dialog::ImplInitSettings() { @@ -474,7 +474,7 @@ void Dialog::ImplInitSettings() SetBackground( GetSettings().GetStyleSettings().GetDialogColor() ); } -// ----------------------------------------------------------------------- + Dialog::Dialog( WindowType nType ) : SystemWindow( nType ) @@ -537,7 +537,7 @@ Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescri } -// ----------------------------------------------------------------------- + Dialog::Dialog( Window* pParent, WinBits nStyle ) : SystemWindow( WINDOW_DIALOG ) @@ -577,7 +577,7 @@ void Dialog::set_content_area(VclBox* pContentArea) mpContentArea = pContentArea; } -// ----------------------------------------------------------------------- + Dialog::~Dialog() { @@ -586,7 +586,7 @@ Dialog::~Dialog() mpDialogImpl = NULL; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl) { @@ -594,7 +594,7 @@ IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl) return 0; } -// ----------------------------------------------------------------------- + bool Dialog::Notify( NotifyEvent& rNEvt ) { @@ -698,7 +698,7 @@ void Dialog::setOptimalLayoutSize() setPosSizeOnContainee(aSize, *pBox); } -// ----------------------------------------------------------------------- + void Dialog::StateChanged( StateChangedType nType ) { @@ -737,7 +737,7 @@ void Dialog::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void Dialog::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -751,7 +751,7 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + bool Dialog::Close() { @@ -801,7 +801,7 @@ bool Dialog::Close() } } -// ----------------------------------------------------------------------- + bool Dialog::ImplStartExecuteModal() { @@ -880,7 +880,7 @@ bool Dialog::ImplStartExecuteModal() return true; } -// ----------------------------------------------------------------------- + void Dialog::ImplEndExecuteModal() { @@ -888,7 +888,7 @@ void Dialog::ImplEndExecuteModal() pSVData->maAppData.mnModalMode--; } -// ----------------------------------------------------------------------- + short Dialog::Execute() { @@ -989,7 +989,7 @@ short Dialog::Execute() #endif } -// ----------------------------------------------------------------------- + // virtual void Dialog::StartExecuteModal( const Link& rEndDialogHdl ) @@ -1001,7 +1001,7 @@ void Dialog::StartExecuteModal( const Link& rEndDialogHdl ) mpDialogImpl->mbStartedModal = true; } -// ----------------------------------------------------------------------- + void Dialog::EndDialog( long nResult ) { @@ -1059,14 +1059,14 @@ void Dialog::EndDialog( long nResult ) } } -// ----------------------------------------------------------------------- + long Dialog::GetResult() const { return mpDialogImpl->mnResult; } -// ----------------------------------------------------------------------- + void Dialog::EndAllDialogs( Window* pParent ) { @@ -1085,7 +1085,7 @@ void Dialog::EndAllDialogs( Window* pParent ) } } -// ----------------------------------------------------------------------- + void Dialog::SetModalInputMode( bool bModal ) { @@ -1153,7 +1153,7 @@ void Dialog::SetModalInputMode( bool bModal ) } } -// ----------------------------------------------------------------------- + void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs ) { @@ -1172,7 +1172,7 @@ void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs ) SetModalInputMode( bModal ); } -// ----------------------------------------------------------------------- + void Dialog::GrabFocusToFirstControl() { @@ -1345,7 +1345,7 @@ VclBuilderContainer::~VclBuilderContainer() delete m_pUIBuilder; } -// ----------------------------------------------------------------------- + ModelessDialog::ModelessDialog( Window* pParent, const ResId& rResId ) : Dialog( WINDOW_MODELESSDIALOG ) @@ -1371,7 +1371,7 @@ ModalDialog::ModalDialog( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + ModalDialog::ModalDialog( Window* pParent, const ResId& rResId ) : Dialog( WINDOW_MODALDIALOG ) diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 0fc9c9617f89..5874e24dc603 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -50,7 +50,7 @@ static bool ImplHasIndirectTabParent( Window* pWindow ) && ( pNonLayoutParent->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) ); } -// ----------------------------------------------------------------------- + static Window* ImplGetTopParentOfTabHierarchy( Window* pParent ) { @@ -73,7 +73,7 @@ static Window* ImplGetTopParentOfTabHierarchy( Window* pParent ) return pResult; } -// ----------------------------------------------------------------------- + static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex ) { @@ -149,7 +149,7 @@ static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& return pFoundWindow; } -// ----------------------------------------------------------------------- + static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { @@ -183,7 +183,7 @@ static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nI return pWindow; } -// ----------------------------------------------------------------------- + static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { @@ -196,7 +196,7 @@ static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIn return pWindow; } -// ----------------------------------------------------------------------- + Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, @@ -302,7 +302,7 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, return pWindow; } -// ----------------------------------------------------------------------- + static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex, sal_uInt16& rFormStart, sal_uInt16& rFormEnd ) @@ -400,7 +400,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt return pSWindow; } -// ----------------------------------------------------------------------- + static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ) @@ -492,7 +492,7 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni return NULL; } -// ----------------------------------------------------------------------- + void Window::ImplControlFocus( sal_uInt16 nFlags ) { @@ -535,7 +535,7 @@ void Window::ImplControlFocus( sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + namespace { @@ -969,7 +969,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) return false; } -// ----------------------------------------------------------------------- + // checks if this window has dialog control bool Window::ImplHasDlgCtrl() @@ -1020,7 +1020,7 @@ if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->G pWindow->ImplControlFocus(); } -// ----------------------------------------------------------------------- + static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, bool bGetFocus ) @@ -1079,7 +1079,7 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, } } -// ----------------------------------------------------------------------- + void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) { @@ -1092,7 +1092,7 @@ void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) ImplDlgCtrlUpdateDefButton( this, pWindow, bGetFocus ); } -// ----------------------------------------------------------------------- + Window* Window::ImplFindDlgCtrlWindow( Window* pWindow ) { @@ -1105,21 +1105,21 @@ Window* Window::ImplFindDlgCtrlWindow( Window* pWindow ) } -// ----------------------------------------------------------------------- + Window* Window::GetParentLabelFor( const Window* ) const { return NULL; } -// ----------------------------------------------------------------------- + Window* Window::GetParentLabeledBy( const Window* ) const { return NULL; } -// ----------------------------------------------------------------------- + static sal_Unicode getAccel( const OUString& rStr ) { @@ -1222,7 +1222,7 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const return pWindow; } -// ----------------------------------------------------------------------- + static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Window* pLabeled ) { @@ -1364,7 +1364,7 @@ Window* Window::getLegacyNonLayoutAccessibleRelationMemberOf() const return pWindow; } -// ----------------------------------------------------------------------- + KeyEvent Window::GetActivationKey() const { diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 13bca4abecd9..22d91bdf9ab0 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -96,7 +96,7 @@ DockingAreaWindow::~DockingAreaWindow() delete mpImplData; } -// ----------------------------------------------------------------------- + void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -109,7 +109,7 @@ void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + static void ImplInvalidateMenubar( DockingAreaWindow* pThis ) { @@ -138,7 +138,7 @@ void DockingAreaWindow::StateChanged( StateChangedType nType ) ImplInvalidateMenubar( this ); } -// ----------------------------------------------------------------------- + bool DockingAreaWindow::IsHorizontal() const { @@ -160,7 +160,7 @@ WindowAlign DockingAreaWindow::GetAlign() const return mpImplData->meAlign; } -// ----------------------------------------------------------------------- + void DockingAreaWindow::Paint( const Rectangle& ) { @@ -263,6 +263,6 @@ void DockingAreaWindow::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index cb5fd3334170..0e80b6dbb827 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -110,7 +110,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits, maEndDockTimer.SetTimeout( 50 ); } -// ----------------------------------------------------------------------- + ImplDockFloatWin2::~ImplDockFloatWin2() { @@ -118,7 +118,7 @@ ImplDockFloatWin2::~ImplDockFloatWin2() Application::RemoveUserEvent( mnLastUserEvent ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) { @@ -240,7 +240,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) mbInMove = false; return 0; } -// ----------------------------------------------------------------------- + void ImplDockFloatWin2::Move() { @@ -264,7 +264,7 @@ void ImplDockFloatWin2::Move() mnLastUserEvent = Application::PostUserEvent( LINK( this, ImplDockFloatWin2, DockingHdl ) ); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin2::Resize() { @@ -284,7 +284,7 @@ void ImplDockFloatWin2::setPosSizePixel( long nX, long nY, FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags ); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton ) @@ -293,7 +293,7 @@ void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton ) mpDockWin->TitleButtonClick( nButton ); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin2::Pin() { @@ -301,7 +301,7 @@ void ImplDockFloatWin2::Pin() mpDockWin->Pin(); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin2::Roll() { @@ -309,7 +309,7 @@ void ImplDockFloatWin2::Roll() mpDockWin->Roll(); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin2::PopupModeEnd() { @@ -317,7 +317,7 @@ void ImplDockFloatWin2::PopupModeEnd() mpDockWin->PopupModeEnd(); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin2::Resizing( Size& rSize ) { @@ -325,7 +325,7 @@ void ImplDockFloatWin2::Resizing( Size& rSize ) mpDockWin->Resizing( rSize ); } -// ----------------------------------------------------------------------- + bool ImplDockFloatWin2::Close() { @@ -437,7 +437,7 @@ bool DockingManager::IsInPopupMode( const Window *pWindow ) return false; } -// ----------------------------------------------------------------------- + void DockingManager::EndPopupMode( const Window *pWin ) { @@ -446,7 +446,7 @@ void DockingManager::EndPopupMode( const Window *pWin ) pWrapper->GetFloatingWindow()->EndPopupMode(); } -// ----------------------------------------------------------------------- + void DockingManager::AddWindow( const Window *pWindow ) { @@ -866,7 +866,7 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper() } } -// ----------------------------------------------------------------------- + bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) { @@ -943,7 +943,7 @@ void ImplDockingWindowWrapper::ImplInitData() maMaxOutSize = Size( SHRT_MAX, SHRT_MAX ); } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt ) { @@ -1035,7 +1035,7 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt ) } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRect ) { @@ -1045,7 +1045,7 @@ void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRe mbDocking = true; } -// ----------------------------------------------------------------------- + bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect ) { @@ -1056,7 +1056,7 @@ bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect ) return data.mbFloating; } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMode ) { @@ -1097,7 +1097,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo mbStartDockingEnabled = false; } -// ----------------------------------------------------------------------- + bool ImplDockingWindowWrapper::PrepareToggleFloatingMode() { @@ -1106,7 +1106,7 @@ bool ImplDockingWindowWrapper::PrepareToggleFloatingMode() return bFloating; } -// ----------------------------------------------------------------------- + bool ImplDockingWindowWrapper::Close() { @@ -1114,7 +1114,7 @@ bool ImplDockingWindowWrapper::Close() return true; } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::ToggleFloatingMode() { @@ -1131,7 +1131,7 @@ void ImplDockingWindowWrapper::ToggleFloatingMode() mbStartDockingEnabled = false; } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType ) { @@ -1149,28 +1149,28 @@ void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType ) } } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::Pin() { // TODO: send event } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::Roll() { // TODO: send event } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::PopupModeEnd() { // TODO: send event } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::Resizing( Size& rSize ) { @@ -1180,7 +1180,7 @@ void ImplDockingWindowWrapper::Resizing( Size& rSize ) pDockingWindow->Resizing( rSize ); } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) { @@ -1195,7 +1195,7 @@ void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, bool bVisibl } } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLong nFlags ) { @@ -1299,7 +1299,7 @@ bool ImplDockingWindowWrapper::IsInPopupMode() const return false; } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) { @@ -1414,21 +1414,21 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) } } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::SetFloatStyle( WinBits nStyle ) { mnFloatBits = nStyle; } -// ----------------------------------------------------------------------- + WinBits ImplDockingWindowWrapper::GetFloatStyle() const { return mnFloatBits; } -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, @@ -1440,7 +1440,7 @@ void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY, GetWindow()->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags ); } -// ----------------------------------------------------------------------- + Point ImplDockingWindowWrapper::GetPosPixel() const { @@ -1450,7 +1450,7 @@ Point ImplDockingWindowWrapper::GetPosPixel() const return mpDockingWindow->GetPosPixel(); } -// ----------------------------------------------------------------------- + Size ImplDockingWindowWrapper::GetSizePixel() const { @@ -1460,9 +1460,9 @@ Size ImplDockingWindowWrapper::GetSizePixel() const return mpDockingWindow->GetSizePixel(); } -// ----------------------------------------------------------------------- + // old inlines from DockingWindow -// ----------------------------------------------------------------------- + void ImplDockingWindowWrapper::SetMinOutputSizePixel( const Size& rSize ) { diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 3346751b751c..f733b53b4ed6 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -41,7 +41,7 @@ // ======================================================================= -// ----------------------------------------------------------------------- + class DockingWindow::ImplData { @@ -63,7 +63,7 @@ DockingWindow::ImplData::~ImplData() { } -// ----------------------------------------------------------------------- + class ImplDockFloatWin : public FloatingWindow { @@ -121,7 +121,7 @@ ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits, maDockTimer.SetTimeout( 50 ); } -// ----------------------------------------------------------------------- + ImplDockFloatWin::~ImplDockFloatWin() { @@ -129,7 +129,7 @@ ImplDockFloatWin::~ImplDockFloatWin() Application::RemoveUserEvent( mnLastUserEvent ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) { @@ -196,7 +196,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) mbInMove = false; return 0; } -// ----------------------------------------------------------------------- + void ImplDockFloatWin::Move() { @@ -220,7 +220,7 @@ void ImplDockFloatWin::Move() mnLastUserEvent = Application::PostUserEvent( LINK( this, ImplDockFloatWin, DockingHdl ) ); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin::Resize() { @@ -229,7 +229,7 @@ void ImplDockFloatWin::Resize() mpDockWin->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), WINDOW_POSSIZE_POSSIZE ); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin::TitleButtonClick( sal_uInt16 nButton ) { @@ -237,7 +237,7 @@ void ImplDockFloatWin::TitleButtonClick( sal_uInt16 nButton ) mpDockWin->TitleButtonClick( nButton ); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin::Pin() { @@ -245,7 +245,7 @@ void ImplDockFloatWin::Pin() mpDockWin->Pin(); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin::Roll() { @@ -253,7 +253,7 @@ void ImplDockFloatWin::Roll() mpDockWin->Roll(); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin::PopupModeEnd() { @@ -261,7 +261,7 @@ void ImplDockFloatWin::PopupModeEnd() mpDockWin->PopupModeEnd(); } -// ----------------------------------------------------------------------- + void ImplDockFloatWin::Resizing( Size& rSize ) { @@ -269,7 +269,7 @@ void ImplDockFloatWin::Resizing( Size& rSize ) mpDockWin->Resizing( rSize ); } -// ----------------------------------------------------------------------- + bool ImplDockFloatWin::Close() { @@ -349,7 +349,7 @@ void DockingWindow::ImplInitDockingWindowData() mbHideBtn = false; } -// ----------------------------------------------------------------------- + void DockingWindow::ImplInit( Window* pParent, WinBits nStyle ) { @@ -368,7 +368,7 @@ void DockingWindow::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } -// ----------------------------------------------------------------------- + void DockingWindow::ImplInitSettings() { @@ -389,7 +389,7 @@ void DockingWindow::ImplInitSettings() } } -// ----------------------------------------------------------------------- + void DockingWindow::ImplLoadRes( const ResId& rResId ) { @@ -429,7 +429,7 @@ void DockingWindow::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + DockingWindow::DockingWindow( WindowType nType ) : Window( nType ) @@ -437,7 +437,7 @@ DockingWindow::DockingWindow( WindowType nType ) : ImplInitDockingWindowData(); } -// ----------------------------------------------------------------------- + DockingWindow::DockingWindow( Window* pParent, WinBits nStyle ) : Window( WINDOW_DOCKINGWINDOW ) @@ -446,7 +446,7 @@ DockingWindow::DockingWindow( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + DockingWindow::DockingWindow( Window* pParent, const ResId& rResId ) : Window( WINDOW_DOCKINGWINDOW ) @@ -461,7 +461,7 @@ DockingWindow::DockingWindow( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + DockingWindow::~DockingWindow() { @@ -473,7 +473,7 @@ DockingWindow::~DockingWindow() delete mpImplData; } -// ----------------------------------------------------------------------- + void DockingWindow::Tracking( const TrackingEvent& rTEvt ) { @@ -595,7 +595,7 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt ) } } -// ----------------------------------------------------------------------- + bool DockingWindow::Notify( NotifyEvent& rNEvt ) { @@ -649,21 +649,21 @@ bool DockingWindow::Notify( NotifyEvent& rNEvt ) return Window::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void DockingWindow::StartDocking() { mbDocking = true; } -// ----------------------------------------------------------------------- + bool DockingWindow::Docking( const Point&, Rectangle& ) { return IsFloatingMode(); } -// ----------------------------------------------------------------------- + void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) { @@ -691,14 +691,14 @@ void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) mbDocking = false; } -// ----------------------------------------------------------------------- + bool DockingWindow::PrepareToggleFloatingMode() { return true; } -// ----------------------------------------------------------------------- + bool DockingWindow::Close() { @@ -716,43 +716,43 @@ bool DockingWindow::Close() return true; } -// ----------------------------------------------------------------------- + void DockingWindow::ToggleFloatingMode() { } -// ----------------------------------------------------------------------- + void DockingWindow::TitleButtonClick( sal_uInt16 ) { } -// ----------------------------------------------------------------------- + void DockingWindow::Pin() { } -// ----------------------------------------------------------------------- + void DockingWindow::Roll() { } -// ----------------------------------------------------------------------- + void DockingWindow::PopupModeEnd() { } -// ----------------------------------------------------------------------- + void DockingWindow::Resizing( Size& ) { } -// ----------------------------------------------------------------------- + void DockingWindow::StateChanged( StateChangedType nType ) { @@ -774,7 +774,7 @@ void DockingWindow::StateChanged( StateChangedType nType ) Window::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void DockingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -788,7 +788,7 @@ void DockingWindow::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + void DockingWindow::SetFloatingMode( bool bFloatMode ) { @@ -896,7 +896,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode ) } } -// ----------------------------------------------------------------------- + void DockingWindow::SetFloatStyle( WinBits nStyle ) { @@ -910,7 +910,7 @@ void DockingWindow::SetFloatStyle( WinBits nStyle ) mnFloatBits = nStyle; } -// ----------------------------------------------------------------------- + WinBits DockingWindow::GetFloatStyle() const { @@ -923,7 +923,7 @@ WinBits DockingWindow::GetFloatStyle() const return mnFloatBits; } -// ----------------------------------------------------------------------- + void DockingWindow::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, @@ -945,7 +945,7 @@ void DockingWindow::setPosSizePixel( long nX, long nY, Window::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags ); } -// ----------------------------------------------------------------------- + Point DockingWindow::GetPosPixel() const { @@ -964,7 +964,7 @@ Point DockingWindow::GetPosPixel() const return Window::GetPosPixel(); } -// ----------------------------------------------------------------------- + Size DockingWindow::GetSizePixel() const { @@ -983,7 +983,7 @@ Size DockingWindow::GetSizePixel() const return Window::GetSizePixel(); } -// ----------------------------------------------------------------------- + void DockingWindow::SetOutputSizePixel( const Size& rNewSize ) { @@ -1003,7 +1003,7 @@ void DockingWindow::SetOutputSizePixel( const Size& rNewSize ) Window::SetOutputSizePixel( rNewSize ); } -// ----------------------------------------------------------------------- + Size DockingWindow::GetOutputSizePixel() const { diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 8aa30f8bf7fc..285b161b2a70 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -138,7 +138,7 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } -// ----------------------------------------------------------------------- + void FloatingWindow::ImplInitSettings() { @@ -162,7 +162,7 @@ FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) : SystemWindow( WINDOW_FLOATINGWINDOW ) @@ -176,7 +176,7 @@ FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void FloatingWindow::ImplLoadRes( const ResId& rResId ) { @@ -208,7 +208,7 @@ void FloatingWindow::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + FloatingWindow::~FloatingWindow() { @@ -226,14 +226,14 @@ FloatingWindow::~FloatingWindow() delete mpImplData; } -// ----------------------------------------------------------------------- + Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ) { return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex ); } -// ----------------------------------------------------------------------- + Point FloatingWindow::ImplCalcPos( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, @@ -447,7 +447,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, return pW->OutputToScreenPixel( aPos ); } -// ----------------------------------------------------------------------- + FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Point& rPos, sal_uInt16& rHitTest ) { @@ -505,7 +505,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin return NULL; } -// ----------------------------------------------------------------------- + FloatingWindow* FloatingWindow::ImplFindLastLevelFloat() { @@ -524,7 +524,7 @@ FloatingWindow* FloatingWindow::ImplFindLastLevelFloat() return pLastFoundWin; } -// ----------------------------------------------------------------------- + bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) { @@ -542,7 +542,7 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) return false; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) { @@ -553,7 +553,7 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) return 0; } -// ----------------------------------------------------------------------- + bool FloatingWindow::Notify( NotifyEvent& rNEvt ) { @@ -578,7 +578,7 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt ) return nRet; } -// ----------------------------------------------------------------------- + void FloatingWindow::StateChanged( StateChangedType nType ) { @@ -591,7 +591,7 @@ void FloatingWindow::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -605,7 +605,7 @@ void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void FloatingWindow::ImplCallPopupModeEnd() { @@ -617,14 +617,14 @@ void FloatingWindow::ImplCallPopupModeEnd() Application::PostUserEvent( mnPostId, LINK( this, FloatingWindow, ImplEndPopupModeHdl ) ); } -// ----------------------------------------------------------------------- + void FloatingWindow::PopupModeEnd() { maPopupModeEndHdl.Call( this ); } -// ----------------------------------------------------------------------- + void FloatingWindow::SetTitleType( sal_uInt16 nTitle ) { @@ -646,7 +646,7 @@ void FloatingWindow::SetTitleType( sal_uInt16 nTitle ) } } -// ----------------------------------------------------------------------- + void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags ) { @@ -729,7 +729,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags ) Show( true, SHOW_NOACTIVATE ); } -// ----------------------------------------------------------------------- + void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags ) { @@ -776,7 +776,7 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags ) StartPopupMode( aRect, nFlags ); } -// ----------------------------------------------------------------------- + void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) { @@ -852,14 +852,14 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) mbInCleanUp = false; } -// ----------------------------------------------------------------------- + void FloatingWindow::EndPopupMode( sal_uInt16 nFlags ) { ImplEndPopupMode( nFlags ); } -// ----------------------------------------------------------------------- + void FloatingWindow::AddPopupModeWindow( Window* pWindow ) { diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 36dc800c9fcd..10baa88203f0 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -36,7 +36,7 @@ void IntroWindow::ImplInitIntroWindowData() pSVData->mpIntroWindow = this; } -// ----------------------------------------------------------------------- + IntroWindow::IntroWindow( ) : WorkWindow( WINDOW_INTROWINDOW ) @@ -45,7 +45,7 @@ IntroWindow::IntroWindow( ) : WorkWindow::ImplInit( 0, WB_INTROWIN, NULL ); } -// ----------------------------------------------------------------------- + IntroWindow::~IntroWindow() { diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index df81d987cc73..8e1f439a6f0e 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -52,7 +52,7 @@ static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] = 0, 0, 0, 0 // KEYFUNC_FRONT }; -// ----------------------------------------------------------------------- + void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 ) { @@ -73,7 +73,7 @@ KeyCode::KeyCode( KeyFuncType eFunction ) eFunc = eFunction; } -// ----------------------------------------------------------------------- + KeyCode::KeyCode( const ResId& rResId ) { @@ -99,7 +99,7 @@ KeyCode::KeyCode( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + OUString KeyCode::GetName( Window* pWindow ) const { @@ -108,7 +108,7 @@ OUString KeyCode::GetName( Window* pWindow ) const return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : ""; } -// ----------------------------------------------------------------------- + KeyFuncType KeyCode::GetFunction() const { diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx index b90b1a20b766..bc84e210c550 100644 --- a/vcl/source/window/keyevent.cxx +++ b/vcl/source/window/keyevent.cxx @@ -65,7 +65,7 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const } -// ------------------------------------------------------- + const Point& HelpEvent::GetMousePosPixel() const { diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index e4b1998d445f..bdd52f3d016e 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -478,9 +478,9 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const } -// ---------------------- + // - MenuFloatingWindow - -// ---------------------- + class MenuFloatingWindow : public FloatingWindow { @@ -2358,7 +2358,7 @@ bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& return false; } -// ----------------------------------------------------------------------- + void Menu::ImplAddDel( ImplMenuDelData& rDel ) { @@ -2371,7 +2371,7 @@ void Menu::ImplAddDel( ImplMenuDelData& rDel ) } } -// ----------------------------------------------------------------------- + void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) { @@ -2392,7 +2392,7 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) } } -// ----------------------------------------------------------------------- + Size Menu::ImplCalcSize( const Window* pWin ) { @@ -3273,9 +3273,9 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) } -// ----------- + // - MenuBar - -// ----------- + MenuBar::MenuBar() : Menu( true ) { @@ -3377,7 +3377,7 @@ bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) return bDone; } -// ----------------------------------------------------------------------- + void MenuBar::SelectEntry( sal_uInt16 nId ) { @@ -3400,7 +3400,7 @@ void MenuBar::SelectEntry( sal_uInt16 nId ) } } -// ----------------------------------------------------------------------- + // handler for native menu selection and command events @@ -3501,7 +3501,7 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId ); } -// ----------------------------------------------------------------------- + // sal_Bool PopupMenu::bAnyPopupInExecute = sal_False; diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 2fe22fbee90c..800ee0983849 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -37,7 +37,7 @@ MnemonicGenerator::MnemonicGenerator() memset( maMnemonics, 1, sizeof( maMnemonics ) ); } -// ----------------------------------------------------------------------- + sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c ) { @@ -62,7 +62,7 @@ sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c ) return MNEMONIC_INDEX_NOTFOUND; } -// ----------------------------------------------------------------------- + sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey ) { @@ -78,7 +78,7 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey ) return 0; } -// ----------------------------------------------------------------------- + void MnemonicGenerator::RegisterMnemonic( const OUString& rKey ) { @@ -121,7 +121,7 @@ void MnemonicGenerator::RegisterMnemonic( const OUString& rKey ) } } -// ----------------------------------------------------------------------- + OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) { @@ -345,7 +345,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) return rKey; } -// ----------------------------------------------------------------------- + uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass() { @@ -354,7 +354,7 @@ uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass return mxCharClass; } -// ----------------------------------------------------------------------- + OUString MnemonicGenerator::EraseAllMnemonicChars( const OUString& rStr ) { diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 3a700f10e711..780283efc064 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -65,7 +65,7 @@ void MessBox::ImplInitMessBoxData() mbCheck = false; } -// ----------------------------------------------------------------------- + void MessBox::ImplInitButtons() { @@ -144,7 +144,7 @@ void MessBox::ImplInitButtons() } } -// ----------------------------------------------------------------------- + MessBox::MessBox( Window* pParent, WinBits nStyle, const OUString& rTitle, const OUString& rMessage ) : @@ -159,7 +159,7 @@ MessBox::MessBox( Window* pParent, WinBits nStyle, SetText( rTitle ); } -// ----------------------------------------------------------------------- + MessBox::MessBox( Window* pParent, const ResId& rResId ) : ButtonDialog( WINDOW_MESSBOX ) @@ -182,7 +182,7 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : ImplInitButtons(); } -// ----------------------------------------------------------------------- + void MessBox::ImplLoadRes( const ResId& ) { @@ -191,7 +191,7 @@ void MessBox::ImplLoadRes( const ResId& ) SetHelpText( ReadStringRes() ); } -// ----------------------------------------------------------------------- + MessBox::~MessBox() { @@ -200,7 +200,7 @@ MessBox::~MessBox() delete mpCheckBox; } -// ----------------------------------------------------------------------- + void MessBox::ImplPosControls() { @@ -398,7 +398,7 @@ void MessBox::ImplPosControls() SetPageSizePixel( aPageSize ); } -// ----------------------------------------------------------------------- + void MessBox::StateChanged( StateChangedType nType ) { @@ -409,14 +409,14 @@ void MessBox::StateChanged( StateChangedType nType ) ButtonDialog::StateChanged( nType ); } -// ----------------------------------------------------------------------- + bool MessBox::GetCheckBoxState() const { return mpCheckBox ? mpCheckBox->IsChecked() : mbCheck; } -// ----------------------------------------------------------------------- + void MessBox::SetCheckBoxState( bool bCheck ) { @@ -424,7 +424,7 @@ void MessBox::SetCheckBoxState( bool bCheck ) mbCheck = bCheck; } -// ----------------------------------------------------------------------- + Size MessBox::GetOptimalSize() const { @@ -443,7 +443,7 @@ void InfoBox::ImplInitInfoBoxData() SetImage( InfoBox::GetStandardImage() ); } -// ----------------------------------------------------------------------- + InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) : MessBox( pParent, WB_OK | WB_DEF_OK, OUString(), rMessage ) @@ -451,7 +451,7 @@ InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) : ImplInitInfoBoxData(); } -// ----------------------------------------------------------------------- + InfoBox::InfoBox( Window* pParent, const ResId & rResId ) : MessBox( pParent, rResId.SetRT( RSC_INFOBOX ) ) @@ -459,7 +459,7 @@ InfoBox::InfoBox( Window* pParent, const ResId & rResId ) : ImplInitInfoBoxData(); } -// ----------------------------------------------------------------------- + InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) @@ -467,7 +467,7 @@ InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : ImplInitInfoBoxData(); } -// ----------------------------------------------------------------------- + Image InfoBox::GetStandardImage() { @@ -486,7 +486,7 @@ void WarningBox::ImplInitWarningBoxData() SetImage( WarningBox::GetStandardImage() ); } -// ----------------------------------------------------------------------- + WarningBox::WarningBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : @@ -495,7 +495,7 @@ WarningBox::WarningBox( Window* pParent, WinBits nStyle, ImplInitWarningBoxData(); } -// ----------------------------------------------------------------------- + WarningBox::WarningBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_WARNINGBOX ) ) @@ -503,7 +503,7 @@ WarningBox::WarningBox( Window* pParent, const ResId& rResId ) : ImplInitWarningBoxData(); } -// ----------------------------------------------------------------------- + void WarningBox::SetDefaultCheckBoxText() { @@ -512,7 +512,7 @@ void WarningBox::SetDefaultCheckBoxText() maCheckBoxText = ResId(SV_STDTEXT_DONTWARNAGAIN, *pResMgr).toString(); } -// ----------------------------------------------------------------------- + Image WarningBox::GetStandardImage() { @@ -531,7 +531,7 @@ void ErrorBox::ImplInitErrorBoxData() SetImage( ErrorBox::GetStandardImage() ); } -// ----------------------------------------------------------------------- + ErrorBox::ErrorBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : @@ -540,7 +540,7 @@ ErrorBox::ErrorBox( Window* pParent, WinBits nStyle, ImplInitErrorBoxData(); } -// ----------------------------------------------------------------------- + ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_ERRORBOX ) ) @@ -548,7 +548,7 @@ ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) : ImplInitErrorBoxData(); } -// ----------------------------------------------------------------------- + Image ErrorBox::GetStandardImage() { @@ -576,7 +576,7 @@ void QueryBox::ImplInitQueryBoxData() SetImage( QueryBox::GetStandardImage() ); } -// ----------------------------------------------------------------------- + QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) @@ -584,7 +584,7 @@ QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) ImplInitQueryBoxData(); } -// ----------------------------------------------------------------------- + QueryBox::QueryBox( Window* pParent, const ResId& rResId ) : MessBox( pParent, rResId.SetRT( RSC_QUERYBOX ) ) @@ -592,7 +592,7 @@ QueryBox::QueryBox( Window* pParent, const ResId& rResId ) : ImplInitQueryBoxData(); } -// ----------------------------------------------------------------------- + void QueryBox::SetDefaultCheckBoxText() { @@ -601,7 +601,7 @@ void QueryBox::SetDefaultCheckBoxText() maCheckBoxText = ResId(SV_STDTEXT_DONTASKAGAIN, *pResMgr).toString(); } -// ----------------------------------------------------------------------- + Image QueryBox::GetStandardImage() { diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 371fceab8a6d..6de81b334fbc 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1839,11 +1839,11 @@ void PrintDialog::previewBackward() mpPageEdit->Down(); } -// ----------------------------------------------------------------------------- + // // PrintProgressDialog // -// ----------------------------------------------------------------------------- + PrintProgressDialog::PrintProgressDialog(Window* i_pParent, int i_nMax) : ModelessDialog(i_pParent, "PrintProgressDialog", diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 5b2480e50747..7fff5407523c 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -64,7 +64,7 @@ void Splitter::ImplInitSplitterData() mnKeyboardStepSize = SPLITTER_DEFAULTSTEPSIZE; } -// ----------------------------------------------------------------------- + // Should only be called from a ImplInit method for initialization or // after checking bNew is different from the current mbHorzSplit value. @@ -90,7 +90,7 @@ void Splitter::ImplInitHorVer(bool bNew) SetPointer( Pointer( ePointerStyle ) ); } -// ----------------------------------------------------------------------- + void Splitter::ImplInit( Window* pParent, WinBits nWinStyle ) { @@ -109,7 +109,7 @@ void Splitter::ImplInit( Window* pParent, WinBits nWinStyle ) pTList->AddWindow( this ); } -// ----------------------------------------------------------------------- + void Splitter::ImplSplitMousePos( Point& rPos ) { @@ -129,7 +129,7 @@ void Splitter::ImplSplitMousePos( Point& rPos ) } } -// ----------------------------------------------------------------------- + void Splitter::ImplDrawSplitter() { @@ -149,7 +149,7 @@ void Splitter::ImplDrawSplitter() mpRefWin->InvertTracking( mpRefWin->PixelToLogic(aInvRect), SHOWTRACK_SPLIT ); } -// ----------------------------------------------------------------------- + Splitter::Splitter( Window* pParent, WinBits nStyle ) : Window( WINDOW_SPLITTER ) @@ -161,7 +161,7 @@ Splitter::Splitter( Window* pParent, WinBits nStyle ) : SetFillColor(); } -// ----------------------------------------------------------------------- + Splitter::Splitter( Window* pParent, const ResId& rResId ) : Window( WINDOW_SPLITTER ) @@ -179,7 +179,7 @@ Splitter::Splitter( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + Splitter::~Splitter() { @@ -187,7 +187,7 @@ Splitter::~Splitter() pTList->RemoveWindow( this ); } -// ----------------------------------------------------------------------- + void Splitter::SetHorizontal(bool bNew) { @@ -197,14 +197,14 @@ void Splitter::SetHorizontal(bool bNew) } } -// ----------------------------------------------------------------------- + void Splitter::SetKeyboardStepSize( long nStepSize ) { mnKeyboardStepSize = nStepSize; } -// ----------------------------------------------------------------------- + Splitter* Splitter::ImplFindSibling() { @@ -224,7 +224,7 @@ Splitter* Splitter::ImplFindSibling() return NULL; } -// ----------------------------------------------------------------------- + bool Splitter::ImplSplitterActive() { @@ -249,7 +249,7 @@ bool Splitter::ImplSplitterActive() return bActive; } -// ----------------------------------------------------------------------- + void Splitter::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -280,7 +280,7 @@ void Splitter::MouseButtonDown( const MouseEvent& rMEvt ) StartDrag(); } -// ----------------------------------------------------------------------- + void Splitter::Tracking( const TrackingEvent& rTEvt ) { @@ -356,7 +356,7 @@ void Splitter::Tracking( const TrackingEvent& rTEvt ) } } -// ----------------------------------------------------------------------- + void Splitter::ImplKbdTracking( KeyCode aKeyCode ) { @@ -473,21 +473,21 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode ) } } -// ----------------------------------------------------------------------- + void Splitter::StartSplit() { maStartSplitHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Splitter::Split() { maSplitHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Splitter::EndSplit() { @@ -495,13 +495,13 @@ void Splitter::EndSplit() maEndSplitHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Splitter::Splitting( Point& /* rSplitPos */ ) { } -// ----------------------------------------------------------------------- + void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin ) { @@ -512,14 +512,14 @@ void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin ) mpRefWin = _pRefWin; } -// ----------------------------------------------------------------------- + void Splitter::SetSplitPosPixel( long nNewPos ) { mnSplitPos = nNewPos; } -// ----------------------------------------------------------------------- + void Splitter::StartDrag() { @@ -547,7 +547,7 @@ void Splitter::StartDrag() } -// ----------------------------------------------------------------------- + void Splitter::ImplStartKbdSplitting() { @@ -577,7 +577,7 @@ void Splitter::ImplStartKbdSplitting() mnStartSplitPos = maDragPos.Y(); } -// ----------------------------------------------------------------------- + void Splitter::ImplRestoreSplitter() { @@ -608,7 +608,7 @@ void Splitter::ImplRestoreSplitter() } -// ----------------------------------------------------------------------- + void Splitter::GetFocus() { @@ -618,7 +618,7 @@ void Splitter::GetFocus() Invalidate(); } -// ----------------------------------------------------------------------- + void Splitter::LoseFocus() { @@ -631,7 +631,7 @@ void Splitter::LoseFocus() Invalidate(); } -// ----------------------------------------------------------------------- + void Splitter::KeyInput( const KeyEvent& rKEvt ) { @@ -732,14 +732,14 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) mbInKeyEvent = 0; } -// ----------------------------------------------------------------------- + bool Splitter::Notify( NotifyEvent& rNEvt ) { return Window::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -762,7 +762,7 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void Splitter::Paint( const Rectangle& rPaintRect ) { diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 5cac8f0da7ff..834a8131ed15 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -42,7 +42,7 @@ #define STATUSBAR_PRGS_COUNT 100 #define STATUSBAR_PRGS_MIN 5 -// ----------------------------------------------------------------------- + class StatusBar::ImplData { @@ -91,7 +91,7 @@ inline long ImplCalcProgessWidth( sal_uInt16 nMax, long nSize ) return ((nMax*(nSize+(nSize/2)))-(nSize/2)+(STATUSBAR_PRGS_OFFSET*2)); } -// ----------------------------------------------------------------------- + static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize, sal_uInt16 nStyle ) @@ -112,7 +112,7 @@ static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize, return Point( nX, nY ); } -// ----------------------------------------------------------------------- + bool StatusBar::ImplIsItemUpdate() { @@ -122,7 +122,7 @@ bool StatusBar::ImplIsItemUpdate() return false; } -// ----------------------------------------------------------------------- + void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) { @@ -155,7 +155,7 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) SetOutputSizePixel( CalcWindowSizePixel() ); } -// ----------------------------------------------------------------------- + StatusBar::StatusBar( Window* pParent, WinBits nStyle ) : Window( WINDOW_STATUSBAR ) @@ -163,7 +163,7 @@ StatusBar::StatusBar( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + StatusBar::~StatusBar() { @@ -178,7 +178,7 @@ StatusBar::~StatusBar() delete mpImplData; } -// ----------------------------------------------------------------------- + void StatusBar::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -233,7 +233,7 @@ void StatusBar::ImplInitSettings( bool bFont, } } -// ----------------------------------------------------------------------- + void StatusBar::ImplFormat() { @@ -309,7 +309,7 @@ void StatusBar::ImplFormat() mbFormat = false; } -// ----------------------------------------------------------------------- + Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const { @@ -330,7 +330,7 @@ Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const return aRect; } -// ----------------------------------------------------------------------- + sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const { @@ -349,7 +349,7 @@ sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const return ~0; } -// ----------------------------------------------------------------------- + void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth ) { @@ -386,7 +386,7 @@ void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth ) } } -// ----------------------------------------------------------------------- + void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, bool bDrawFrame ) { @@ -487,7 +487,7 @@ void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, (void*) sal_IntPtr(pItem->mnId) ); } -// ----------------------------------------------------------------------- + void DrawProgress( Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, @@ -605,7 +605,7 @@ void DrawProgress( Window* pWindow, const Point& rPos, } } -// ----------------------------------------------------------------------- + void StatusBar::ImplDrawProgress( bool bPaint, sal_uInt16 nPercent1, sal_uInt16 nPercent2 ) @@ -634,7 +634,7 @@ void StatusBar::ImplDrawProgress( bool bPaint, nPercent1*100, nPercent2*100, mnPercentCount, maPrgsFrameRect ); } -// ----------------------------------------------------------------------- + void StatusBar::ImplCalcProgressRect() { @@ -688,7 +688,7 @@ void StatusBar::ImplCalcProgressRect() maPrgsTxtPos.Y() = mnTextY; } -// ----------------------------------------------------------------------- + void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -727,7 +727,7 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void StatusBar::Paint( const Rectangle& ) { @@ -759,14 +759,14 @@ void StatusBar::Paint( const Rectangle& ) DrawLine( Point( 0, 0 ), Point( mnDX-1, 0 ) ); } -// ----------------------------------------------------------------------- + void StatusBar::Move() { Window::Move(); } -// ----------------------------------------------------------------------- + void StatusBar::Resize() { @@ -788,7 +788,7 @@ void StatusBar::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void StatusBar::RequestHelp( const HelpEvent& rHEvt ) { @@ -855,7 +855,7 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + void StatusBar::StateChanged( StateChangedType nType ) { @@ -884,7 +884,7 @@ void StatusBar::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -917,7 +917,7 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void StatusBar::Click() { @@ -925,7 +925,7 @@ void StatusBar::Click() maClickHdl.Call( this ); } -// ----------------------------------------------------------------------- + void StatusBar::DoubleClick() { @@ -933,13 +933,13 @@ void StatusBar::DoubleClick() maDoubleClickHdl.Call( this ); } -// ----------------------------------------------------------------------- + void StatusBar::UserDraw( const UserDrawEvent& ) { } -// ----------------------------------------------------------------------- + void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, StatusBarItemBits nBits, @@ -979,7 +979,7 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, ImplCallEventListeners( VCLEVENT_STATUSBAR_ITEMADDED, (void*) sal_IntPtr(nItemId) ); } -// ----------------------------------------------------------------------- + void StatusBar::RemoveItem( sal_uInt16 nItemId ) { @@ -997,7 +997,7 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId ) } } -// ----------------------------------------------------------------------- + void StatusBar::ShowItem( sal_uInt16 nItemId ) { @@ -1019,7 +1019,7 @@ void StatusBar::ShowItem( sal_uInt16 nItemId ) } } -// ----------------------------------------------------------------------- + void StatusBar::HideItem( sal_uInt16 nItemId ) { @@ -1041,7 +1041,7 @@ void StatusBar::HideItem( sal_uInt16 nItemId ) } } -// ----------------------------------------------------------------------- + bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const { @@ -1068,14 +1068,14 @@ void StatusBar::Clear() ImplCallEventListeners( VCLEVENT_STATUSBAR_ALLITEMSREMOVED ); } -// ----------------------------------------------------------------------- + sal_uInt16 StatusBar::GetItemCount() const { return (sal_uInt16)mpItemList->size(); } -// ----------------------------------------------------------------------- + sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const { @@ -1084,7 +1084,7 @@ sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const return 0; } -// ----------------------------------------------------------------------- + sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const { @@ -1097,7 +1097,7 @@ sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const return STATUSBAR_ITEM_NOTFOUND; } -// ----------------------------------------------------------------------- + sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const { @@ -1117,7 +1117,7 @@ sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const return 0; } -// ----------------------------------------------------------------------- + Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const { @@ -1142,7 +1142,7 @@ Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const return aRect; } -// ----------------------------------------------------------------------- + Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const { @@ -1172,7 +1172,7 @@ Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const return Point(); } -// ----------------------------------------------------------------------- + sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const { @@ -1184,7 +1184,7 @@ sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const return 0; } -// ----------------------------------------------------------------------- + StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const { @@ -1196,7 +1196,7 @@ StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const return 0; } -// ----------------------------------------------------------------------- + long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const { @@ -1208,7 +1208,7 @@ long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const return 0; } -// ----------------------------------------------------------------------- + void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) { @@ -1244,7 +1244,7 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) } } -// ----------------------------------------------------------------------- + const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const { @@ -1255,7 +1255,7 @@ const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const return (*mpItemList)[ nPos ]->maText; } -// ----------------------------------------------------------------------- + void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ) { @@ -1270,7 +1270,7 @@ void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand ) } } -// ----------------------------------------------------------------------- + const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId ) { @@ -1282,7 +1282,7 @@ const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId ) return OUString(); } -// ----------------------------------------------------------------------- + void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData ) { @@ -1333,7 +1333,7 @@ void StatusBar::RedrawItem( sal_uInt16 nItemId ) } } -// ----------------------------------------------------------------------- + void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) { @@ -1343,7 +1343,7 @@ void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) (*mpItemList)[ nPos ]->maHelpText = rText; } -// ----------------------------------------------------------------------- + const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const { @@ -1367,7 +1367,7 @@ const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const return pItem->maHelpText; } -// ----------------------------------------------------------------------- + void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) { @@ -1377,7 +1377,7 @@ void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) (*mpItemList)[ nPos ]->maQuickHelpText = rText; } -// ----------------------------------------------------------------------- + const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const { @@ -1389,7 +1389,7 @@ const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const return pItem->maQuickHelpText; } -// ----------------------------------------------------------------------- + void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { @@ -1399,7 +1399,7 @@ void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) (*mpItemList)[ nPos ]->maHelpId = rHelpId; } -// ----------------------------------------------------------------------- + OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const { @@ -1444,7 +1444,7 @@ void StatusBar::StartProgressMode( const OUString& rText ) } } -// ----------------------------------------------------------------------- + void StatusBar::SetProgressValue( sal_uInt16 nNewPercent ) { @@ -1463,7 +1463,7 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent ) mnPercent = nNewPercent; } -// ----------------------------------------------------------------------- + void StatusBar::EndProgressMode() { @@ -1482,7 +1482,7 @@ void StatusBar::EndProgressMode() } } -// ----------------------------------------------------------------------- + void StatusBar::SetText( const OUString& rText ) { @@ -1517,7 +1517,7 @@ void StatusBar::SetText( const OUString& rText ) Window::SetText( rText ); } -// ----------------------------------------------------------------------- + Size StatusBar::CalcWindowSizePixel() const { @@ -1574,7 +1574,7 @@ Size StatusBar::CalcWindowSizePixel() const } -// ----------------------------------------------------------------------- + void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ) { @@ -1592,7 +1592,7 @@ void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ) } } -// ----------------------------------------------------------------------- + const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const { @@ -1603,6 +1603,6 @@ const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const return (*mpItemList)[ nPos ]->maAccessibleName; } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 203ccc5e70c7..a871d2db2914 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -127,7 +127,7 @@ void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, Syste } } -// ----------------------------------------------------------------------- + SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) : Window( WINDOW_SYSTEMCHILDWINDOW ) @@ -135,7 +135,7 @@ SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) : ImplInitSysChild( pParent, nStyle, NULL ); } -// ----------------------------------------------------------------------- + SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) : Window( WINDOW_SYSTEMCHILDWINDOW ) @@ -143,7 +143,7 @@ SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWin ImplInitSysChild( pParent, nStyle, pData, bShow ); } -// ----------------------------------------------------------------------- + SystemChildWindow::~SystemChildWindow() { @@ -155,7 +155,7 @@ SystemChildWindow::~SystemChildWindow() } } -// ----------------------------------------------------------------------- + const SystemEnvData* SystemChildWindow::GetSystemData() const { @@ -165,7 +165,7 @@ const SystemEnvData* SystemChildWindow::GetSystemData() const return NULL; } -// ----------------------------------------------------------------------- + void SystemChildWindow::EnableEraseBackground( bool bEnable ) { @@ -173,7 +173,7 @@ void SystemChildWindow::EnableEraseBackground( bool bEnable ) mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable ); } -// ----------------------------------------------------------------------- + void SystemChildWindow::ImplTestJavaException( void* pEnv ) { @@ -213,7 +213,7 @@ void SystemChildWindow::SetForwardKey( bool bEnable ) mpWindowImpl->mpSysObj->SetForwardKey( bEnable ); } -// ----------------------------------------------------------------------- + sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava ) { diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 94ae46949227..fb87f72f0a76 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -87,7 +87,7 @@ SystemWindow::~SystemWindow() mpImplData = NULL; } -// ----------------------------------------------------------------------- + bool SystemWindow::Notify( NotifyEvent& rNEvt ) { @@ -108,7 +108,7 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt ) return Window::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) { @@ -152,7 +152,7 @@ bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) return Window::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + TaskPaneList* SystemWindow::GetTaskPaneList() { @@ -174,7 +174,7 @@ TaskPaneList* SystemWindow::GetTaskPaneList() } } -// ----------------------------------------------------------------------- + bool SystemWindow::Close() { @@ -203,31 +203,31 @@ bool SystemWindow::Close() return true; } -// ----------------------------------------------------------------------- + void SystemWindow::TitleButtonClick( sal_uInt16 ) { } -// ----------------------------------------------------------------------- + void SystemWindow::Pin() { } -// ----------------------------------------------------------------------- + void SystemWindow::Roll() { } -// ----------------------------------------------------------------------- + void SystemWindow::Resizing( Size& ) { } -// ----------------------------------------------------------------------- + void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) { @@ -244,7 +244,7 @@ void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) } } -// ----------------------------------------------------------------------- + void SystemWindow::SetIcon( sal_uInt16 nIcon ) { @@ -264,7 +264,7 @@ void SystemWindow::SetIcon( sal_uInt16 nIcon ) } } -// ----------------------------------------------------------------------- + void SystemWindow::EnableSaveBackground( bool bSave ) { @@ -282,7 +282,7 @@ void SystemWindow::EnableSaveBackground( bool bSave ) } } -// ----------------------------------------------------------------------- + bool SystemWindow::IsSaveBackgroundEnabled() const { @@ -295,7 +295,7 @@ bool SystemWindow::IsSaveBackgroundEnabled() const return false; } -// ----------------------------------------------------------------------- + void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) { @@ -326,7 +326,7 @@ void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) return; } -// ----------------------------------------------------------------------- + bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const { @@ -336,7 +336,7 @@ bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const return mbHideBtn; } -// ----------------------------------------------------------------------- + void SystemWindow::SetPin( bool bPin ) { @@ -348,7 +348,7 @@ void SystemWindow::SetPin( bool bPin ) } } -// ----------------------------------------------------------------------- + void SystemWindow::RollUp() { @@ -368,7 +368,7 @@ void SystemWindow::RollUp() } } -// ----------------------------------------------------------------------- + void SystemWindow::RollDown() { @@ -382,7 +382,7 @@ void SystemWindow::RollDown() } } -// ----------------------------------------------------------------------- + void SystemWindow::SetMinOutputSizePixel( const Size& rSize ) { @@ -397,7 +397,7 @@ void SystemWindow::SetMinOutputSizePixel( const Size& rSize ) mpWindowImpl->mpFrame->SetMinClientSize( rSize.Width(), rSize.Height() ); } -// ----------------------------------------------------------------------- + void SystemWindow::SetMaxOutputSizePixel( const Size& rSize ) { @@ -422,7 +422,7 @@ const Size& SystemWindow::GetMaxOutputSizePixel() const { return mpImplData->maMaxOutSize; } -// ----------------------------------------------------------------------- + Size SystemWindow::GetResizeOutputSizePixel() const { @@ -434,7 +434,7 @@ Size SystemWindow::GetResizeOutputSizePixel() const return aSize; } -// ----------------------------------------------------------------------- + static void ImplWindowStateFromStr(WindowStateData& rData, const OString& rStr) @@ -550,7 +550,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData, rData.SetMask( nValidMask ); } -// ----------------------------------------------------------------------- + static OString ImplWindowStateToStr(const WindowStateData& rData) { @@ -596,7 +596,7 @@ static OString ImplWindowStateToStr(const WindowStateData& rData) return rStrBuf.makeStringAndClear(); } -// ----------------------------------------------------------------------- + void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin ) { @@ -806,7 +806,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) } } -// ----------------------------------------------------------------------- + void SystemWindow::GetWindowStateData( WindowStateData& rData ) const { @@ -893,7 +893,7 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const } } -// ----------------------------------------------------------------------- + void SystemWindow::SetWindowState(const OString& rStr) { @@ -905,7 +905,7 @@ void SystemWindow::SetWindowState(const OString& rStr) SetWindowStateData( aData ); } -// ----------------------------------------------------------------------- + OString SystemWindow::GetWindowState( sal_uLong nMask ) const { @@ -916,7 +916,7 @@ OString SystemWindow::GetWindowState( sal_uLong nMask ) const return ImplWindowStateToStr(aData); } -// ----------------------------------------------------------------------- + void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) { @@ -980,7 +980,7 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) } } -// ----------------------------------------------------------------------- + void SystemWindow::SetMenuBarMode( sal_uInt16 nMode ) { @@ -997,7 +997,7 @@ void SystemWindow::SetMenuBarMode( sal_uInt16 nMode ) } } -// ----------------------------------------------------------------------- + bool SystemWindow::ImplIsInTaskPaneList( Window* pWin ) { diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index 9bb2f242abc8..b2f8d718fda9 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -35,7 +35,7 @@ void TabDialog::ImplInitTabDialogData() mbPosControls = true; } -// ----------------------------------------------------------------------- + void TabDialog::ImplPosControls() { @@ -212,7 +212,7 @@ void TabDialog::ImplPosControls() mbPosControls = false; } -// ----------------------------------------------------------------------- + TabDialog::TabDialog( Window* pParent, WinBits nStyle ) : Dialog( WINDOW_TABDIALOG ) @@ -221,7 +221,7 @@ TabDialog::TabDialog( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + TabDialog::TabDialog( Window* pParent, const ResId& rResId ) : Dialog( WINDOW_TABDIALOG ) @@ -237,14 +237,14 @@ TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXM ImplInitTabDialogData(); } -// ----------------------------------------------------------------------- + TabDialog::~TabDialog() { delete mpFixedLine; } -// ----------------------------------------------------------------------- + void TabDialog::StateChanged( StateChangedType nType ) { @@ -257,7 +257,7 @@ void TabDialog::StateChanged( StateChangedType nType ) Dialog::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void TabDialog::AdjustLayout() { diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 8c64ba7e20e2..a8cbdb528404 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -49,7 +49,7 @@ void TabPage::ImplInit( Window* pParent, WinBits nStyle ) EnableChildTransparentMode( true ); } -// ----------------------------------------------------------------------- + void TabPage::ImplInitSettings() { @@ -74,7 +74,7 @@ void TabPage::ImplInitSettings() } } -// ----------------------------------------------------------------------- + TabPage::TabPage( Window* pParent, WinBits nStyle ) : Window( WINDOW_TABPAGE ) @@ -82,7 +82,7 @@ TabPage::TabPage( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + TabPage::TabPage( Window* pParent, const ResId& rResId ) : Window( WINDOW_TABPAGE ) @@ -103,7 +103,7 @@ TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDesc m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID); } -// ----------------------------------------------------------------------- + void TabPage::StateChanged( StateChangedType nType ) { @@ -123,7 +123,7 @@ void TabPage::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void TabPage::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -137,7 +137,7 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void TabPage::Paint( const Rectangle& ) { @@ -161,7 +161,7 @@ void TabPage::Paint( const Rectangle& ) } } -// ----------------------------------------------------------------------- + void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong ) { Point aPos = pDev->LogicToPixel( rPos ); @@ -189,13 +189,13 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sa pDev->Pop(); } -// ----------------------------------------------------------------------- + void TabPage::ActivatePage() { } -// ----------------------------------------------------------------------- + void TabPage::DeactivatePage() { diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index b111106dac21..da13a444f259 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -75,7 +75,7 @@ struct LTRSortBackward : public ::std::binary_function< const Window*, const Win } }; -// -------------------------------------------------- + static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward ) { @@ -86,7 +86,7 @@ static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward ) pWindow->ImplGrabFocus( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD)); } -// -------------------------------------------------- + TaskPaneList::TaskPaneList() { @@ -96,7 +96,7 @@ TaskPaneList::~TaskPaneList() { } -// -------------------------------------------------- + void TaskPaneList::AddWindow( Window *pWindow ) { @@ -136,7 +136,7 @@ void TaskPaneList::AddWindow( Window *pWindow ) } } -// -------------------------------------------------- + void TaskPaneList::RemoveWindow( Window *pWindow ) { @@ -149,7 +149,7 @@ void TaskPaneList::RemoveWindow( Window *pWindow ) } } -// -------------------------------------------------- + bool TaskPaneList::IsInList( Window *pWindow ) { @@ -161,7 +161,7 @@ bool TaskPaneList::IsInList( Window *pWindow ) return false; } -// -------------------------------------------------- + bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) { @@ -249,7 +249,7 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) return false; } -// -------------------------------------------------- + // returns next splitter Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) @@ -288,7 +288,7 @@ Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) return pWindow; } -// -------------------------------------------------- + // returns first valid item (regardless of type) if pWindow==0, otherwise returns next valid float Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward ) @@ -332,6 +332,6 @@ Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward ) return pWindow; } -// -------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index c89bb59c9298..175af19aa236 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -60,7 +60,7 @@ #define SMALLBUTTON_OFF_NORMAL_X 3 #define SMALLBUTTON_OFF_NORMAL_Y 3 -// ----------------------------------------------------------------------- + #define TB_TEXTOFFSET 2 #define TB_IMAGETEXTOFFSET 3 @@ -91,9 +91,9 @@ #define DOCK_LINEOFFSET 3 -// ----------------------------------------------------------------------- + static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow ); -// ----------------------------------------------------------------------- + typedef ::std::vector< ToolBox* > ImplTBList; @@ -149,7 +149,7 @@ public: bool IsResizeMode() { return mbResizeMode; } }; -// ----------------------------------------------------------------------- + static ImplTBDragMgr* ImplGetTBDragMgr() { @@ -159,7 +159,7 @@ static ImplTBDragMgr* ImplGetTBDragMgr() return pSVData->maCtrlData.mpTBDragMgr; } -// ----------------------------------------------------------------------- + int ToolBox::ImplGetDragWidth( ToolBox* pThis ) { @@ -198,7 +198,7 @@ ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType ) return tmpButtonType; } -// ----------------------------------------------------------------------- + void ToolBox::ImplUpdateDragArea( ToolBox *pThis ) { @@ -217,7 +217,7 @@ void ToolBox::ImplUpdateDragArea( ToolBox *pThis ) } } -// ----------------------------------------------------------------------- + void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop, long& rRight, long& rBottom, const ToolBox *pThis ) @@ -267,7 +267,7 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop, } } -// ----------------------------------------------------------------------- + static void ImplCheckUpdate( ToolBox *pThis ) { @@ -281,7 +281,7 @@ static void ImplCheckUpdate( ToolBox *pThis ) pThis->Update(); } -// ----------------------------------------------------------------------- + void ToolBox::ImplDrawGrip( ToolBox* pThis ) { @@ -663,7 +663,7 @@ void ToolBox::ImplDrawBorder( ToolBox* pWin ) } } -// ----------------------------------------------------------------------- + static bool ImplIsFixedControl( const ImplToolItem *pItem ) { @@ -673,7 +673,7 @@ static bool ImplIsFixedControl( const ImplToolItem *pItem ) pItem->mpWindow->GetType() == WINDOW_GROUPBOX) ); } -// ----------------------------------------------------------------------- + const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis ) { @@ -688,7 +688,7 @@ const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis ) return NULL; } -// ----------------------------------------------------------------------- + Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uInt16 nCalcMode ) { @@ -806,7 +806,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn return aSize; } -// ----------------------------------------------------------------------- + void ToolBox::ImplCalcFloatSizes( ToolBox* pThis ) { @@ -873,7 +873,7 @@ void ToolBox::ImplCalcFloatSizes( ToolBox* pThis ) } } -// ----------------------------------------------------------------------- + Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines ) { @@ -900,7 +900,7 @@ Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines ) return aSize; } -// ----------------------------------------------------------------------- + void ToolBox::ImplCalcMinMaxFloatSize( ToolBox* pThis, Size& rMinSize, Size& rMaxSize ) { @@ -942,7 +942,7 @@ void ToolBox::ImplSetMinMaxFloatSize( ToolBox *pThis ) } } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize ) @@ -976,7 +976,7 @@ sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize ) return static_cast<sal_uInt16>(nLines); } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) { @@ -1010,7 +1010,7 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) return 0; } -// ----------------------------------------------------------------------- + void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ) @@ -1106,7 +1106,7 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec pThis->mnDockLines = i; } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::ImplFindItemPos( ToolBox* pBox, const Point& rPos ) { @@ -1170,7 +1170,7 @@ sal_uInt16 ToolBox::ImplFindItemPos( ToolBox* pBox, const Point& rPos ) return nPos; } -// ----------------------------------------------------------------------- + ImplTBDragMgr::ImplTBDragMgr() { @@ -1187,14 +1187,14 @@ ImplTBDragMgr::ImplTBDragMgr() maAccel.SetSelectHdl( LINK( this, ImplTBDragMgr, SelectHdl ) ); } -// ----------------------------------------------------------------------- + ImplTBDragMgr::~ImplTBDragMgr() { delete mpBoxList; } -// ----------------------------------------------------------------------- + ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect ) { @@ -1225,7 +1225,7 @@ ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect ) return NULL; } -// ----------------------------------------------------------------------- + void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, const Point& rPos, const Rectangle& rRect, @@ -1270,7 +1270,7 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, pToolBox->ShowTracking( maRect ); } -// ----------------------------------------------------------------------- + void ImplTBDragMgr::Dragging( const Point& rPos ) { @@ -1304,7 +1304,7 @@ void ImplTBDragMgr::Dragging( const Point& rPos ) } } -// ----------------------------------------------------------------------- + void ImplTBDragMgr::EndDragging( bool bOK ) { @@ -1392,7 +1392,7 @@ void ImplTBDragMgr::EndDragging( bool bOK ) mpDragBox = NULL; } -// ----------------------------------------------------------------------- + void ImplTBDragMgr::UpdateDragRect() { @@ -1403,7 +1403,7 @@ void ImplTBDragMgr::UpdateDragRect() mpDragBox->ShowTracking( maRect ); } -// ----------------------------------------------------------------------- + IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) { @@ -1415,7 +1415,7 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) return sal_True; } -// ----------------------------------------------------------------------- + void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) { @@ -1496,7 +1496,7 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -// ----------------------------------------------------------------------- + void ToolBox::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -1563,7 +1563,7 @@ void ToolBox::ImplInitSettings( bool bFont, } } -// ----------------------------------------------------------------------- + void ToolBox::ImplLoadRes( const ResId& rResId ) { @@ -1620,7 +1620,7 @@ void ToolBox::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + ToolBox::ToolBox( Window* pParent, WinBits nStyle ) : DockingWindow( WINDOW_TOOLBOX ) @@ -1628,7 +1628,7 @@ ToolBox::ToolBox( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + ToolBox::ToolBox( Window* pParent, const ResId& rResId ) : DockingWindow( WINDOW_TOOLBOX ) @@ -1651,7 +1651,7 @@ ToolBox::ToolBox( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + ToolBox::~ToolBox() { @@ -1688,7 +1688,7 @@ ToolBox::~ToolBox() } } -// ----------------------------------------------------------------------- + ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const { @@ -1702,7 +1702,7 @@ ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const return NULL; } -// ----------------------------------------------------------------------- + static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButtons ) { @@ -1717,7 +1717,7 @@ static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButton } } -// ----------------------------------------------------------------------- + bool ToolBox::ImplCalcItem() { @@ -2005,7 +2005,7 @@ bool ToolBox::ImplCalcItem() return false; } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) { @@ -2156,7 +2156,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc return nLines; } -// ----------------------------------------------------------------------- + Size ToolBox::ImplGetOptimalFloatingSize() { @@ -2708,7 +2708,7 @@ void ToolBox::ImplFormat( bool bResize ) mbFormat = false; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) { @@ -2739,7 +2739,7 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) { @@ -2750,7 +2750,7 @@ IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) return 0; } -// ----------------------------------------------------------------------- + static void ImplDrawMoreIndicator( ToolBox *pBox, const Rectangle& rRect, bool bSetColor, bool bRotate ) { Color aOldFillColor = pBox->GetFillColor(); @@ -2878,7 +2878,7 @@ static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect pBox->SetLineColor( ); } -// ----------------------------------------------------------------------- + void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight ) { @@ -2920,7 +2920,7 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight ) } } -// ----------------------------------------------------------------------- + void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn ) { @@ -2951,7 +2951,7 @@ void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn ) bUpperIn, bLowerIn, bTmpUpper, bTmpLower, !mbHorz ); } -// ----------------------------------------------------------------------- + void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) { @@ -3000,7 +3000,7 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) } } -// ----------------------------------------------------------------------- + static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow ) { @@ -3356,7 +3356,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, pMgr->UpdateDragRect(); } -// ----------------------------------------------------------------------- + void ToolBox::ImplDrawFloatwinBorder( ImplToolItem* pItem ) { @@ -3431,7 +3431,7 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow ) } } -// ----------------------------------------------------------------------- + void ToolBox::ShowLine( bool bNext ) { @@ -3466,7 +3466,7 @@ void ToolBox::ShowLine( bool bNext ) ImplFormat(); } -// ----------------------------------------------------------------------- + bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) { @@ -3528,7 +3528,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) return false; } -// ----------------------------------------------------------------------- + bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) { @@ -3646,7 +3646,7 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) return false; } -// ----------------------------------------------------------------------- + void ToolBox::MouseMove( const MouseEvent& rMEvt ) { @@ -3867,7 +3867,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) DockingWindow::MouseMove( rMEvt ); } -// ----------------------------------------------------------------------- + void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -4093,7 +4093,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) DockingWindow::MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void ToolBox::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -4111,7 +4111,7 @@ void ToolBox::MouseButtonUp( const MouseEvent& rMEvt ) DockingWindow::MouseButtonUp( rMEvt ); } -// ----------------------------------------------------------------------- + void ToolBox::Tracking( const TrackingEvent& rTEvt ) { @@ -4130,7 +4130,7 @@ void ToolBox::Tracking( const TrackingEvent& rTEvt ) DockingWindow::Tracking( rTEvt ); } -// ----------------------------------------------------------------------- + void ToolBox::Paint( const Rectangle& rPaintRect ) { @@ -4185,14 +4185,14 @@ void ToolBox::Paint( const Rectangle& rPaintRect ) ImplShowFocus(); } -// ----------------------------------------------------------------------- + void ToolBox::Move() { DockingWindow::Move(); } -// ----------------------------------------------------------------------- + void ToolBox::Resize() { @@ -4302,7 +4302,7 @@ void ToolBox::Resize() } } -// ----------------------------------------------------------------------- + const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const { ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -4324,7 +4324,7 @@ const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const return pItem->maHelpText; } -// ----------------------------------------------------------------------- + void ToolBox::RequestHelp( const HelpEvent& rHEvt ) { @@ -4401,7 +4401,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) DockingWindow::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + bool ToolBox::Notify( NotifyEvent& rNEvt ) { @@ -4486,7 +4486,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) return DockingWindow::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void ToolBox::Command( const CommandEvent& rCEvt ) { @@ -4552,7 +4552,7 @@ void ToolBox::Command( const CommandEvent& rCEvt ) DockingWindow::Command( rCEvt ); } -// ----------------------------------------------------------------------- + void ToolBox::StateChanged( StateChangedType nType ) { @@ -4590,7 +4590,7 @@ void ToolBox::StateChanged( StateChangedType nType ) maStateChangedHandler.Call( &nType ); } -// ----------------------------------------------------------------------- + void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -4612,14 +4612,14 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) maDataChangedHandler.Call( (void*)&rDCEvt ); } -// ----------------------------------------------------------------------- + bool ToolBox::PrepareToggleFloatingMode() { return DockingWindow::PrepareToggleFloatingMode(); } -// ----------------------------------------------------------------------- + void ToolBox::ToggleFloatingMode() { @@ -4663,7 +4663,7 @@ void ToolBox::ToggleFloatingMode() ImplFormat(); } -// ----------------------------------------------------------------------- + void ToolBox::StartDocking() { @@ -4673,7 +4673,7 @@ void ToolBox::StartDocking() DockingWindow::StartDocking(); } -// ----------------------------------------------------------------------- + bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) { @@ -4799,7 +4799,7 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) return bFloatMode; } -// ----------------------------------------------------------------------- + void ToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) { @@ -4814,7 +4814,7 @@ void ToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) DockingWindow::EndDocking( rRect, bFloatMode ); } -// ----------------------------------------------------------------------- + void ToolBox::Resizing( Size& rSize ) { @@ -4960,7 +4960,7 @@ Size ToolBox::CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines ) const return aSize; } -// ----------------------------------------------------------------------- + Size ToolBox::CalcMinimumWindowSizePixel() const { @@ -5003,7 +5003,7 @@ Size ToolBox::CalcMinimumWindowSizePixel() const } } -// ----------------------------------------------------------------------- + void ToolBox::EnableCustomize( bool bEnable ) { @@ -5019,14 +5019,14 @@ void ToolBox::EnableCustomize( bool bEnable ) } } -// ----------------------------------------------------------------------- + void ToolBox::GetFocus() { DockingWindow::GetFocus(); } -// ----------------------------------------------------------------------- + void ToolBox::LoseFocus() { @@ -5035,7 +5035,7 @@ void ToolBox::LoseFocus() DockingWindow::LoseFocus(); } -// ----------------------------------------------------------------------- + // performs the action associated with an item, ie simulates clicking the item void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) @@ -5050,7 +5050,7 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) ImplActivateItem( aKeyCode ); } -// ----------------------------------------------------------------------- + // calls the button's action handler // returns sal_True if action was called @@ -5114,7 +5114,7 @@ bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) return bRet; } -// ----------------------------------------------------------------------- + bool ImplCloseLastPopup( Window *pParent ) { @@ -5181,7 +5181,7 @@ bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) return bRet; } -// ----------------------------------------------------------------------- + void ToolBox::KeyInput( const KeyEvent& rKEvt ) { @@ -5371,7 +5371,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) DockingWindow::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + // returns the current toolbox line of the item sal_uInt16 ToolBox::ImplGetItemLine( ImplToolItem* pCurrentItem ) @@ -5421,7 +5421,7 @@ ImplToolItem* ToolBox::ImplGetFirstValidItem( sal_uInt16 nLine ) return (it == mpData->m_aItems.end()) ? NULL : &(*it); } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList ) { @@ -5519,7 +5519,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus ) mbChangingHighlight = false; } -// ----------------------------------------------------------------------- + // check for keyboard accessible items static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) @@ -5530,7 +5530,7 @@ static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) return bValid; } -// ----------------------------------------------------------------------- + bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle ) { @@ -5693,7 +5693,7 @@ bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle ) return true; } -// ----------------------------------------------------------------------- + void ToolBox::ImplShowFocus() { @@ -5709,7 +5709,7 @@ void ToolBox::ImplShowFocus() } } -// ----------------------------------------------------------------------- + void ToolBox::ImplHideFocus() { @@ -5731,7 +5731,7 @@ void ToolBox::ImplHideFocus() } } -// ----------------------------------------------------------------------- + void ToolBox::ImplDisableFlatButtons() { diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 72039beca9bc..f1aad48bcf7b 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -60,7 +60,7 @@ using namespace com::sun::star; #define TB_SEP_SIZE 8 -// ----------------------------------------------------------------------- + ImplToolBoxPrivateData::ImplToolBoxPrivateData() : m_pLayoutData( NULL ), @@ -97,7 +97,7 @@ ImplToolBoxPrivateData::~ImplToolBoxPrivateData() delete mpMenu; } -// ----------------------------------------------------------------------- + void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, bool bEmptyBtn) { @@ -125,7 +125,7 @@ ImplToolItem::ImplToolItem() init(0, 0, true); } -// ----------------------------------------------------------------------- + ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage, ToolBoxItemBits nItemBits ) : @@ -134,7 +134,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage, init(nItemId, nItemBits, false); } -// ----------------------------------------------------------------------- + ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const OUString& rText, ToolBoxItemBits nItemBits ) : @@ -143,7 +143,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const OUString& rText, init(nItemId, nItemBits, false); } -// ----------------------------------------------------------------------- + ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage, const OUString& rText, ToolBoxItemBits nItemBits ) : @@ -153,7 +153,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage, init(nItemId, nItemBits, false); } -// ----------------------------------------------------------------------- + ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) : mpWindow ( rItem.mpWindow ), @@ -188,13 +188,13 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) : { } -// ----------------------------------------------------------------------- + ImplToolItem::~ImplToolItem() { } -// ----------------------------------------------------------------------- + ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem ) { @@ -230,7 +230,7 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem ) return *this; } -// ----------------------------------------------------------------------- + Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ) { @@ -284,7 +284,7 @@ Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, cons return aSize; } -// ----------------------------------------------------------------------- + void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, bool& rbImage, bool& rbText ) const { @@ -344,7 +344,7 @@ void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, bool& rbIma } } -// ----------------------------------------------------------------------- + Rectangle ImplToolItem::GetDropDownRect( bool bHorz ) const { @@ -362,22 +362,22 @@ Rectangle ImplToolItem::GetDropDownRect( bool bHorz ) const return aRect; } -// ----------------------------------------------------------------------- + bool ImplToolItem::IsClipped() const { return ( meType == TOOLBOXITEM_BUTTON && mbVisible && maRect.IsEmpty() ); } -// ----------------------------------------------------------------------- + bool ImplToolItem::IsItemHidden() const { return ( meType == TOOLBOXITEM_BUTTON && !mbVisible ); } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + const OUString ToolBox::ImplConvertMenuString( const OUString& rStr ) { @@ -388,7 +388,7 @@ const OUString ToolBox::ImplConvertMenuString( const OUString& rStr ) return aCvtStr; } -// ----------------------------------------------------------------------- + void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint ) { @@ -425,7 +425,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint ) ImplCallEventListeners( VCLEVENT_TOOLBOX_FORMATCHANGED ); } -// ----------------------------------------------------------------------- + void ToolBox::ImplUpdateItem( sal_uInt16 nIndex ) { @@ -451,7 +451,7 @@ void ToolBox::ImplUpdateItem( sal_uInt16 nIndex ) } } -// ----------------------------------------------------------------------- + void ToolBox::Click() { @@ -459,7 +459,7 @@ void ToolBox::Click() maClickHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ToolBox::DoubleClick() { @@ -467,7 +467,7 @@ void ToolBox::DoubleClick() maDoubleClickHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ToolBox::Activate() { @@ -476,7 +476,7 @@ void ToolBox::Activate() maActivateHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ToolBox::Deactivate() { @@ -485,7 +485,7 @@ void ToolBox::Deactivate() maDeactivateHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ToolBox::Highlight() { @@ -493,7 +493,7 @@ void ToolBox::Highlight() maHighlightHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ToolBox::Select() { @@ -513,19 +513,19 @@ void ToolBox::Select() pWrapper->GetFloatingWindow()->EndPopupMode(); } -// ----------------------------------------------------------------------- + void ToolBox::Customize( const ToolBoxCustomizeEvent& ) { } -// ----------------------------------------------------------------------- + void ToolBox::UserDraw( const UserDrawEvent& ) { } -// ----------------------------------------------------------------------- + void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos ) { @@ -618,7 +618,7 @@ void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos ) ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } -// ----------------------------------------------------------------------- + void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, ToolBoxItemBits nBits, sal_uInt16 nPos ) @@ -639,7 +639,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >(nNewPos ) ); } -// ----------------------------------------------------------------------- + void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, const OUString& rText, @@ -661,7 +661,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } -// ----------------------------------------------------------------------- + void ToolBox::InsertItem( sal_uInt16 nItemId, const OUString& rText, ToolBoxItemBits nBits, sal_uInt16 nPos ) @@ -798,7 +798,7 @@ void ToolBox::InsertItem(const OUString& rCommand, const uno::Reference<frame::X pItem->maMinimalItemSize = rRequestedSize; } -// ----------------------------------------------------------------------- + void ToolBox::InsertWindow( sal_uInt16 nItemId, Window* pWindow, ToolBoxItemBits nBits, sal_uInt16 nPos ) @@ -826,7 +826,7 @@ void ToolBox::InsertWindow( sal_uInt16 nItemId, Window* pWindow, ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } -// ----------------------------------------------------------------------- + void ToolBox::InsertSpace( sal_uInt16 nPos ) { @@ -844,7 +844,7 @@ void ToolBox::InsertSpace( sal_uInt16 nPos ) ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } -// ----------------------------------------------------------------------- + void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize ) { @@ -864,7 +864,7 @@ void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize ) ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } -// ----------------------------------------------------------------------- + void ToolBox::InsertBreak( sal_uInt16 nPos ) { @@ -882,7 +882,7 @@ void ToolBox::InsertBreak( sal_uInt16 nPos ) ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); } -// ----------------------------------------------------------------------- + void ToolBox::RemoveItem( sal_uInt16 nPos ) { @@ -916,7 +916,7 @@ void ToolBox::RemoveItem( sal_uInt16 nPos ) } } -// ----------------------------------------------------------------------- + void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId, sal_uInt16 nNewPos ) @@ -946,7 +946,7 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId, } } -// ----------------------------------------------------------------------- + void ToolBox::Clear() { @@ -963,7 +963,7 @@ void ToolBox::Clear() ImplCallEventListeners( VCLEVENT_TOOLBOX_ALLITEMSCHANGED ); } -// ----------------------------------------------------------------------- + void ToolBox::SetButtonType( ButtonType eNewType ) { @@ -977,7 +977,7 @@ void ToolBox::SetButtonType( ButtonType eNewType ) } } -// ----------------------------------------------------------------------- + void ToolBox::SetToolboxButtonSize( ToolBoxButtonSize eSize ) { @@ -994,7 +994,7 @@ ToolBoxButtonSize ToolBox::GetToolboxButtonSize() const return mpData->meButtonSize; } -// ----------------------------------------------------------------------- + /*static*/ Size ToolBox::GetDefaultImageSize(bool bLarge) @@ -1013,7 +1013,7 @@ Size ToolBox::GetDefaultImageSize() const return GetDefaultImageSize( GetToolboxButtonSize() == TOOLBOX_BUTTONSIZE_LARGE ); } -// ----------------------------------------------------------------------- + void ToolBox::SetAlign( WindowAlign eNewAlign ) { @@ -1041,7 +1041,7 @@ void ToolBox::SetAlign( WindowAlign eNewAlign ) } } -// ----------------------------------------------------------------------- + void ToolBox::SetLineCount( sal_uInt16 nNewLines ) { @@ -1058,28 +1058,28 @@ void ToolBox::SetLineCount( sal_uInt16 nNewLines ) } } -// ----------------------------------------------------------------------- + void ToolBox::SetPageScroll( bool b ) { mpData->mbPageScroll = b; } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::GetItemCount() const { return (sal_uInt16)mpData->m_aItems.size(); } -// ----------------------------------------------------------------------- + ToolBoxItemType ToolBox::GetItemType( sal_uInt16 nPos ) const { return (nPos < mpData->m_aItems.size()) ? mpData->m_aItems[nPos].meType : TOOLBOXITEM_DONTKNOW; } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::GetItemPos( sal_uInt16 nItemId ) const { @@ -1091,7 +1091,7 @@ sal_uInt16 ToolBox::GetItemPos( sal_uInt16 nItemId ) const return TOOLBOX_ITEM_NOTFOUND; } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::GetItemPos( const Point& rPos ) const { @@ -1115,14 +1115,14 @@ sal_uInt16 ToolBox::GetItemPos( const Point& rPos ) const return nRet; } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::GetItemId( sal_uInt16 nPos ) const { return (nPos < mpData->m_aItems.size()) ? mpData->m_aItems[nPos].mnId : 0; } -// ----------------------------------------------------------------------- + sal_uInt16 ToolBox::GetItemId( const Point& rPos ) const { @@ -1156,7 +1156,7 @@ sal_uInt16 ToolBox::GetItemId(const OUString &rCommand) const return 0; } -// ----------------------------------------------------------------------- + Point ToolBox::ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const { @@ -1218,7 +1218,7 @@ Point ToolBox::GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) con return ImplGetPopupPosition( GetItemRect( nItemId ), rSize ); } -// ----------------------------------------------------------------------- + Rectangle ToolBox::GetItemRect( sal_uInt16 nItemId ) const { @@ -1229,7 +1229,7 @@ Rectangle ToolBox::GetItemRect( sal_uInt16 nItemId ) const return GetItemPosRect( nPos ); } -// ----------------------------------------------------------------------- + Rectangle ToolBox::GetItemPosRect( sal_uInt16 nPos ) const { @@ -1254,7 +1254,7 @@ Size ToolBox::GetItemContentSize( sal_uInt16 nItemId ) const return Size(); } -// ----------------------------------------------------------------------- + bool ToolBox::ImplHasExternalMenubutton() { @@ -1269,7 +1269,7 @@ bool ToolBox::ImplHasExternalMenubutton() } return bRet; } -// ----------------------------------------------------------------------- + void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ) { @@ -1288,7 +1288,7 @@ void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ) } } -// ----------------------------------------------------------------------- + ToolBoxItemBits ToolBox::GetItemBits( sal_uInt16 nItemId ) const { @@ -1313,7 +1313,7 @@ void ToolBox::SetItemExpand( sal_uInt16 nItemId, bool bExpand ) } } -// ----------------------------------------------------------------------- + bool ToolBox::GetItemExpand( sal_uInt16 nItemId ) const { @@ -1323,7 +1323,7 @@ bool ToolBox::GetItemExpand( sal_uInt16 nItemId ) const return pItem->mbExpand; } -// ----------------------------------------------------------------------- + void ToolBox::SetItemData( sal_uInt16 nItemId, void* pNewData ) { @@ -1336,7 +1336,7 @@ void ToolBox::SetItemData( sal_uInt16 nItemId, void* pNewData ) } } -// ----------------------------------------------------------------------- + void* ToolBox::GetItemData( sal_uInt16 nItemId ) const { @@ -1348,7 +1348,7 @@ void* ToolBox::GetItemData( sal_uInt16 nItemId ) const return NULL; } -// ----------------------------------------------------------------------- + void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) { @@ -1388,7 +1388,7 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) } } -// ----------------------------------------------------------------------- + void ToolBox::SetImageList( const ImageList& rImageList ) { @@ -1405,7 +1405,7 @@ void ToolBox::SetImageList( const ImageList& rImageList ) } } -// ----------------------------------------------------------------------- + static Image ImplRotImage( const Image& rImage, long nAngle10 ) { @@ -1448,7 +1448,7 @@ void ToolBox::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ) } } -// ----------------------------------------------------------------------- + static Image ImplMirrorImage( const Image& rImage ) { @@ -1486,7 +1486,7 @@ void ToolBox::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ) } } -// ----------------------------------------------------------------------- + Image ToolBox::GetItemImage( sal_uInt16 nItemId ) const { @@ -1498,7 +1498,7 @@ Image ToolBox::GetItemImage( sal_uInt16 nItemId ) const return Image(); } -// ----------------------------------------------------------------------- + void ToolBox::SetItemText( sal_uInt16 nItemId, const OUString& rText ) { @@ -1530,7 +1530,7 @@ void ToolBox::SetItemText( sal_uInt16 nItemId, const OUString& rText ) } } -// ----------------------------------------------------------------------- + const OUString& ToolBox::GetItemText( sal_uInt16 nItemId ) const { @@ -1542,7 +1542,7 @@ const OUString& ToolBox::GetItemText( sal_uInt16 nItemId ) const return pItem->maText; } -// ----------------------------------------------------------------------- + void ToolBox::SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ) { @@ -1559,7 +1559,7 @@ void ToolBox::SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ) } } -// ----------------------------------------------------------------------- + Window* ToolBox::GetItemWindow( sal_uInt16 nItemId ) const { @@ -1571,7 +1571,7 @@ Window* ToolBox::GetItemWindow( sal_uInt16 nItemId ) const return NULL; } -// ----------------------------------------------------------------------- + void ToolBox::StartSelection() { @@ -1587,7 +1587,7 @@ void ToolBox::StartSelection() } } -// ----------------------------------------------------------------------- + void ToolBox::EndSelection() { @@ -1612,7 +1612,7 @@ void ToolBox::EndSelection() mnMouseModifier = 0; } -// ----------------------------------------------------------------------- + void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease ) { @@ -1658,7 +1658,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease ) } } -// ----------------------------------------------------------------------- + void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState ) { @@ -1721,7 +1721,7 @@ void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState ) } } -// ----------------------------------------------------------------------- + TriState ToolBox::GetItemState( sal_uInt16 nItemId ) const { @@ -1733,7 +1733,7 @@ TriState ToolBox::GetItemState( sal_uInt16 nItemId ) const return STATE_NOCHECK; } -// ----------------------------------------------------------------------- + void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable ) { @@ -1765,7 +1765,7 @@ void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable ) } } -// ----------------------------------------------------------------------- + bool ToolBox::IsItemEnabled( sal_uInt16 nItemId ) const { @@ -1777,7 +1777,7 @@ bool ToolBox::IsItemEnabled( sal_uInt16 nItemId ) const return false; } -// ----------------------------------------------------------------------- + void ToolBox::ShowItem( sal_uInt16 nItemId, bool bVisible ) { @@ -1795,7 +1795,7 @@ void ToolBox::ShowItem( sal_uInt16 nItemId, bool bVisible ) } } -// ----------------------------------------------------------------------- + bool ToolBox::IsItemVisible( sal_uInt16 nItemId ) const { @@ -1807,7 +1807,7 @@ bool ToolBox::IsItemVisible( sal_uInt16 nItemId ) const return false; } -// ----------------------------------------------------------------------- + bool ToolBox::IsItemReallyVisible( sal_uInt16 nItemId ) const { @@ -1825,7 +1825,7 @@ bool ToolBox::IsItemReallyVisible( sal_uInt16 nItemId ) const return bRet; } -// ----------------------------------------------------------------------- + void ToolBox::SetItemCommand(sal_uInt16 nItemId, const OUString& rCommand) { @@ -1835,7 +1835,7 @@ void ToolBox::SetItemCommand(sal_uInt16 nItemId, const OUString& rCommand) pItem->maCommandStr = rCommand; } -// ----------------------------------------------------------------------- + const OUString ToolBox::GetItemCommand( sal_uInt16 nItemId ) const { @@ -1847,7 +1847,7 @@ const OUString ToolBox::GetItemCommand( sal_uInt16 nItemId ) const return OUString(); } -// ----------------------------------------------------------------------- + void ToolBox::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) { @@ -1857,7 +1857,7 @@ void ToolBox::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText ) pItem->maQuickHelpText = rText; } -// ----------------------------------------------------------------------- + const OUString& ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const { @@ -1871,7 +1871,7 @@ const OUString& ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const return sEmpty; } -// ----------------------------------------------------------------------- + void ToolBox::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) { @@ -1881,14 +1881,14 @@ void ToolBox::SetHelpText( sal_uInt16 nItemId, const OUString& rText ) pItem->maHelpText = rText; } -// ----------------------------------------------------------------------- + const OUString& ToolBox::GetHelpText( sal_uInt16 nItemId ) const { return ImplGetHelpText( nItemId ); } -// ----------------------------------------------------------------------- + void ToolBox::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) { @@ -1898,7 +1898,7 @@ void ToolBox::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ) pItem->maHelpId = rHelpId; } -// ----------------------------------------------------------------------- + OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const { @@ -1917,7 +1917,7 @@ OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const return aRet; } -// ----------------------------------------------------------------------- + void ToolBox::SetOutStyle( sal_uInt16 nNewStyle ) { @@ -1940,7 +1940,7 @@ void ToolBox::SetOutStyle( sal_uInt16 nNewStyle ) } } -// ----------------------------------------------------------------------- + // disable key input if all items are disabled @@ -1959,7 +1959,7 @@ void ToolBox::ImplUpdateInputEnable() mpData->mbKeyInputDisabled = true; } -// ----------------------------------------------------------------------- + void ToolBox::ImplFillLayoutData() const { @@ -1976,7 +1976,7 @@ void ToolBox::ImplFillLayoutData() const } } -// ----------------------------------------------------------------------- + OUString ToolBox::GetDisplayText() const { @@ -1985,7 +1985,7 @@ OUString ToolBox::GetDisplayText() const return mpData->m_pLayoutData ? OUString(mpData->m_pLayoutData->m_aDisplayText) : OUString(); } -// ----------------------------------------------------------------------- + Rectangle ToolBox::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const { @@ -2006,7 +2006,7 @@ Rectangle ToolBox::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const return (mpData->m_pLayoutData && nItemIndex != -1) ? mpData->m_pLayoutData->GetCharacterBounds( nItemIndex+nIndex ) : Rectangle(); } -// ----------------------------------------------------------------------- + long ToolBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const { @@ -2030,7 +2030,7 @@ long ToolBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const return nIndex; } -// ----------------------------------------------------------------------- + void ToolBox::SetDropdownClickHdl( const Link& rLink ) { @@ -2042,7 +2042,7 @@ const Link& ToolBox::GetDropdownClickHdl() const return mpData->maDropdownClickHdl; } -// ----------------------------------------------------------------------- + void ToolBox::SetMenuType( sal_uInt16 aType ) { @@ -2089,7 +2089,7 @@ void ToolBox::SetMenuButtonHdl( const Link& rLink ) mpData->maMenuButtonHdl = rLink; } -// ----------------------------------------------------------------------- + bool ToolBox::ImplHasClippedItems() { @@ -2250,7 +2250,7 @@ void ToolBox::ExecuteCustomMenu() } } -// ----------------------------------------------------------------------- + // checks override first, useful during calculation of sizes bool ToolBox::ImplIsFloatingMode() const @@ -2278,7 +2278,7 @@ bool ToolBox::ImplIsInPopupMode() const } } -// ----------------------------------------------------------------------- + void ToolBox::Lock( bool bLock ) { @@ -2298,7 +2298,7 @@ void ToolBox::Lock( bool bLock ) } } -// ----------------------------------------------------------------------- + bool ToolBox::AlwaysLocked() { @@ -2372,6 +2372,6 @@ void ToolBox::SetImageListProvider(vcl::IImageListProvider* _pProvider) mpData->mpImageListProvider = _pProvider; ImplUpdateImageList(); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 8a3f00645e13..d68ec89ffa0f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -117,7 +117,7 @@ using ::com::sun::star::awt::XTopWindow; #define IMPL_PAINT_ERASE ((sal_uInt16)0x0010) #define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020) -// ----------------------------------------------------------------------- + struct ImplCalcToTopData { @@ -142,7 +142,7 @@ ImplAccessibleInfos::~ImplAccessibleInfos() delete pAccessibleDescription; } -// ----------------------------------------------------------------------- + WindowImpl::WindowImpl( WindowType nType ) { @@ -303,7 +303,7 @@ WindowImpl::~WindowImpl() } -// ----------------------------------------------------------------------- + // helper method to allow inline constructor even for pWindow!=NULL case void ImplDelData::AttachToWindow( const Window* pWindow ) @@ -312,7 +312,7 @@ void ImplDelData::AttachToWindow( const Window* pWindow ) const_cast<Window*>(pWindow)->ImplAddDel( this ); } -// ----------------------------------------------------------------------- + // define dtor for ImplDelData ImplDelData::~ImplDelData() @@ -327,7 +327,7 @@ ImplDelData::~ImplDelData() } } -// ----------------------------------------------------------------------- + #ifdef DBG_UTIL const char* ImplDbgCheckWindow( const void* pObj ) @@ -405,7 +405,7 @@ void Window::ImplInitAppFontData( Window* pWindow ) pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*pSVData->maAppData.mnDialogScaleX)/100; } -// ----------------------------------------------------------------------- + bool Window::ImplCheckUIFont( const Font& rFont ) { @@ -448,7 +448,7 @@ bool Window::ImplCheckUIFont( const Font& rFont ) return bUIFontOk; } -// ----------------------------------------------------------------------- + void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) { @@ -699,7 +699,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) GetpApp()->OverrideSystemSettings( rSettings ); } -// ----------------------------------------------------------------------- + MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Window* pDest ) { @@ -708,7 +708,7 @@ MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Windo return MouseEvent( aPos, rE.GetClicks(), rE.GetMode(), rE.GetButtons(), rE.GetModifier() ); } -// ----------------------------------------------------------------------- + CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSource, Window* pDest ) { @@ -738,7 +738,7 @@ void Window::ImplInitWindowData( WindowType nType ) mbEnableRTL = Application::GetSettings().GetLayoutRTL(); // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active } -// ----------------------------------------------------------------------- + void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) { @@ -1021,7 +1021,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste GetAccessibleParentWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this ); } -// ----------------------------------------------------------------------- + void Window::ImplSetFrameParent( const Window* pParent ) { @@ -1041,7 +1041,7 @@ void Window::ImplSetFrameParent( const Window* pParent ) } } -// ----------------------------------------------------------------------- + void Window::ImplInsertWindow( Window* pParent ) { @@ -1092,7 +1092,7 @@ void Window::ImplInsertWindow( Window* pParent ) } } -// ----------------------------------------------------------------------- + void Window::ImplRemoveWindow( bool bRemoveFrameData ) { @@ -1176,7 +1176,7 @@ void Window::reorderWithinParent(sal_uInt16 nNewPosition) mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild = this; } -// ----------------------------------------------------------------------- + void Window::ImplCallResize() { @@ -1192,7 +1192,7 @@ void Window::ImplCallResize() ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE ); } -// ----------------------------------------------------------------------- + void Window::ImplCallMove() { @@ -1236,7 +1236,7 @@ void Window::ImplCallMove() ImplCallEventListeners( VCLEVENT_WINDOW_MOVE ); } -// ----------------------------------------------------------------------- + static OString ImplAutoHelpID( ResMgr* pResMgr ) { @@ -1248,7 +1248,7 @@ static OString ImplAutoHelpID( ResMgr* pResMgr ) return aRet; } -// ----------------------------------------------------------------------- + WinBits Window::ImplInitRes( const ResId& rResId ) { @@ -1261,7 +1261,7 @@ WinBits Window::ImplInitRes( const ResId& rResId ) return nStyle; } -// ----------------------------------------------------------------------- + WindowResHeader Window::ImplLoadResHeader( const ResId& rResId ) { @@ -1373,7 +1373,7 @@ void Window::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + ImplWinData* Window::ImplGetWinData() const { @@ -1399,7 +1399,7 @@ ImplWinData* Window::ImplGetWinData() const return mpWindowImpl->mpWinData; } -// ----------------------------------------------------------------------- + SalGraphics* Window::ImplGetFrameGraphics() const { @@ -1416,7 +1416,7 @@ SalGraphics* Window::ImplGetFrameGraphics() const return mpWindowImpl->mpFrameWindow->mpGraphics; } -// ----------------------------------------------------------------------- + Window* Window::ImplFindWindow( const Point& rFramePos ) { @@ -1459,7 +1459,7 @@ Window* Window::ImplFindWindow( const Point& rFramePos ) return NULL; } -// ----------------------------------------------------------------------- + sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) { @@ -1488,7 +1488,7 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) return nHitTest; } -// ----------------------------------------------------------------------- + bool Window::ImplIsRealParentPath( const Window* pWindow ) const { @@ -1503,7 +1503,7 @@ bool Window::ImplIsRealParentPath( const Window* pWindow ) const return false; } -// ----------------------------------------------------------------------- + bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const { @@ -1522,7 +1522,7 @@ bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const return false; } -// ----------------------------------------------------------------------- + bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const { @@ -1531,7 +1531,7 @@ bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) co return ImplIsChild( pWindow, bSystemWindow ); } -// ----------------------------------------------------------------------- + int Window::ImplTestMousePointerSet() { @@ -1547,7 +1547,7 @@ int Window::ImplTestMousePointerSet() return sal_False; } -// ----------------------------------------------------------------------- + PointerStyle Window::ImplGetMousePointer() const { @@ -1591,7 +1591,7 @@ PointerStyle Window::ImplGetMousePointer() const return ePointerStyle; } -// ----------------------------------------------------------------------- + void Window::ImplResetReallyVisible() { @@ -1626,7 +1626,7 @@ void Window::ImplResetReallyVisible() } } -// ----------------------------------------------------------------------- + void Window::ImplSetReallyVisible() { @@ -1668,7 +1668,7 @@ void Window::ImplSetReallyVisible() } } -// ----------------------------------------------------------------------- + void Window::ImplCallInitShow() { @@ -1694,7 +1694,7 @@ void Window::ImplCallInitShow() } } -// ----------------------------------------------------------------------- + void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok { @@ -1707,7 +1707,7 @@ void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompat } } -// ----------------------------------------------------------------------- + void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok { @@ -1723,7 +1723,7 @@ void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incom } } -// ----------------------------------------------------------------------- + void Window::ImplInitResolutionSettings() { @@ -1757,7 +1757,7 @@ void Window::ImplInitResolutionSettings() } } -// ----------------------------------------------------------------------- + void Window::ImplPointToLogic( Font& rFont ) const { @@ -1784,7 +1784,7 @@ void Window::ImplPointToLogic( Font& rFont ) const rFont.SetSize( aSize ); } -// ----------------------------------------------------------------------- + void Window::ImplLogicToPoint( Font& rFont ) const { @@ -1811,7 +1811,7 @@ void Window::ImplLogicToPoint( Font& rFont ) const rFont.SetSize( aSize ); } -// ----------------------------------------------------------------------- + bool Window::ImplSysObjClip( const Region* pOldRegion ) { @@ -1900,7 +1900,7 @@ bool Window::ImplSysObjClip( const Region* pOldRegion ) return bUpdate; } -// ----------------------------------------------------------------------- + void Window::ImplUpdateSysObjChildrenClip() { @@ -1915,7 +1915,7 @@ void Window::ImplUpdateSysObjChildrenClip() } } -// ----------------------------------------------------------------------- + void Window::ImplUpdateSysObjOverlapsClip() { @@ -1929,7 +1929,7 @@ void Window::ImplUpdateSysObjOverlapsClip() } } -// ----------------------------------------------------------------------- + void Window::ImplUpdateSysObjClip() { @@ -1952,7 +1952,7 @@ void Window::ImplUpdateSysObjClip() mpWindowImpl->mpFrameWindow->ImplUpdateSysObjOverlapsClip(); } -// ----------------------------------------------------------------------- + bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) { @@ -1999,7 +1999,7 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) return bUpdate; } -// ----------------------------------------------------------------------- + bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller ) { @@ -2016,7 +2016,7 @@ bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller ) return bUpdate; } -// ----------------------------------------------------------------------- + bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) { @@ -2050,7 +2050,7 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) return mpWindowImpl->mpFrameWindow->ImplSetClipFlagOverlapWindows( bSysObjOnlySmaller ); } -// ----------------------------------------------------------------------- + void Window::ImplIntersectWindowClipRegion( Region& rRegion ) { @@ -2060,7 +2060,7 @@ void Window::ImplIntersectWindowClipRegion( Region& rRegion ) rRegion.Intersect( mpWindowImpl->maWinClipRegion ); } -// ----------------------------------------------------------------------- + void Window::ImplIntersectWindowRegion( Region& rRegion ) { @@ -2070,7 +2070,7 @@ void Window::ImplIntersectWindowRegion( Region& rRegion ) rRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); } -// ----------------------------------------------------------------------- + void Window::ImplExcludeWindowRegion( Region& rRegion ) { @@ -2090,7 +2090,7 @@ void Window::ImplExcludeWindowRegion( Region& rRegion ) } } -// ----------------------------------------------------------------------- + void Window::ImplExcludeOverlapWindows( Region& rRegion ) { @@ -2107,7 +2107,7 @@ void Window::ImplExcludeOverlapWindows( Region& rRegion ) } } -// ----------------------------------------------------------------------- + void Window::ImplExcludeOverlapWindows2( Region& rRegion ) { @@ -2117,7 +2117,7 @@ void Window::ImplExcludeOverlapWindows2( Region& rRegion ) ImplExcludeOverlapWindows( rRegion ); } -// ----------------------------------------------------------------------- + void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) { @@ -2152,7 +2152,7 @@ void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) ImplGetParent()->ImplIntersectWindowClipRegion( rRegion ); } -// ----------------------------------------------------------------------- + bool Window::ImplClipChildren( Region& rRegion ) { @@ -2177,7 +2177,7 @@ bool Window::ImplClipChildren( Region& rRegion ) return bOtherClip; } -// ----------------------------------------------------------------------- + void Window::ImplClipAllChildren( Region& rRegion ) { @@ -2190,7 +2190,7 @@ void Window::ImplClipAllChildren( Region& rRegion ) } } -// ----------------------------------------------------------------------- + void Window::ImplClipSiblings( Region& rRegion ) { @@ -2207,7 +2207,7 @@ void Window::ImplClipSiblings( Region& rRegion ) } } -// ----------------------------------------------------------------------- + void Window::ImplInitWinClipRegion() { @@ -2231,7 +2231,7 @@ void Window::ImplInitWinClipRegion() mpWindowImpl->mbInitWinClipRegion = false; } -// ----------------------------------------------------------------------- + void Window::ImplInitWinChildClipRegion() { @@ -2256,7 +2256,7 @@ void Window::ImplInitWinChildClipRegion() mpWindowImpl->mbInitChildRegion = false; } -// ----------------------------------------------------------------------- + Region* Window::ImplGetWinChildClipRegion() { @@ -2270,7 +2270,7 @@ Region* Window::ImplGetWinChildClipRegion() return &mpWindowImpl->maWinClipRegion; } -// ----------------------------------------------------------------------- + void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion ) { @@ -2289,7 +2289,7 @@ void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Re } } -// ----------------------------------------------------------------------- + void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion ) { @@ -2303,7 +2303,7 @@ void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, R ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } -// ----------------------------------------------------------------------- + void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion ) { @@ -2331,7 +2331,7 @@ void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } -// ----------------------------------------------------------------------- + void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion, bool bChildren, bool bParent, bool bSiblings ) @@ -2403,7 +2403,7 @@ void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegio } } -// ----------------------------------------------------------------------- + void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) { @@ -2563,7 +2563,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) } } -// ----------------------------------------------------------------------- + void Window::ImplCallOverlapPaint() { @@ -2585,7 +2585,7 @@ void Window::ImplCallOverlapPaint() } } -// ----------------------------------------------------------------------- + void Window::ImplPostPaint() { @@ -2593,7 +2593,7 @@ void Window::ImplPostPaint() mpWindowImpl->mpFrameData->maPaintTimer.Start(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) { @@ -2612,7 +2612,7 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) { @@ -2629,7 +2629,7 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) return 0; } -// ----------------------------------------------------------------------- + void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) { @@ -2688,7 +2688,7 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ImplPostPaint(); } -// ----------------------------------------------------------------------- + void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) { @@ -2709,7 +2709,7 @@ void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) } } -// ----------------------------------------------------------------------- + void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) { @@ -2722,7 +2722,7 @@ void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) } } -// ----------------------------------------------------------------------- + void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) { @@ -2810,7 +2810,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) pOpaqueWindow->Update(); // start painting at the opaque parent } -// ----------------------------------------------------------------------- + void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, @@ -2835,7 +2835,7 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, } } -// ----------------------------------------------------------------------- + void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, @@ -2874,7 +2874,7 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, } } -// ----------------------------------------------------------------------- + void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) { @@ -2918,7 +2918,7 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) { @@ -2959,7 +2959,7 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) @@ -3130,7 +3130,7 @@ void Window::ImplScroll( const Rectangle& rRect, mpWindowImpl->mpCursor->ImplResume(); } -// ----------------------------------------------------------------------- + void Window::ImplUpdateAll( bool bOverlapWindows ) { @@ -3162,7 +3162,7 @@ void Window::ImplUpdateAll( bool bOverlapWindows ) Flush(); } -// ----------------------------------------------------------------------- + void Window::ImplUpdateWindowPtr( Window* pWindow ) { @@ -3189,7 +3189,7 @@ void Window::ImplUpdateWindowPtr( Window* pWindow ) } } -// ----------------------------------------------------------------------- + void Window::ImplUpdateWindowPtr() { @@ -3201,7 +3201,7 @@ void Window::ImplUpdateWindowPtr() } } -// ----------------------------------------------------------------------- + void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) { @@ -3230,7 +3230,7 @@ void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) Show( true ); } -// ----------------------------------------------------------------------- + bool Window::ImplUpdatePos() { @@ -3263,7 +3263,7 @@ bool Window::ImplUpdatePos() return bSysChild; } -// ----------------------------------------------------------------------- + void Window::ImplUpdateSysObjPos() { @@ -3277,7 +3277,7 @@ void Window::ImplUpdateSysObjPos() pChild = pChild->mpWindowImpl->mpNext; } } -// ----------------------------------------------------------------------- + void Window::ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) @@ -3583,7 +3583,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, delete pOldRegion; } -// ----------------------------------------------------------------------- + void Window::ImplToBottomChild() { @@ -3602,7 +3602,7 @@ void Window::ImplToBottomChild() } } -// ----------------------------------------------------------------------- + void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) { @@ -3631,7 +3631,7 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) } } -// ----------------------------------------------------------------------- + void Window::ImplToTop( sal_uInt16 nFlags ) { @@ -3723,7 +3723,7 @@ void Window::ImplToTop( sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::ImplStartToTop( sal_uInt16 nFlags ) { @@ -3778,7 +3778,7 @@ void Window::ImplStartToTop( sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) { @@ -3807,7 +3807,7 @@ void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) ImplGenerateMouseMove(); } -// ----------------------------------------------------------------------- + void Window::ImplShowAllOverlaps() { @@ -3824,7 +3824,7 @@ void Window::ImplShowAllOverlaps() } } -// ----------------------------------------------------------------------- + void Window::ImplHideAllOverlaps() { @@ -3841,7 +3841,7 @@ void Window::ImplHideAllOverlaps() } } -// ----------------------------------------------------------------------- + void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) { @@ -3868,7 +3868,7 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) } } -// ----------------------------------------------------------------------- + void Window::ImplGenerateMouseMove() { @@ -3876,7 +3876,7 @@ void Window::ImplGenerateMouseMove() Application::PostUserEvent( mpWindowImpl->mpFrameData->mnMouseMoveId, LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ) ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) { @@ -3891,14 +3891,14 @@ IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) return 0; } -// ----------------------------------------------------------------------- + void Window::ImplInvertFocus( const Rectangle& rRect ) { InvertTracking( rRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); } -// ----------------------------------------------------------------------- + void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow, Window* pOldOverlapWindow ) @@ -3991,7 +3991,7 @@ static bool IsWindowFocused(const WindowImpl& rWinImpl) return false; } -// ----------------------------------------------------------------------- + void Window::ImplGrabFocus( sal_uInt16 nFlags ) { // #143570# no focus for destructing windows @@ -4210,7 +4210,7 @@ void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::ImplNewInputContext() { @@ -4257,14 +4257,14 @@ void Window::ImplNewInputContext() pFocusWin->mpFontCache->Release( pFontEntry ); } -// ----------------------------------------------------------------------- + Window::Window( WindowType nType ) { ImplInitWindowData( nType ); } -// ----------------------------------------------------------------------- + Window::Window( Window* pParent, WinBits nStyle ) { @@ -4273,7 +4273,7 @@ Window::Window( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle, NULL ); } -// ----------------------------------------------------------------------- + Window::Window( Window* pParent, const ResId& rResId ) : mpWindowImpl(NULL) @@ -4288,7 +4288,7 @@ Window::Window( Window* pParent, const ResId& rResId ) Show(); } -// ----------------------------------------------------------------------- + #if OSL_DEBUG_LEVEL > 0 namespace { @@ -4311,7 +4311,7 @@ namespace } } #endif -// ----------------------------------------------------------------------- + Window::~Window() { @@ -4753,7 +4753,7 @@ Window::~Window() delete mpWindowImpl; mpWindowImpl = NULL; } -// ----------------------------------------------------------------------- + void Window::doLazyDelete() { SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(this); @@ -4776,7 +4776,7 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const mpWindowImpl->mpFrame->SimulateKeyPress(nKeyCode); } -// ----------------------------------------------------------------------- + void Window::MouseMove( const MouseEvent& rMEvt ) { @@ -4785,7 +4785,7 @@ void Window::MouseMove( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseMove = true; } -// ----------------------------------------------------------------------- + void Window::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -4794,7 +4794,7 @@ void Window::MouseButtonDown( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseButtonDown = true; } -// ----------------------------------------------------------------------- + void Window::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -4803,7 +4803,7 @@ void Window::MouseButtonUp( const MouseEvent& rMEvt ) mpWindowImpl->mbMouseButtonUp = true; } -// ----------------------------------------------------------------------- + void Window::KeyInput( const KeyEvent& rKEvt ) { @@ -4812,7 +4812,7 @@ void Window::KeyInput( const KeyEvent& rKEvt ) mpWindowImpl->mbKeyInput = true; } -// ----------------------------------------------------------------------- + void Window::KeyUp( const KeyEvent& rKEvt ) { @@ -4821,26 +4821,26 @@ void Window::KeyUp( const KeyEvent& rKEvt ) mpWindowImpl->mbKeyUp = true; } -// ----------------------------------------------------------------------- + void Window::PrePaint() { } -// ----------------------------------------------------------------------- + void Window::Paint( const Rectangle& rRect ) { ImplCallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect ); } -// ----------------------------------------------------------------------- + void Window::PostPaint() { } -// ----------------------------------------------------------------------- + void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong ) { @@ -4868,7 +4868,7 @@ void Window::GetFocus() Notify( aNEvt ); } -// ----------------------------------------------------------------------- + void Window::LoseFocus() { @@ -4876,7 +4876,7 @@ void Window::LoseFocus() Notify( aNEvt ); } -// ----------------------------------------------------------------------- + void Window::RequestHelp( const HelpEvent& rHEvt ) { @@ -4928,7 +4928,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } } -// ----------------------------------------------------------------------- + void Window::Command( const CommandEvent& rCEvt ) { @@ -4939,7 +4939,7 @@ void Window::Command( const CommandEvent& rCEvt ) mpWindowImpl->mbCommand = true; } -// ----------------------------------------------------------------------- + void Window::Tracking( const TrackingEvent& rTEvt ) { @@ -4949,13 +4949,13 @@ void Window::Tracking( const TrackingEvent& rTEvt ) pWrapper->Tracking( rTEvt ); } -// ----------------------------------------------------------------------- + void Window::UserEvent( sal_uLong, void* ) { } -// ----------------------------------------------------------------------- + void Window::StateChanged( StateChangedType eType ) { @@ -4980,13 +4980,13 @@ void Window::StateChanged( StateChangedType eType ) } } -// ----------------------------------------------------------------------- + void Window::DataChanged( const DataChangedEvent& ) { } -// ----------------------------------------------------------------------- + void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) { @@ -5087,7 +5087,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) } } -// ----------------------------------------------------------------------- + bool Window::PreNotify( NotifyEvent& rNEvt ) { @@ -5130,7 +5130,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) return bDone; } -// ----------------------------------------------------------------------- + bool Window::Notify( NotifyEvent& rNEvt ) { @@ -5239,7 +5239,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) return nRet; } -// ----------------------------------------------------------------------- + void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData ) { @@ -5252,7 +5252,7 @@ void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData ) CallEventListeners( nEvent, pData ); } -// ----------------------------------------------------------------------- + void Window::CallEventListeners( sal_uLong nEvent, void* pData ) { @@ -5294,35 +5294,35 @@ void Window::FireVclEvent( VclSimpleEvent* pEvent ) ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent); } -// ----------------------------------------------------------------------- + void Window::AddEventListener( const Link& rEventListener ) { mpWindowImpl->maEventListeners.addListener( rEventListener ); } -// ----------------------------------------------------------------------- + void Window::RemoveEventListener( const Link& rEventListener ) { mpWindowImpl->maEventListeners.removeListener( rEventListener ); } -// ----------------------------------------------------------------------- + void Window::AddChildEventListener( const Link& rEventListener ) { mpWindowImpl->maChildEventListeners.addListener( rEventListener ); } -// ----------------------------------------------------------------------- + void Window::RemoveChildEventListener( const Link& rEventListener ) { mpWindowImpl->maChildEventListeners.removeListener( rEventListener ); } -// ----------------------------------------------------------------------- + sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) { @@ -5331,9 +5331,9 @@ sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) return nEventId; } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) { @@ -5357,7 +5357,7 @@ bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCalle } } -// ----------------------------------------------------------------------- + void Window::RemoveUserEvent( sal_uLong nUserEvent ) { @@ -5378,7 +5378,7 @@ void Window::RemoveUserEvent( sal_uLong nUserEvent ) pSVEvent->mbCall = false; } -// ----------------------------------------------------------------------- + bool Window::IsLocked( bool bChildren ) const { @@ -5399,7 +5399,7 @@ bool Window::IsLocked( bool bChildren ) const return false; } -// ----------------------------------------------------------------------- + void Window::SetStyle( WinBits nStyle ) { @@ -5412,7 +5412,7 @@ void Window::SetStyle( WinBits nStyle ) } } -// ----------------------------------------------------------------------- + void Window::SetExtendedStyle( WinBits nExtendedStyle ) { @@ -5438,7 +5438,7 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle ) } } -// ----------------------------------------------------------------------- + SystemWindow* Window::GetSystemWindow() const { @@ -5449,7 +5449,7 @@ SystemWindow* Window::GetSystemWindow() const return (SystemWindow*)pWin; } -// ----------------------------------------------------------------------- + void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) { @@ -5491,7 +5491,7 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) } } -// ----------------------------------------------------------------------- + sal_uInt16 Window::GetBorderStyle() const { @@ -5507,7 +5507,7 @@ sal_uInt16 Window::GetBorderStyle() const return 0; } -// ----------------------------------------------------------------------- + long Window::CalcTitleWidth() const { @@ -5537,7 +5537,7 @@ long Window::CalcTitleWidth() const return 0; } -// ----------------------------------------------------------------------- + void Window::EnableClipSiblings( bool bClipSiblings ) { @@ -5548,7 +5548,7 @@ void Window::EnableClipSiblings( bool bClipSiblings ) mpWindowImpl->mbClipSiblings = bClipSiblings; } -// ----------------------------------------------------------------------- + void Window::SetMouseTransparent( bool bTransparent ) { @@ -5562,7 +5562,7 @@ void Window::SetMouseTransparent( bool bTransparent ) mpWindowImpl->mbMouseTransparent = bTransparent; } -// ----------------------------------------------------------------------- + void Window::SetPaintTransparent( bool bTransparent ) { @@ -5577,7 +5577,7 @@ void Window::SetPaintTransparent( bool bTransparent ) mpWindowImpl->mbPaintTransparent = bTransparent; } -// ----------------------------------------------------------------------- + void Window::SetInputContext( const InputContext& rInputContext ) { @@ -5587,7 +5587,7 @@ void Window::SetInputContext( const InputContext& rInputContext ) ImplNewInputContext(); } -// ----------------------------------------------------------------------- + void Window::EndExtTextInput( sal_uInt16 nFlags ) { @@ -5596,7 +5596,7 @@ void Window::EndExtTextInput( sal_uInt16 nFlags ) ImplGetFrame()->EndExtTextInput( nFlags ); } -// ----------------------------------------------------------------------- + void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth ) { @@ -5622,7 +5622,7 @@ void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth ) } -// ----------------------------------------------------------------------- + const Rectangle* Window::GetCursorRect() const { @@ -5631,7 +5631,7 @@ const Rectangle* Window::GetCursorRect() const return pWinData->mpCursorRect; } -// ----------------------------------------------------------------------- + long Window::GetCursorExtTextInputWidth() const { @@ -5640,7 +5640,7 @@ long Window::GetCursorExtTextInputWidth() const return pWinData->mnCursorExtWidth; } -// ----------------------------------------------------------------------- + void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical ) { @@ -5657,7 +5657,7 @@ void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLe } } -// ----------------------------------------------------------------------- + void Window::SetSettings( const AllSettings& rSettings ) { SetSettings( rSettings, sal_False ); @@ -5698,7 +5698,7 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild ) } } -// ----------------------------------------------------------------------- + void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) { @@ -5768,7 +5768,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) } } -// ----------------------------------------------------------------------- + void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) { @@ -5783,7 +5783,7 @@ void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void Window::SetPointFont( const Font& rFont ) { @@ -5793,7 +5793,7 @@ void Window::SetPointFont( const Font& rFont ) SetFont( aFont ); } -// ----------------------------------------------------------------------- + Font Window::GetPointFont() const { @@ -5803,7 +5803,7 @@ Font Window::GetPointFont() const return aFont; } -// ----------------------------------------------------------------------- + void Window::SetParentClipMode( sal_uInt16 nMode ) { @@ -5821,7 +5821,7 @@ void Window::SetParentClipMode( sal_uInt16 nMode ) } } -// ----------------------------------------------------------------------- + sal_uInt16 Window::GetParentClipMode() const { @@ -5832,7 +5832,7 @@ sal_uInt16 Window::GetParentClipMode() const return mpWindowImpl->mnParentClipMode; } -// ----------------------------------------------------------------------- + void Window::SetWindowRegionPixel() { @@ -5868,7 +5868,7 @@ void Window::SetWindowRegionPixel() } } -// ----------------------------------------------------------------------- + void Window::SetWindowRegionPixel( const Region& rRegion ) { @@ -5956,7 +5956,7 @@ void Window::SetWindowRegionPixel( const Region& rRegion ) } } -// ----------------------------------------------------------------------- + const Region& Window::GetWindowRegionPixel() const { @@ -5967,7 +5967,7 @@ const Region& Window::GetWindowRegionPixel() const return mpWindowImpl->maWinRegion; } -// ----------------------------------------------------------------------- + bool Window::IsWindowRegionPixel() const { @@ -5978,7 +5978,7 @@ bool Window::IsWindowRegionPixel() const return mpWindowImpl->mbWinRegion; } -// ----------------------------------------------------------------------- + Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const { @@ -6017,7 +6017,7 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const return aWinClipRegion; } -// ----------------------------------------------------------------------- + Region Window::GetPaintRegion() const { @@ -6035,7 +6035,7 @@ Region Window::GetPaintRegion() const } } -// ----------------------------------------------------------------------- + void Window::ExpandPaintClipRegion( const Region& rRegion ) { @@ -6061,7 +6061,7 @@ void Window::ExpandPaintClipRegion( const Region& rRegion ) } } -// ----------------------------------------------------------------------- + static SystemWindow *ImplGetLastSystemWindow( Window *pWin ) { @@ -6245,7 +6245,7 @@ void Window::SetParent( Window* pNewParent ) Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } -// ----------------------------------------------------------------------- + void Window::Show( bool bVisible, sal_uInt16 nFlags ) { @@ -6497,7 +6497,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) */ } -// ----------------------------------------------------------------------- + Size Window::GetSizePixel() const { @@ -6531,7 +6531,7 @@ void Window::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, } -// ----------------------------------------------------------------------- + void Window::Enable( bool bEnable, bool bChild ) { @@ -6593,7 +6593,7 @@ void Window::Enable( bool bEnable, bool bChild ) ImplGenerateMouseMove(); } -// ----------------------------------------------------------------------- + void Window::SetCallHandlersOnInputDisabled( bool bCall ) { @@ -6607,14 +6607,14 @@ void Window::SetCallHandlersOnInputDisabled( bool bCall ) } } -// ----------------------------------------------------------------------- + bool Window::IsCallHandlersOnInputDisabled() const { return mpWindowImpl->mbCallHandlersDuringInputDisabled ? true : false; } -// ----------------------------------------------------------------------- + void Window::EnableInput( bool bEnable, bool bChild ) { @@ -6679,7 +6679,7 @@ void Window::EnableInput( bool bEnable, bool bChild ) } } -// ----------------------------------------------------------------------- + void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, const Window* pExcludeWindow ) @@ -6745,7 +6745,7 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, } } -// ----------------------------------------------------------------------- + void Window::AlwaysEnableInput( bool bAlways, bool bChild ) { @@ -6776,7 +6776,7 @@ void Window::AlwaysEnableInput( bool bAlways, bool bChild ) } } -// ----------------------------------------------------------------------- + void Window::AlwaysDisableInput( bool bAlways, bool bChild ) { @@ -6807,7 +6807,7 @@ void Window::AlwaysDisableInput( bool bAlways, bool bChild ) } } -// ----------------------------------------------------------------------- + void Window::SetActivateMode( sal_uInt16 nMode ) { @@ -6840,7 +6840,7 @@ void Window::SetActivateMode( sal_uInt16 nMode ) } } -// ----------------------------------------------------------------------- + void Window::ToTop( sal_uInt16 nFlags ) { @@ -6849,7 +6849,7 @@ void Window::ToTop( sal_uInt16 nFlags ) ImplFocusToTop( nFlags, IsReallyVisible() ); } -// ----------------------------------------------------------------------- + void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) { @@ -7024,7 +7024,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::EnableAlwaysOnTop( bool bEnable ) { @@ -7040,7 +7040,7 @@ void Window::EnableAlwaysOnTop( bool bEnable ) mpWindowImpl->mpFrame->SetAlwaysOnTop( bEnable ); } -// ----------------------------------------------------------------------- + void Window::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) @@ -7171,14 +7171,14 @@ void Window::setPosSizePixel( long nX, long nY, } } -// ----------------------------------------------------------------------- + Point Window::GetPosPixel() const { return mpWindowImpl->maPos; } -// ----------------------------------------------------------------------- + Rectangle Window::GetDesktopRectPixel() const { @@ -7187,7 +7187,7 @@ Rectangle Window::GetDesktopRectPixel() const return rRect; } -// ----------------------------------------------------------------------- + Point Window::OutputToScreenPixel( const Point& rPos ) const { @@ -7195,7 +7195,7 @@ Point Window::OutputToScreenPixel( const Point& rPos ) const return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY ); } -// ----------------------------------------------------------------------- + Point Window::ScreenToOutputPixel( const Point& rPos ) const { @@ -7203,7 +7203,7 @@ Point Window::ScreenToOutputPixel( const Point& rPos ) const return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY ); } -// ----------------------------------------------------------------------- + long Window::ImplGetUnmirroredOutOffX() { @@ -7242,7 +7242,7 @@ Point Window::NormalizedScreenToOutputPixel( const Point& rPos ) const return Point( rPos.X()-offx, rPos.Y()-mnOutOffY ); } -// ----------------------------------------------------------------------- + Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const { @@ -7254,7 +7254,7 @@ Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const return p; } -// ----------------------------------------------------------------------- + Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const { @@ -7266,7 +7266,7 @@ Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const return p; } -// ----------------------------------------------------------------------- + Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rRect ) const { @@ -7286,7 +7286,7 @@ Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rR } -// ----------------------------------------------------------------------- + Rectangle Window::GetWindowExtentsRelative( Window *pRelativeWindow ) const { @@ -7300,7 +7300,7 @@ Rectangle Window::GetClientWindowExtentsRelative( Window *pRelativeWindow ) cons return ImplGetWindowExtentsRelative( pRelativeWindow, true ); } -// ----------------------------------------------------------------------- + Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const { @@ -7330,7 +7330,7 @@ Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bC return Rectangle( aPos, aSize ); } -// ----------------------------------------------------------------------- + void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) { @@ -7340,7 +7340,7 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) nHorzScroll, nVertScroll, nFlags & ~SCROLL_CLIP ); } -// ----------------------------------------------------------------------- + void Window::Scroll( long nHorzScroll, long nVertScroll, const Rectangle& rRect, sal_uInt16 nFlags ) @@ -7353,7 +7353,7 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, ImplScroll( aRect, nHorzScroll, nVertScroll, nFlags ); } -// ----------------------------------------------------------------------- + void Window::Invalidate( sal_uInt16 nFlags ) { @@ -7364,7 +7364,7 @@ void Window::Invalidate( sal_uInt16 nFlags ) ImplInvalidate( NULL, nFlags ); } -// ----------------------------------------------------------------------- + void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) { @@ -7382,7 +7382,7 @@ void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) { @@ -7400,7 +7400,7 @@ void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::Validate( sal_uInt16 nFlags ) { @@ -7411,7 +7411,7 @@ void Window::Validate( sal_uInt16 nFlags ) ImplValidate( NULL, nFlags ); } -// ----------------------------------------------------------------------- + bool Window::HasPaintEvent() const { @@ -7440,7 +7440,7 @@ bool Window::HasPaintEvent() const return false; } -// ----------------------------------------------------------------------- + void Window::Update() { @@ -7509,7 +7509,7 @@ void Window::Update() Flush(); } -// ----------------------------------------------------------------------- + void Window::Flush() { @@ -7518,7 +7518,7 @@ void Window::Flush() mpWindowImpl->mpFrame->Flush( aWinRect ); } -// ----------------------------------------------------------------------- + void Window::Sync() { @@ -7526,7 +7526,7 @@ void Window::Sync() mpWindowImpl->mpFrame->Sync(); } -// ----------------------------------------------------------------------- + void Window::SetUpdateMode( bool bUpdate ) { @@ -7535,7 +7535,7 @@ void Window::SetUpdateMode( bool bUpdate ) StateChanged( STATE_CHANGE_UPDATEMODE ); } -// ----------------------------------------------------------------------- + void Window::GrabFocus() { @@ -7543,7 +7543,7 @@ void Window::GrabFocus() ImplGrabFocus( 0 ); } -// ----------------------------------------------------------------------- + bool Window::HasFocus() const { @@ -7563,7 +7563,7 @@ bool Window::HasFocus() const return (this == ImplGetSVData()->maWinData.mpFocusWin); } -// ----------------------------------------------------------------------- + void Window::GrabFocusToDocument() { @@ -7575,7 +7575,7 @@ void Window::SetFakeFocus( bool bFocus ) ImplGetWindowImpl()->mbFakeFocusSet = bFocus; } -// ----------------------------------------------------------------------- + bool Window::HasChildPathFocus( bool bSystemWindow ) const { @@ -7595,7 +7595,7 @@ bool Window::HasChildPathFocus( bool bSystemWindow ) const return false; } -// ----------------------------------------------------------------------- + void Window::CaptureMouse() { @@ -7616,7 +7616,7 @@ void Window::CaptureMouse() } } -// ----------------------------------------------------------------------- + void Window::ReleaseMouse() { @@ -7634,7 +7634,7 @@ void Window::ReleaseMouse() } } -// ----------------------------------------------------------------------- + bool Window::IsMouseCaptured() const { @@ -7642,7 +7642,7 @@ bool Window::IsMouseCaptured() const return (this == ImplGetSVData()->maWinData.mpCaptureWin); } -// ----------------------------------------------------------------------- + void Window::SetPointer( const Pointer& rPointer ) { @@ -7657,7 +7657,7 @@ void Window::SetPointer( const Pointer& rPointer ) mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() ); } -// ----------------------------------------------------------------------- + void Window::EnableChildPointerOverwrite( bool bOverwrite ) { @@ -7672,7 +7672,7 @@ void Window::EnableChildPointerOverwrite( bool bOverwrite ) mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() ); } -// ----------------------------------------------------------------------- + void Window::SetPointerPosPixel( const Point& rPos ) { @@ -7695,7 +7695,7 @@ void Window::SetPointerPosPixel( const Point& rPos ) mpWindowImpl->mpFrame->SetPointerPos( aPos.X(), aPos.Y() ); } -// ----------------------------------------------------------------------- + Point Window::GetPointerPosPixel() { @@ -7710,7 +7710,7 @@ Point Window::GetPointerPosPixel() return ImplFrameToOutput( aPos ); } -// ----------------------------------------------------------------------- + Point Window::GetLastPointerPosPixel() { @@ -7725,7 +7725,7 @@ Point Window::GetLastPointerPosPixel() return ImplFrameToOutput( aPos ); } -// ----------------------------------------------------------------------- + void Window::ShowPointer( bool bVisible ) { @@ -7740,7 +7740,7 @@ void Window::ShowPointer( bool bVisible ) } } -// ----------------------------------------------------------------------- + Window::PointerState Window::GetPointerState() { @@ -7764,14 +7764,14 @@ Window::PointerState Window::GetPointerState() return aState; } -// ----------------------------------------------------------------------- + bool Window::IsMouseOver() { return ImplGetWinData()->mbMouseOver; } -// ----------------------------------------------------------------------- + void Window::EnterWait() { @@ -7786,7 +7786,7 @@ void Window::EnterWait() } } -// ----------------------------------------------------------------------- + void Window::LeaveWait() { @@ -7804,7 +7804,7 @@ void Window::LeaveWait() } } -// ----------------------------------------------------------------------- + void Window::SetCursor( Cursor* pCursor ) { @@ -7819,7 +7819,7 @@ void Window::SetCursor( Cursor* pCursor ) } } -// ----------------------------------------------------------------------- + void Window::SetText( const OUString& rStr ) { @@ -7851,7 +7851,7 @@ void Window::SetText( const OUString& rStr ) StateChanged( STATE_CHANGE_TEXT ); } -// ----------------------------------------------------------------------- + OUString Window::GetText() const { @@ -7859,7 +7859,7 @@ OUString Window::GetText() const return mpWindowImpl->maText; } -// ----------------------------------------------------------------------- + OUString Window::GetDisplayText() const { @@ -7867,7 +7867,7 @@ OUString Window::GetDisplayText() const return GetText(); } -// ----------------------------------------------------------------------- + const Wallpaper& Window::GetDisplayBackground() const { @@ -7895,7 +7895,7 @@ const Wallpaper& Window::GetDisplayBackground() const return rBack; } -// ----------------------------------------------------------------------- + const OUString& Window::GetHelpText() const { @@ -7932,7 +7932,7 @@ const OUString& Window::GetHelpText() const return mpWindowImpl->maHelpText; } -// ----------------------------------------------------------------------- + Window* Window::FindWindow( const Point& rPos ) const { @@ -7941,7 +7941,7 @@ Window* Window::FindWindow( const Point& rPos ) const return ((Window*)this)->ImplFindWindow( aPos ); } -// ----------------------------------------------------------------------- + sal_uInt16 Window::GetChildCount() const { @@ -7957,7 +7957,7 @@ sal_uInt16 Window::GetChildCount() const return nChildCount; } -// ----------------------------------------------------------------------- + Window* Window::GetChild( sal_uInt16 nChild ) const { @@ -7975,7 +7975,7 @@ Window* Window::GetChild( sal_uInt16 nChild ) const return NULL; } -// ----------------------------------------------------------------------- + Window* Window::GetWindow( sal_uInt16 nType ) const { @@ -8066,7 +8066,7 @@ Window* Window::GetWindow( sal_uInt16 nType ) const return NULL; } -// ----------------------------------------------------------------------- + bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const { @@ -8086,7 +8086,7 @@ bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const return false; } -// ----------------------------------------------------------------------- + bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const { @@ -8096,7 +8096,7 @@ bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const return ImplIsChild( pWindow, bSystemWindow ); } -// ----------------------------------------------------------------------- + const SystemEnvData* Window::GetSystemData() const { @@ -8116,7 +8116,7 @@ const SystemEnvData* Window::GetSystemData() const return aRet; } -// ----------------------------------------------------------------------- + void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ) { @@ -8128,7 +8128,7 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star:: mpWindowImpl->mpVCLXWindow = pVCLXWindow; } -// ----------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > Window::GetComponentInterface( sal_Bool bCreate ) { @@ -8141,7 +8141,7 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star:: return mpWindowImpl->mxWindowPeer; } -// ----------------------------------------------------------------------- + void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) { @@ -8151,7 +8151,7 @@ void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun pWrapper->SetWindowInterface( this, xIFace ); } -// ----------------------------------------------------------------------- + void Window::ImplCallDeactivateListeners( Window *pNew ) { @@ -8170,7 +8170,7 @@ void Window::ImplCallDeactivateListeners( Window *pNew ) } } -// ----------------------------------------------------------------------- + void Window::ImplCallActivateListeners( Window *pOld ) { @@ -8202,7 +8202,7 @@ void Window::ImplCallActivateListeners( Window *pOld ) } } -// ----------------------------------------------------------------------- + bool Window::ImplStopDnd() { @@ -8218,14 +8218,14 @@ bool Window::ImplStopDnd() return bRet; } -// ----------------------------------------------------------------------- + void Window::ImplStartDnd() { GetDropTarget(); } -// ----------------------------------------------------------------------- + uno::Reference< XDropTarget > Window::GetDropTarget() { @@ -8285,7 +8285,7 @@ uno::Reference< XDropTarget > Window::GetDropTarget() return uno::Reference< XDropTarget > ( mpWindowImpl->mxDNDListenerContainer, UNO_QUERY ); } -// ----------------------------------------------------------------------- + uno::Reference< XDragSource > Window::GetDragSource() { @@ -8352,14 +8352,14 @@ uno::Reference< XDragSource > Window::GetDragSource() return uno::Reference< XDragSource > (); } -// ----------------------------------------------------------------------- + uno::Reference< XDragGestureRecognizer > Window::GetDragGestureRecognizer() { return uno::Reference< XDragGestureRecognizer > ( GetDropTarget(), UNO_QUERY ); } -// ----------------------------------------------------------------------- + uno::Reference< XClipboard > Window::GetClipboard() { @@ -8388,7 +8388,7 @@ uno::Reference< XClipboard > Window::GetClipboard() return static_cast < XClipboard * > (0); } -// ----------------------------------------------------------------------- + uno::Reference< XClipboard > Window::GetPrimarySelection() { @@ -8433,9 +8433,9 @@ uno::Reference< XClipboard > Window::GetPrimarySelection() return static_cast < XClipboard * > (0); } -// ----------------------------------------------------------------------- + // Accessibility -// ----------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) { @@ -9054,7 +9054,7 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& mpOutDevData->mpRecordLayout = NULL; } -// ----------------------------------------------------------------------- + void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly ) { diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 05c237571eea..6214e9017857 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -192,7 +192,7 @@ void Window::ImplSaveOverlapBackground() } } -// ----------------------------------------------------------------------- + bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) { @@ -233,7 +233,7 @@ bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) return false; } -// ----------------------------------------------------------------------- + void Window::ImplDeleteOverlapBackground() { @@ -262,7 +262,7 @@ void Window::ImplDeleteOverlapBackground() } } -// ----------------------------------------------------------------------- + void Window::ImplInvalidateAllOverlapBackgrounds() { @@ -295,7 +295,7 @@ void Window::ImplInvalidateAllOverlapBackgrounds() } } -// ----------------------------------------------------------------------- + void Window::ShowFocus( const Rectangle& rRect ) { @@ -342,7 +342,7 @@ void Window::ShowFocus( const Rectangle& rRect ) mpWindowImpl->mbInShowFocus = false; } -// ----------------------------------------------------------------------- + void Window::HideFocus() { @@ -377,7 +377,7 @@ void Window::HideFocus() mpWindowImpl->mbInHideFocus = false; } -// ----------------------------------------------------------------------- + void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags ) { @@ -412,7 +412,7 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags ) mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this ); } -// ----------------------------------------------------------------------- + void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags ) { @@ -449,7 +449,7 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags ) mpGraphics->Invert( nPoints, pPtAry, nSalFlags, this ); } -// ----------------------------------------------------------------------- + void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags ) { @@ -477,7 +477,7 @@ void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags ) mpWindowImpl->mbTrackVisible = true; } -// ----------------------------------------------------------------------- + void Window::HideTracking() { @@ -490,7 +490,7 @@ void Window::HideTracking() } } -// ----------------------------------------------------------------------- + void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) { @@ -554,7 +554,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) { @@ -607,7 +607,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) pGraphics->Invert( nPoints, pPtAry, SAL_INVERT_TRACKFRAME, this ); } -// ----------------------------------------------------------------------- + IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer ) { @@ -634,7 +634,7 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer ) return 0; } -// ----------------------------------------------------------------------- + void Window::StartTracking( sal_uInt16 nFlags ) { @@ -663,7 +663,7 @@ void Window::StartTracking( sal_uInt16 nFlags ) CaptureMouse(); } -// ----------------------------------------------------------------------- + void Window::EndTracking( sal_uInt16 nFlags ) { @@ -706,14 +706,14 @@ void Window::EndTracking( sal_uInt16 nFlags ) } } -// ----------------------------------------------------------------------- + bool Window::IsTracking() const { return (ImplGetSVData()->maWinData.mpTrackWin == this); } -// ----------------------------------------------------------------------- + void Window::StartAutoScroll( sal_uInt16 nFlags ) { @@ -730,7 +730,7 @@ void Window::StartAutoScroll( sal_uInt16 nFlags ) pSVData->maAppData.mpWheelWindow = new ImplWheelWindow( this ); } -// ----------------------------------------------------------------------- + void Window::EndAutoScroll() { @@ -746,7 +746,7 @@ void Window::EndAutoScroll() } } -// ----------------------------------------------------------------------- + void Window::SaveBackground( const Point& rPos, const Size& rSize, const Point& rDestOff, VirtualDevice& rSaveDevice ) @@ -780,7 +780,7 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, rSaveDevice.DrawOutDev( rDestOff, rSize, rPos, rSize, *this ); } -// ----------------------------------------------------------------------- + sal_uIntPtr Window::SaveFocus() { @@ -796,7 +796,7 @@ sal_uIntPtr Window::SaveFocus() return 0; } -// ----------------------------------------------------------------------- + bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore ) { @@ -819,7 +819,7 @@ bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore ) } } -// ----------------------------------------------------------------------- + void Window::SetZoom( const Fraction& rZoom ) { @@ -830,14 +830,14 @@ void Window::SetZoom( const Fraction& rZoom ) } } -// ----------------------------------------------------------------------- + inline long WinFloatRound( double fVal ) { return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) ); } -// ----------------------------------------------------------------------- + void Window::SetZoomedPointFont( const Font& rFont ) { @@ -877,7 +877,7 @@ void Window::SetZoomedPointFont( const Font& rFont ) SetPointFont( rFont ); } -// ----------------------------------------------------------------------- + long Window::CalcZoom( long nCalc ) const { @@ -893,7 +893,7 @@ long Window::CalcZoom( long nCalc ) const return nCalc; } -// ----------------------------------------------------------------------- + void Window::SetControlFont() { @@ -905,7 +905,7 @@ void Window::SetControlFont() } } -// ----------------------------------------------------------------------- + void Window::SetControlFont( const Font& rFont ) { @@ -927,7 +927,7 @@ void Window::SetControlFont( const Font& rFont ) StateChanged( STATE_CHANGE_CONTROLFONT ); } -// ----------------------------------------------------------------------- + Font Window::GetControlFont() const { @@ -940,7 +940,7 @@ Font Window::GetControlFont() const } } -// ----------------------------------------------------------------------- + void Window::SetControlForeground() { @@ -952,7 +952,7 @@ void Window::SetControlForeground() } } -// ----------------------------------------------------------------------- + void Window::SetControlForeground( const Color& rColor ) { @@ -976,7 +976,7 @@ void Window::SetControlForeground( const Color& rColor ) } } -// ----------------------------------------------------------------------- + void Window::SetControlBackground() { @@ -988,7 +988,7 @@ void Window::SetControlBackground() } } -// ----------------------------------------------------------------------- + void Window::SetControlBackground( const Color& rColor ) { @@ -1012,7 +1012,7 @@ void Window::SetControlBackground( const Color& rColor ) } } -// ----------------------------------------------------------------------- + Size Window::CalcWindowSize( const Size& rOutSz ) const { @@ -1022,7 +1022,7 @@ Size Window::CalcWindowSize( const Size& rOutSz ) const return aSz; } -// ----------------------------------------------------------------------- + Size Window::CalcOutputSize( const Size& rWinSz ) const { @@ -1032,7 +1032,7 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const return aSz; } -// ----------------------------------------------------------------------- + Font Window::GetDrawPixelFont( OutputDevice* pDev ) const { @@ -1044,7 +1044,7 @@ Font Window::GetDrawPixelFont( OutputDevice* pDev ) const return aFont; } -// ----------------------------------------------------------------------- + long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const { @@ -1060,7 +1060,7 @@ long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const return nP; } -// ----------------------------------------------------------------------- + static void lcl_HandleScrollHelper( ScrollBar* pScrl, long nN, bool isMultiplyByLineSize ) { @@ -1252,7 +1252,7 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd, return bRet; } -// ----------------------------------------------------------------------- + diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx index 00919acce11a..88430780f077 100644 --- a/vcl/source/window/window3.cxx +++ b/vcl/source/window/window3.cxx @@ -22,7 +22,7 @@ #include "vcl/waitobj.hxx" #include "vcl/button.hxx" -// ----------------------------------------------------------------------- + WaitObject::~WaitObject() { @@ -30,14 +30,14 @@ WaitObject::~WaitObject() mpWindow->LeaveWait(); } -// ----------------------------------------------------------------------- + Size Window::GetOptimalSize() const { return Size(); } -// ----------------------------------------------------------------------- + void Window::ImplAdjustNWFSizes() { diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 5a9e2f14cfbd..69f2db6f02b7 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -168,7 +168,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, return false; } -// ----------------------------------------------------------------------- + static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) { @@ -200,7 +200,7 @@ static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) } } -// ----------------------------------------------------------------------- + static void ImplSetMousePointer( Window* pChild ) { @@ -211,7 +211,7 @@ static void ImplSetMousePointer( Window* pChild ) pChild->ImplGetFrame()->SetPointer( pChild->ImplGetMousePointer() ); } -// ----------------------------------------------------------------------- + static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL, bool bMouse = false, Point* pPos = NULL ) @@ -254,7 +254,7 @@ static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL return false; } -// ----------------------------------------------------------------------- + /* #i34277# delayed context menu activation; * necessary if there already was a popup menu running. @@ -854,7 +854,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav return bRet; } -// ----------------------------------------------------------------------- + static Window* ImplGetKeyInputWindow( Window* pWindow ) { @@ -897,7 +897,7 @@ static Window* ImplGetKeyInputWindow( Window* pWindow ) return pChild; } -// ----------------------------------------------------------------------- + static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward ) @@ -1187,7 +1187,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, return nRet; } -// ----------------------------------------------------------------------- + static bool ImplHandleExtTextInput( Window* pWindow, const OUString& rText, @@ -1282,7 +1282,7 @@ static bool ImplHandleExtTextInput( Window* pWindow, return !ImplCallCommand( pChild, COMMAND_EXTTEXTINPUT, &aData ); } -// ----------------------------------------------------------------------- + static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) { @@ -1311,7 +1311,7 @@ static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) return nRet; } -// ----------------------------------------------------------------------- + static void ImplHandleExtTextInputPos( Window* pWindow, Rectangle& rRect, long& rInputWidth, @@ -1359,7 +1359,7 @@ static void ImplHandleExtTextInputPos( Window* pWindow, = pChild != 0 && pChild->GetInputContext().GetFont().IsVertical(); } -// ----------------------------------------------------------------------- + static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang ) { @@ -1368,7 +1368,7 @@ static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang return !ImplCallCommand( pChild, COMMAND_INPUTCONTEXTCHANGE, &aData ); } -// ----------------------------------------------------------------------- + static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, const CommandWheelData* pWheelData ) @@ -1392,7 +1392,7 @@ static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, return false; } -// ----------------------------------------------------------------------- + static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEvt, bool scaleDirectly = false ) { @@ -1499,7 +1499,7 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv return !bRet; } -// ----------------------------------------------------------------------- + #define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020) static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate ) @@ -1532,7 +1532,7 @@ static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool } } -// ----------------------------------------------------------------------- + static void KillOwnPopups( Window* pWindow ) { @@ -1546,7 +1546,7 @@ static void KillOwnPopups( Window* pWindow ) } } -// ----------------------------------------------------------------------- + void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) { @@ -1615,7 +1615,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized = bMinimized; } -// ----------------------------------------------------------------------- + static void ImplHandleMove( Window* pWindow ) { @@ -1642,7 +1642,7 @@ static void ImplHandleMove( Window* pWindow ) } -// ----------------------------------------------------------------------- + static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeight ) { @@ -1650,7 +1650,7 @@ static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeig ImplHandleResize( pWindow, nNewWidth, nNewHeight ); } -// ----------------------------------------------------------------------- + static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) { @@ -1671,7 +1671,7 @@ static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) { @@ -1781,7 +1781,7 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) return 0; } -// ----------------------------------------------------------------------- + static void ImplHandleGetFocus( Window* pWindow ) { @@ -1800,7 +1800,7 @@ static void ImplHandleGetFocus( Window* pWindow ) } } -// ----------------------------------------------------------------------- + static void ImplHandleLoseFocus( Window* pWindow ) { @@ -1840,7 +1840,7 @@ static void ImplHandleLoseFocus( Window* pWindow ) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); } -// ----------------------------------------------------------------------- + struct DelayedCloseEvent { Window* pWindow; @@ -1920,7 +1920,7 @@ void ImplHandleClose( Window* pWindow ) } } -// ----------------------------------------------------------------------- + static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) { @@ -1964,7 +1964,7 @@ static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent ) return nMode; } -// ----------------------------------------------------------------------- + static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) { @@ -1982,7 +1982,7 @@ static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) return nMode; } -// ----------------------------------------------------------------------- + inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) { @@ -1992,7 +1992,7 @@ inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } -// ----------------------------------------------------------------------- + inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) { @@ -2002,7 +2002,7 @@ inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } -// ----------------------------------------------------------------------- + inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ) { @@ -2017,7 +2017,7 @@ inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ImplGetMouseButtonMode( pEvent ) ); } -// ----------------------------------------------------------------------- + inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) { @@ -2032,14 +2032,14 @@ inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseButtonMode( pEvent ) ); } -// ----------------------------------------------------------------------- + static bool ImplHandleSalMouseActivate( Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ ) { return false; } -// ----------------------------------------------------------------------- + static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent ) { @@ -2082,7 +2082,7 @@ static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt return nRet; } -// ----------------------------------------------------------------------- + static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) { @@ -2121,7 +2121,7 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) } } -// ----------------------------------------------------------------------- + static void ImplHandleInputLanguageChange( Window* pWindow ) { @@ -2133,7 +2133,7 @@ static void ImplHandleInputLanguageChange( Window* pWindow ) ImplCallCommand( pChild, COMMAND_INPUTLANGUAGECHANGE ); } -// ----------------------------------------------------------------------- + static void ImplHandleSalSettings( sal_uInt16 nEvent ) { @@ -2187,7 +2187,7 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent ) } } -// ----------------------------------------------------------------------- + static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEvent* pEvt ) { @@ -2209,7 +2209,7 @@ static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEve } } -// ----------------------------------------------------------------------- + static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) { @@ -2226,7 +2226,7 @@ static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) return ImplCallCommand( pWindow, COMMAND_SHOWDIALOG, &aCmdData ); } -// ----------------------------------------------------------------------- + static void ImplHandleSurroundingTextRequest( Window *pWindow, OUString& rText, @@ -2249,7 +2249,7 @@ static void ImplHandleSurroundingTextRequest( Window *pWindow, } } -// ----------------------------------------------------------------------- + static void ImplHandleSalSurroundingTextRequest( Window *pWindow, SalSurroundingTextRequestEvent *pEvt ) @@ -2274,7 +2274,7 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow, pEvt->mnEnd = aSelRange.Max(); } -// ----------------------------------------------------------------------- + static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, sal_uLong nStart, @@ -2288,7 +2288,7 @@ static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, } } -// ----------------------------------------------------------------------- + static void ImplHandleStartReconversion( Window *pWindow ) { @@ -2297,7 +2297,7 @@ static void ImplHandleStartReconversion( Window *pWindow ) ImplCallCommand( pChild, COMMAND_PREPARERECONVERSION ); } -// ----------------------------------------------------------------------- + static void ImplHandleSalQueryCharPosition( Window *pWindow, SalQueryCharPositionEvent *pEvt ) @@ -2342,7 +2342,7 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow, } } -// ----------------------------------------------------------------------- + bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, sal_uInt16 nEvent, const void* pEvent ) diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 4f6eee505780..3f29acade5bd 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -47,7 +47,7 @@ void WorkWindow::ImplInitWorkWindowData() mbFullScreenMode = false; } -// ----------------------------------------------------------------------- + void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) { @@ -73,7 +73,7 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pS SetActivateMode( ACTIVATE_MODE_GRABFOCUS ); } -// ----------------------------------------------------------------------- + void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ) { @@ -90,7 +90,7 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::st ImplInit( pParent, nStyle, NULL ); } -// ----------------------------------------------------------------------- + WorkWindow::WorkWindow( WindowType nType ) : SystemWindow( nType ) @@ -98,7 +98,7 @@ WorkWindow::WorkWindow( WindowType nType ) : ImplInitWorkWindowData(); } -// ----------------------------------------------------------------------- + WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) @@ -107,7 +107,7 @@ WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle, NULL ); } -// ----------------------------------------------------------------------- + WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) @@ -117,7 +117,7 @@ WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSyst ImplInit( pParent, nStyle, aSystemWorkWindowToken ); } -// ----------------------------------------------------------------------- + WorkWindow::WorkWindow( SystemParentData* pParent ) : SystemWindow( WINDOW_WORKWINDOW ) @@ -127,7 +127,7 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) : ImplInit( NULL, 0, pParent ); } -// ----------------------------------------------------------------------- + WorkWindow::~WorkWindow() { @@ -139,7 +139,7 @@ WorkWindow::~WorkWindow() } } -// ----------------------------------------------------------------------- + void WorkWindow::ShowFullScreenMode( bool bFullScreenMode ) { @@ -171,7 +171,7 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr } } -// ----------------------------------------------------------------------- + void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags ) { @@ -222,7 +222,7 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s } } -// ----------------------------------------------------------------------- + bool WorkWindow::IsMinimized() const { @@ -232,7 +232,7 @@ bool WorkWindow::IsMinimized() const return (( aState.mnState & WINDOWSTATE_STATE_MINIMIZED ) != 0); } -// ----------------------------------------------------------------------- + bool WorkWindow::SetPluginParent( SystemParentData* pParent ) { |