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 | |
| 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')
79 files changed, 2430 insertions, 2430 deletions
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index d70bb7335d17..c4a7ea764f0b 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -57,9 +57,9 @@ Help::~Help() { } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + bool Help::Start( const OUString&, const Window* ) { @@ -71,56 +71,56 @@ bool Help::SearchKeyword( const OUString& ) return false; } -// ----------------------------------------------------------------------- + OUString Help::GetHelpText( const OUString&, const Window* ) { return OUString(); } -// ----------------------------------------------------------------------- + void Help::EnableContextHelp() { ImplGetSVData()->maHelpData.mbContextHelp = true; } -// ----------------------------------------------------------------------- + void Help::DisableContextHelp() { ImplGetSVData()->maHelpData.mbContextHelp = false; } -// ----------------------------------------------------------------------- + bool Help::IsContextHelpEnabled() { return ImplGetSVData()->maHelpData.mbContextHelp; } -// ----------------------------------------------------------------------- + void Help::EnableExtHelp() { ImplGetSVData()->maHelpData.mbExtHelp = true; } -// ----------------------------------------------------------------------- + void Help::DisableExtHelp() { ImplGetSVData()->maHelpData.mbExtHelp = false; } -// ----------------------------------------------------------------------- + bool Help::IsExtHelpEnabled() { return ImplGetSVData()->maHelpData.mbExtHelp; } -// ----------------------------------------------------------------------- + bool Help::StartExtHelp() { @@ -139,7 +139,7 @@ bool Help::StartExtHelp() return false; } -// ----------------------------------------------------------------------- + bool Help::EndExtHelp() { @@ -157,28 +157,28 @@ bool Help::EndExtHelp() return false; } -// ----------------------------------------------------------------------- + void Help::EnableBalloonHelp() { ImplGetSVData()->maHelpData.mbBalloonHelp = true; } -// ----------------------------------------------------------------------- + void Help::DisableBalloonHelp() { ImplGetSVData()->maHelpData.mbBalloonHelp = false; } -// ----------------------------------------------------------------------- + bool Help::IsBalloonHelpEnabled() { return ImplGetSVData()->maHelpData.mbBalloonHelp; } -// ----------------------------------------------------------------------- + bool Help::ShowBalloon( Window* pParent, const Point& rScreenPos, @@ -190,7 +190,7 @@ bool Help::ShowBalloon( Window* pParent, return true; } -// ----------------------------------------------------------------------- + bool Help::ShowBalloon( Window* pParent, const Point& rScreenPos, const Rectangle& rRect, @@ -202,28 +202,28 @@ bool Help::ShowBalloon( Window* pParent, return true; } -// ----------------------------------------------------------------------- + void Help::EnableQuickHelp() { ImplGetSVData()->maHelpData.mbQuickHelp = true; } -// ----------------------------------------------------------------------- + void Help::DisableQuickHelp() { ImplGetSVData()->maHelpData.mbQuickHelp = false; } -// ----------------------------------------------------------------------- + bool Help::IsQuickHelpEnabled() { return ImplGetSVData()->maHelpData.mbQuickHelp; } -// ----------------------------------------------------------------------- + bool Help::ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, @@ -237,7 +237,7 @@ bool Help::ShowQuickHelp( Window* pParent, return true; } -// ----------------------------------------------------------------------- + void Help::HideBalloonAndQuickHelp() { @@ -246,7 +246,7 @@ void Help::HideBalloonAndQuickHelp() ImplDestroyHelpWindow( bIsVisible ); } -// ----------------------------------------------------------------------- + sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect, const OUString& rText, sal_uInt16 nStyle ) @@ -261,7 +261,7 @@ sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect, return nId; } -// ----------------------------------------------------------------------- + void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreenRect, const OUString& rText ) { @@ -277,7 +277,7 @@ void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreen pHelpWin->Invalidate(); } -// ----------------------------------------------------------------------- + void Help::HideTip( sal_uLong nId ) { @@ -342,7 +342,7 @@ HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt maHideTimer.SetTimeout( rHelpSettings.GetTipTimeout() ); } -// ----------------------------------------------------------------------- + HelpTextWindow::~HelpTextWindow() { @@ -353,7 +353,7 @@ HelpTextWindow::~HelpTextWindow() ImplGetSVData()->maHelpData.mpHelpWin = NULL; } -// ----------------------------------------------------------------------- + void HelpTextWindow::SetHelpText( const OUString& rHelpText ) { @@ -396,7 +396,7 @@ void HelpTextWindow::SetHelpText( const OUString& rHelpText ) SetOutputSizePixel( aSize ); } -// ----------------------------------------------------------------------- + void HelpTextWindow::ImplShow() { @@ -406,7 +406,7 @@ void HelpTextWindow::ImplShow() Update(); } -// ----------------------------------------------------------------------- + void HelpTextWindow::Paint( const Rectangle& ) { @@ -455,7 +455,7 @@ void HelpTextWindow::Paint( const Rectangle& ) } } -// ----------------------------------------------------------------------- + void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode ) { @@ -482,7 +482,7 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode ) maShowTimer.Start(); } -// ----------------------------------------------------------------------- + IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer) { @@ -506,7 +506,7 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer) return 1; } -// ----------------------------------------------------------------------- + Size HelpTextWindow::CalcOutSize() const { @@ -516,7 +516,7 @@ Size HelpTextWindow::CalcOutSize() const return aSz; } -// ----------------------------------------------------------------------- + void HelpTextWindow::RequestHelp( const HelpEvent& /*rHEvt*/ ) { @@ -524,14 +524,14 @@ void HelpTextWindow::RequestHelp( const HelpEvent& /*rHEvt*/ ) // ShowQuickHelp/ShowBalloonHelp in the HelpTextWindow. } -// ----------------------------------------------------------------------- + OUString HelpTextWindow::GetText() const { return maHelpText; } -// ----------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > HelpTextWindow::CreateAccessible() { @@ -618,7 +618,7 @@ void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 n } } -// ----------------------------------------------------------------------- + void ImplDestroyHelpWindow( bool bUpdateHideTime ) { @@ -640,7 +640,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime ) } } -// ----------------------------------------------------------------------- + void ImplSetHelpWindowPos( Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const Point& rPos, const Rectangle* pHelpArea ) diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 8ed1ec84f73b..d3f377535091 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -36,7 +36,7 @@ SalFrame::~SalFrame() { } -// ----------------------------------------------------------------------- + // default to full-frame flushes // on ports where partial-flushes are much cheaper this method should be overridden @@ -45,14 +45,14 @@ void SalFrame::Flush( const Rectangle& ) Flush(); } -// ----------------------------------------------------------------------- + void SalFrame::SetRepresentedURL( const OUString& ) { // currently this is Mac only functionality } -// ----------------------------------------------------------------------- + SalInstance::~SalInstance() { diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index d9d25d7623b9..dfbb001cb769 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -89,7 +89,7 @@ void ImplInitSVData() pImplSVData->maAppData.mnDefaultLayoutBorder = -1; } -// ----------------------------------------------------------------------- + void ImplDeInitSVData() { @@ -110,14 +110,14 @@ void ImplDeInitSVData() delete pSVData->mpPaperNames, pSVData->mpPaperNames = NULL; } -// ----------------------------------------------------------------------- + void ImplDestroySVData() { pImplSVData = NULL; } -// ----------------------------------------------------------------------- + Window* ImplGetDefaultWindow() { @@ -149,7 +149,7 @@ Window* ImplGetDefaultWindow() return pSVData->mpDefaultWin; } -// ----------------------------------------------------------------------- + ResMgr* ImplGetResMgr() { @@ -315,7 +315,7 @@ bool ImplInitAccessBridge() return true; } -// ----------------------------------------------------------------------- + Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos ) { diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index fed5316fef91..5fa2a1680a59 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -207,7 +207,7 @@ void GenericClipboard::removeClipboardListener( const Reference< datatransfer::c m_aListeners.remove( listener ); } -// ------------------------------------------------------------------------ + class ClipboardFactory : public ::cppu::WeakComponentImplHelper1< com::sun::star::lang::XSingleServiceFactory @@ -225,7 +225,7 @@ public: virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw(); }; -// ------------------------------------------------------------------------ + ClipboardFactory::ClipboardFactory() : cppu::WeakComponentImplHelper1< @@ -234,20 +234,20 @@ ClipboardFactory::ClipboardFactory() : { } -// ------------------------------------------------------------------------ + ClipboardFactory::~ClipboardFactory() { } -// ------------------------------------------------------------------------ + Reference< XInterface > ClipboardFactory::createInstance() throw() { return createInstanceWithArguments( Sequence< Any >() ); } -// ------------------------------------------------------------------------ + Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw() { diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 9e5a138856ec..572051d65d12 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::awt; -// ----------------------------------------------------------------------- + namespace vcl { @@ -67,7 +67,7 @@ FontIdentificator() {} }; -// -------------------------------------------------------------------- + FontIdentificator::~FontIdentificator() { diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index ffeab10531d2..94d2ab883c67 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -79,13 +79,13 @@ public: ~ImplCommonButtonData(); }; -// ----------------------------------------------------------------------- + ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), mnButtonState(0), mbSmallSymbol(false), maImage(), meImageAlign(IMAGEALIGN_TOP), meSymbolAlign(SYMBOLALIGN_LEFT) { } -// ----------------------------------------------------------------------- + ImplCommonButtonData::~ImplCommonButtonData() { } @@ -98,21 +98,21 @@ Button::Button( WindowType nType ) : mpButtonData = new ImplCommonButtonData; } -// ----------------------------------------------------------------------- + Button::~Button() { delete mpButtonData; } -// ----------------------------------------------------------------------- + void Button::Click() { ImplCallEventListenersAndHandler( VCLEVENT_BUTTON_CLICK, maClickHdl, this ); } -// ----------------------------------------------------------------------- + OUString Button::GetStandardText( StandardButtonType eButton ) { @@ -157,7 +157,7 @@ OUString Button::GetStandardText( StandardButtonType eButton ) return ResId(nResId, *pResMgr).toString(); } -// ----------------------------------------------------------------------- + bool Button::SetModeImage( const Image& rImage ) { if ( rImage != mpButtonData->maImage ) @@ -169,19 +169,19 @@ bool Button::SetModeImage( const Image& rImage ) return true; } -// ----------------------------------------------------------------------- + const Image Button::GetModeImage( ) const { return mpButtonData->maImage; } -// ----------------------------------------------------------------------- + bool Button::HasImage() const { return !!(mpButtonData->maImage); } -// ----------------------------------------------------------------------- + void Button::SetImageAlign( ImageAlign eAlign ) { if ( mpButtonData->meImageAlign != eAlign ) @@ -191,20 +191,20 @@ void Button::SetImageAlign( ImageAlign eAlign ) } } -// ----------------------------------------------------------------------- + ImageAlign Button::GetImageAlign() const { return mpButtonData->meImageAlign; } -// ----------------------------------------------------------------------- + void Button::SetFocusRect( const Rectangle& rFocusRect ) { ImplSetFocusRect( rFocusRect ); } -// ----------------------------------------------------------------------- + long Button::ImplGetSeparatorX() const { @@ -216,7 +216,7 @@ void Button::ImplSetSeparatorX( long nX ) mpButtonData->mnSeparatorX = nX; } -// ----------------------------------------------------------------------- + sal_uInt16 Button::ImplGetTextStyle( OUString& rText, WinBits nWinStyle, sal_uLong nDrawFlags ) @@ -246,7 +246,7 @@ sal_uInt16 Button::ImplGetTextStyle( OUString& rText, WinBits nWinStyle, return nTextStyle; } -// ----------------------------------------------------------------------- + void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, Size& rSize, bool bLayout, @@ -520,7 +520,7 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, } } -// ----------------------------------------------------------------------- + void Button::ImplSetFocusRect( const Rectangle &rFocusRect ) { Rectangle aFocusRect = rFocusRect; @@ -542,25 +542,25 @@ void Button::ImplSetFocusRect( const Rectangle &rFocusRect ) mpButtonData->maFocusRect = aFocusRect; } -// ----------------------------------------------------------------------- + const Rectangle& Button::ImplGetFocusRect() const { return mpButtonData->maFocusRect; } -// ----------------------------------------------------------------------- + sal_uInt16& Button::ImplGetButtonState() { return mpButtonData->mnButtonState; } -// ----------------------------------------------------------------------- + sal_uInt16 Button::ImplGetButtonState() const { return mpButtonData->mnButtonState; } -// ----------------------------------------------------------------------- + void Button::ImplSetSymbolAlign( SymbolAlign eAlign ) { if ( mpButtonData->meSymbolAlign != eAlign ) @@ -570,13 +570,13 @@ void Button::ImplSetSymbolAlign( SymbolAlign eAlign ) } } -// ----------------------------------------------------------------------- + void Button::SetSmallSymbol(bool bSmall) { mpButtonData->mbSmallSymbol = bSmall; } -// ----------------------------------------------------------------------- + void Button::EnableImageDisplay( bool bEnable ) { if( bEnable ) @@ -585,7 +585,7 @@ void Button::EnableImageDisplay( bool bEnable ) mpButtonData->mnButtonState |= BUTTON_DRAW_NOIMAGE; } -// ----------------------------------------------------------------------- + void Button::EnableTextDisplay( bool bEnable ) { if( bEnable ) @@ -633,7 +633,7 @@ void PushButton::ImplInitPushButtonData() mbInUserDraw = false; } -// ----------------------------------------------------------------------- + void PushButton::ImplInit( Window* pParent, WinBits nStyle ) { @@ -646,7 +646,7 @@ void PushButton::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -// ----------------------------------------------------------------------- + WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) { @@ -669,20 +669,20 @@ WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------- + const Font& PushButton::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetPushButtonFont(); } -// ----------------------------------------------------------------- + const Color& PushButton::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetButtonTextColor(); } -// ----------------------------------------------------------------------- + void PushButton::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -714,7 +714,7 @@ void PushButton::ImplInitSettings( bool bFont, } } -// ----------------------------------------------------------------------- + void PushButton::ImplDrawPushButtonFrame( Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ) @@ -742,7 +742,7 @@ void PushButton::ImplDrawPushButtonFrame( Window* pDev, rRect = aDecoView.DrawButton( rRect, nStyle ); } -// ----------------------------------------------------------------------- + bool PushButton::ImplHitTestPushButton( Window* pDev, const Point& rPos ) @@ -753,7 +753,7 @@ bool PushButton::ImplHitTestPushButton( Window* pDev, return aTestRect.IsInside( rPos ); } -// ----------------------------------------------------------------------- + sal_uInt16 PushButton::ImplGetTextStyle( sal_uLong nDrawFlags ) const { @@ -790,7 +790,7 @@ sal_uInt16 PushButton::ImplGetTextStyle( sal_uLong nDrawFlags ) const return nTextStyle; } -// ----------------------------------------------------------------------- + static void ImplDrawBtnDropDownArrow( OutputDevice* pDev, long nX, long nY, @@ -818,7 +818,7 @@ static void ImplDrawBtnDropDownArrow( OutputDevice* pDev, pDev->SetFillColor( aOldFillColor ); } -// ----------------------------------------------------------------------- + void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, const Rectangle& rRect, @@ -940,13 +940,13 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF pDev->Pop(); // restore clipregion } -// ----------------------------------------------------------------------- + void PushButton::UserDraw( const UserDrawEvent& ) { } -// ----------------------------------------------------------------------- + void PushButton::ImplDrawPushButton( bool bLayout ) { @@ -1123,7 +1123,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) } } -// ----------------------------------------------------------------------- + void PushButton::ImplSetDefButton( bool bSet ) { @@ -1183,14 +1183,14 @@ void PushButton::ImplSetDefButton( bool bSet ) Invalidate(); } -// ----------------------------------------------------------------------- + bool PushButton::ImplIsDefButton() const { return (ImplGetButtonState() & BUTTON_DRAW_DEFAULT) != 0; } -// ----------------------------------------------------------------------- + PushButton::PushButton( WindowType nType ) : Button( nType ) @@ -1198,7 +1198,7 @@ PushButton::PushButton( WindowType nType ) : ImplInitPushButtonData(); } -// ----------------------------------------------------------------------- + PushButton::PushButton( Window* pParent, WinBits nStyle ) : Button( WINDOW_PUSHBUTTON ) @@ -1207,7 +1207,7 @@ PushButton::PushButton( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + PushButton::PushButton( Window* pParent, const ResId& rResId ) : Button( WINDOW_PUSHBUTTON ) @@ -1222,13 +1222,13 @@ PushButton::PushButton( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + PushButton::~PushButton() { } -// ----------------------------------------------------------------------- + void PushButton::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -1250,7 +1250,7 @@ void PushButton::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void PushButton::Tracking( const TrackingEvent& rTEvt ) { @@ -1316,7 +1316,7 @@ void PushButton::Tracking( const TrackingEvent& rTEvt ) } } -// ----------------------------------------------------------------------- + void PushButton::KeyInput( const KeyEvent& rKEvt ) { @@ -1344,7 +1344,7 @@ void PushButton::KeyInput( const KeyEvent& rKEvt ) Button::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + void PushButton::KeyUp( const KeyEvent& rKEvt ) { @@ -1378,7 +1378,7 @@ void PushButton::KeyUp( const KeyEvent& rKEvt ) Button::KeyUp( rKEvt ); } -// ----------------------------------------------------------------------- + void PushButton::FillLayoutData() const { @@ -1386,14 +1386,14 @@ void PushButton::FillLayoutData() const const_cast<PushButton*>(this)->ImplDrawPushButton( true ); } -// ----------------------------------------------------------------------- + void PushButton::Paint( const Rectangle& ) { ImplDrawPushButton(); } -// ----------------------------------------------------------------------- + void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) @@ -1438,7 +1438,7 @@ void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } -// ----------------------------------------------------------------------- + void PushButton::Resize() { @@ -1446,7 +1446,7 @@ void PushButton::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void PushButton::GetFocus() { @@ -1455,7 +1455,7 @@ void PushButton::GetFocus() Button::GetFocus(); } -// ----------------------------------------------------------------------- + void PushButton::LoseFocus() { @@ -1464,7 +1464,7 @@ void PushButton::LoseFocus() Button::LoseFocus(); } -// ----------------------------------------------------------------------- + void PushButton::StateChanged( StateChangedType nType ) { @@ -1514,7 +1514,7 @@ void PushButton::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void PushButton::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1530,7 +1530,7 @@ void PushButton::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + bool PushButton::PreNotify( NotifyEvent& rNEvt ) { @@ -1597,14 +1597,14 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt ) return Button::PreNotify(rNEvt); } -// ----------------------------------------------------------------------- + void PushButton::Toggle() { ImplCallEventListenersAndHandler( VCLEVENT_PUSHBUTTON_TOGGLE, maToggleHdl, this ); } -// ----------------------------------------------------------------------- + void PushButton::SetSymbol( SymbolType eSymbol ) { @@ -1615,13 +1615,13 @@ void PushButton::SetSymbol( SymbolType eSymbol ) } } -// ----------------------------------------------------------------------- + void PushButton::SetSymbolAlign( SymbolAlign eAlign ) { ImplSetSymbolAlign( eAlign ); } -// ----------------------------------------------------------------------- + void PushButton::SetDropDown( sal_uInt16 nStyle ) { @@ -1632,7 +1632,7 @@ void PushButton::SetDropDown( sal_uInt16 nStyle ) } } -// ----------------------------------------------------------------------- + void PushButton::SetState( TriState eState ) { @@ -1657,7 +1657,7 @@ void PushButton::SetState( TriState eState ) } } -// ----------------------------------------------------------------------- + void PushButton::SetPressed( bool bPressed ) { @@ -1668,7 +1668,7 @@ void PushButton::SetPressed( bool bPressed ) } } -// ----------------------------------------------------------------------- + void PushButton::EndSelection() { @@ -1681,7 +1681,7 @@ void PushButton::EndSelection() } } -// ----------------------------------------------------------------------- + Size PushButton::CalcMinimumSize( long nMaxWidth ) const { @@ -1750,7 +1750,7 @@ void OKButton::ImplInit( Window* pParent, WinBits nStyle ) SetText( Button::GetStandardText( BUTTON_OK ) ); } -// ----------------------------------------------------------------------- + OKButton::OKButton( Window* pParent, WinBits nStyle ) : PushButton( WINDOW_OKBUTTON ) @@ -1758,7 +1758,7 @@ OKButton::OKButton( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + OKButton::OKButton( Window* pParent, const ResId& rResId ) : PushButton( WINDOW_OKBUTTON ) @@ -1772,7 +1772,7 @@ OKButton::OKButton( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void OKButton::Click() { @@ -1815,7 +1815,7 @@ void CancelButton::ImplInit( Window* pParent, WinBits nStyle ) SetText( Button::GetStandardText( BUTTON_CANCEL ) ); } -// ----------------------------------------------------------------------- + CancelButton::CancelButton( Window* pParent, WinBits nStyle ) : PushButton( WINDOW_CANCELBUTTON ) @@ -1823,7 +1823,7 @@ CancelButton::CancelButton( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + CancelButton::CancelButton( Window* pParent, const ResId& rResId ) : PushButton( WINDOW_CANCELBUTTON ) @@ -1837,7 +1837,7 @@ CancelButton::CancelButton( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void CancelButton::Click() { @@ -1886,7 +1886,7 @@ void HelpButton::ImplInit( Window* pParent, WinBits nStyle ) SetText( Button::GetStandardText( BUTTON_HELP ) ); } -// ----------------------------------------------------------------------- + HelpButton::HelpButton( Window* pParent, WinBits nStyle ) : PushButton( WINDOW_HELPBUTTON ) @@ -1894,7 +1894,7 @@ HelpButton::HelpButton( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + HelpButton::HelpButton( Window* pParent, const ResId& rResId ) : PushButton( WINDOW_HELPBUTTON ) @@ -1908,7 +1908,7 @@ HelpButton::HelpButton( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void HelpButton::Click() { @@ -1935,7 +1935,7 @@ void RadioButton::ImplInitRadioButtonData() mbStateChanged = false; } -// ----------------------------------------------------------------------- + void RadioButton::ImplInit( Window* pParent, WinBits nStyle ) { @@ -1945,7 +1945,7 @@ void RadioButton::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -// ----------------------------------------------------------------------- + WinBits RadioButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) { @@ -1962,20 +1962,20 @@ WinBits RadioButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------- + const Font& RadioButton::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetRadioCheckFont(); } -// ----------------------------------------------------------------- + const Color& RadioButton::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetRadioCheckTextColor(); } -// ----------------------------------------------------------------------- + void RadioButton::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -2014,7 +2014,7 @@ void RadioButton::DrawRadioButtonState( ) ImplDrawRadioButtonState( ); } -// ----------------------------------------------------------------------- + void RadioButton::ImplInvalidateOrDrawRadioButtonState() { @@ -2140,7 +2140,7 @@ void RadioButton::ImplDrawRadioButtonState() } } -// ----------------------------------------------------------------------- + void RadioButton::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, @@ -2278,7 +2278,7 @@ void RadioButton::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, pDev->Pop(); } -// ----------------------------------------------------------------------- + void RadioButton::ImplDrawRadioButton( bool bLayout ) { @@ -2395,7 +2395,7 @@ std::vector< RadioButton* > RadioButton::GetRadioButtonGroup(bool bIncludeThis) return aGroup; } -// ----------------------------------------------------------------------- + void RadioButton::ImplUncheckAllOther() { @@ -2421,7 +2421,7 @@ void RadioButton::ImplUncheckAllOther() } } -// ----------------------------------------------------------------------- + void RadioButton::ImplCallClick( bool bGrabFocus, sal_uInt16 nFocusFlags ) { @@ -2450,7 +2450,7 @@ void RadioButton::ImplCallClick( bool bGrabFocus, sal_uInt16 nFocusFlags ) mbStateChanged = false; } -// ----------------------------------------------------------------------- + RadioButton::RadioButton( Window* pParent, WinBits nStyle ) : Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false ) @@ -2459,7 +2459,7 @@ RadioButton::RadioButton( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + RadioButton::RadioButton( Window* pParent, const ResId& rResId ) : Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false ) @@ -2474,7 +2474,7 @@ RadioButton::RadioButton( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void RadioButton::ImplLoadRes( const ResId& rResId ) { @@ -2486,7 +2486,7 @@ void RadioButton::ImplLoadRes( const ResId& rResId ) SetState( true ); } -// ----------------------------------------------------------------------- + RadioButton::~RadioButton() { @@ -2497,7 +2497,7 @@ RadioButton::~RadioButton() } } -// ----------------------------------------------------------------------- + void RadioButton::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -2512,7 +2512,7 @@ void RadioButton::MouseButtonDown( const MouseEvent& rMEvt ) Button::MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void RadioButton::Tracking( const TrackingEvent& rTEvt ) { @@ -2553,7 +2553,7 @@ void RadioButton::Tracking( const TrackingEvent& rTEvt ) } } -// ----------------------------------------------------------------------- + void RadioButton::KeyInput( const KeyEvent& rKEvt ) { @@ -2576,7 +2576,7 @@ void RadioButton::KeyInput( const KeyEvent& rKEvt ) Button::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + void RadioButton::KeyUp( const KeyEvent& rKEvt ) { @@ -2591,7 +2591,7 @@ void RadioButton::KeyUp( const KeyEvent& rKEvt ) Button::KeyUp( rKEvt ); } -// ----------------------------------------------------------------------- + void RadioButton::FillLayoutData() const { @@ -2599,14 +2599,14 @@ void RadioButton::FillLayoutData() const const_cast<RadioButton*>(this)->ImplDrawRadioButton( true ); } -// ----------------------------------------------------------------------- + void RadioButton::Paint( const Rectangle& ) { ImplDrawRadioButton(); } -// ----------------------------------------------------------------------- + void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) @@ -2682,7 +2682,7 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize } } -// ----------------------------------------------------------------------- + void RadioButton::Resize() { @@ -2690,7 +2690,7 @@ void RadioButton::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void RadioButton::GetFocus() { @@ -2699,7 +2699,7 @@ void RadioButton::GetFocus() Button::GetFocus(); } -// ----------------------------------------------------------------------- + void RadioButton::LoseFocus() { @@ -2713,7 +2713,7 @@ void RadioButton::LoseFocus() Button::LoseFocus(); } -// ----------------------------------------------------------------------- + void RadioButton::StateChanged( StateChangedType nType ) { @@ -2762,7 +2762,7 @@ void RadioButton::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void RadioButton::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -2778,7 +2778,7 @@ void RadioButton::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + bool RadioButton::PreNotify( NotifyEvent& rNEvt ) { @@ -2806,14 +2806,14 @@ bool RadioButton::PreNotify( NotifyEvent& rNEvt ) return Button::PreNotify(rNEvt); } -// ----------------------------------------------------------------------- + void RadioButton::Toggle() { ImplCallEventListenersAndHandler( VCLEVENT_RADIOBUTTON_TOGGLE, maToggleHdl, this ); } -// ----------------------------------------------------------------------- + bool RadioButton::SetModeRadioImage( const Image& rImage ) { @@ -2826,14 +2826,14 @@ bool RadioButton::SetModeRadioImage( const Image& rImage ) return true; } -// ----------------------------------------------------------------------- + const Image& RadioButton::GetModeRadioImage( ) const { return maImage; } -// ----------------------------------------------------------------------- + void RadioButton::SetState( bool bCheck ) { @@ -2890,7 +2890,7 @@ bool RadioButton::set_property(const OString &rKey, const OString &rValue) return true; } -// ----------------------------------------------------------------------- + void RadioButton::Check( bool bCheck ) { @@ -2917,7 +2917,7 @@ void RadioButton::Check( bool bCheck ) } } -// ----------------------------------------------------------------------- + long RadioButton::ImplGetImageToTextDistance() const { @@ -2926,7 +2926,7 @@ long RadioButton::ImplGetImageToTextDistance() const return CalcZoom( 4 ); } -// ----------------------------------------------------------------------- + Size RadioButton::ImplGetRadioImageSize() const { @@ -3037,7 +3037,7 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, sal_uInt16 nFlag return pSVData->maCtrlData.mpRadioImgList->GetImage( nId ); } -// ----------------------------------------------------------------------- + void RadioButton::ImplSetMinimumNWFSize() { @@ -3066,7 +3066,7 @@ void RadioButton::ImplSetMinimumNWFSize() Pop(); } -// ----------------------------------------------------------------------- + Size RadioButton::CalcMinimumSize( long nMaxWidth ) const { @@ -3118,7 +3118,7 @@ Size RadioButton::CalcMinimumSize( long nMaxWidth ) const return CalcWindowSize( aSize ); } -// ----------------------------------------------------------------------- + Size RadioButton::GetOptimalSize() const { @@ -3134,7 +3134,7 @@ void CheckBox::ImplInitCheckBoxData() mbTriState = false; } -// ----------------------------------------------------------------------- + void CheckBox::ImplInit( Window* pParent, WinBits nStyle ) { @@ -3144,7 +3144,7 @@ void CheckBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -// ----------------------------------------------------------------------- + WinBits CheckBox::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) { @@ -3156,20 +3156,20 @@ WinBits CheckBox::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------- + const Font& CheckBox::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetRadioCheckFont(); } -// ----------------------------------------------------------------- + const Color& CheckBox::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetRadioCheckTextColor(); } -// ----------------------------------------------------------------------- + void CheckBox::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -3203,7 +3203,7 @@ void CheckBox::ImplInitSettings( bool bFont, } } -// ----------------------------------------------------------------------- + void CheckBox::ImplLoadRes( const ResId& rResId ) { @@ -3218,7 +3218,7 @@ void CheckBox::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + void CheckBox::ImplInvalidateOrDrawCheckBoxState() { @@ -3278,7 +3278,7 @@ void CheckBox::ImplDrawCheckBoxState() } } -// ----------------------------------------------------------------------- + void CheckBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, @@ -3383,7 +3383,7 @@ void CheckBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, pDev->Pop(); } -// ----------------------------------------------------------------------- + void CheckBox::ImplDrawCheckBox( bool bLayout ) { @@ -3405,7 +3405,7 @@ void CheckBox::ImplDrawCheckBox( bool bLayout ) } } -// ----------------------------------------------------------------------- + void CheckBox::ImplCheck() { @@ -3433,7 +3433,7 @@ void CheckBox::ImplCheck() Click(); } -// ----------------------------------------------------------------------- + CheckBox::CheckBox( Window* pParent, WinBits nStyle ) : Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false ) @@ -3442,7 +3442,7 @@ CheckBox::CheckBox( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + CheckBox::CheckBox( Window* pParent, const ResId& rResId ) : Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false ) @@ -3457,7 +3457,7 @@ CheckBox::CheckBox( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void CheckBox::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -3472,7 +3472,7 @@ void CheckBox::MouseButtonDown( const MouseEvent& rMEvt ) Button::MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void CheckBox::Tracking( const TrackingEvent& rTEvt ) { @@ -3513,7 +3513,7 @@ void CheckBox::Tracking( const TrackingEvent& rTEvt ) } } -// ----------------------------------------------------------------------- + void CheckBox::KeyInput( const KeyEvent& rKEvt ) { @@ -3536,7 +3536,7 @@ void CheckBox::KeyInput( const KeyEvent& rKEvt ) Button::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + void CheckBox::KeyUp( const KeyEvent& rKEvt ) { @@ -3551,7 +3551,7 @@ void CheckBox::KeyUp( const KeyEvent& rKEvt ) Button::KeyUp( rKEvt ); } -// ----------------------------------------------------------------------- + void CheckBox::FillLayoutData() const { @@ -3559,14 +3559,14 @@ void CheckBox::FillLayoutData() const const_cast<CheckBox*>(this)->ImplDrawCheckBox( true ); } -// ----------------------------------------------------------------------- + void CheckBox::Paint( const Rectangle& ) { ImplDrawCheckBox(); } -// ----------------------------------------------------------------------- + void CheckBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) @@ -3666,7 +3666,7 @@ void CheckBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } -// ----------------------------------------------------------------------- + void CheckBox::Resize() { @@ -3674,7 +3674,7 @@ void CheckBox::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void CheckBox::GetFocus() { @@ -3698,7 +3698,7 @@ void CheckBox::GetFocus() Button::GetFocus(); } -// ----------------------------------------------------------------------- + void CheckBox::LoseFocus() { @@ -3725,7 +3725,7 @@ void CheckBox::LoseFocus() } } -// ----------------------------------------------------------------------- + void CheckBox::StateChanged( StateChangedType nType ) { @@ -3774,7 +3774,7 @@ void CheckBox::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void CheckBox::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -3790,7 +3790,7 @@ void CheckBox::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + bool CheckBox::PreNotify( NotifyEvent& rNEvt ) { @@ -3818,14 +3818,14 @@ bool CheckBox::PreNotify( NotifyEvent& rNEvt ) return Button::PreNotify(rNEvt); } -// ----------------------------------------------------------------------- + void CheckBox::Toggle() { ImplCallEventListenersAndHandler( VCLEVENT_CHECKBOX_TOGGLE, maToggleHdl, this ); } -// ----------------------------------------------------------------------- + void CheckBox::SetState( TriState eState ) { @@ -3849,7 +3849,7 @@ bool CheckBox::set_property(const OString &rKey, const OString &rValue) return true; } -// ----------------------------------------------------------------------- + void CheckBox::EnableTriState( bool bTriState ) { @@ -3862,7 +3862,7 @@ void CheckBox::EnableTriState( bool bTriState ) } } -// ----------------------------------------------------------------------- + long CheckBox::ImplGetImageToTextDistance() const { @@ -3871,7 +3871,7 @@ long CheckBox::ImplGetImageToTextDistance() const return CalcZoom( 4 ); } -// ----------------------------------------------------------------------- + Size CheckBox::ImplGetCheckImageSize() const { @@ -3961,7 +3961,7 @@ Image CheckBox::GetCheckImage( const AllSettings& rSettings, sal_uInt16 nFlags ) return pSVData->maCtrlData.mpCheckImgList->GetImage( nId ); } -// ----------------------------------------------------------------------- + void CheckBox::ImplSetMinimumNWFSize() { @@ -3990,7 +3990,7 @@ void CheckBox::ImplSetMinimumNWFSize() Pop(); } -// ----------------------------------------------------------------------- + Size CheckBox::CalcMinimumSize( long nMaxWidth ) const { @@ -4025,7 +4025,7 @@ Size CheckBox::CalcMinimumSize( long nMaxWidth ) const return CalcWindowSize( aSize ); } -// ----------------------------------------------------------------------- + Size CheckBox::GetOptimalSize() const { @@ -4040,7 +4040,7 @@ ImageButton::ImageButton( Window* pParent, WinBits nStyle ) : ImplInitStyle(); } -// ----------------------------------------------------------------------- + ImageButton::ImageButton( Window* pParent, const ResId& rResId ) : PushButton( pParent, rResId.SetRT( RSC_IMAGEBUTTON ) ) @@ -4062,13 +4062,13 @@ ImageButton::ImageButton( Window* pParent, const ResId& rResId ) : ImplInitStyle(); } -// ----------------------------------------------------------------------- + ImageButton::~ImageButton() { } -// ----------------------------------------------------------------------- + void ImageButton::ImplInitStyle() { WinBits nStyle = GetStyle(); @@ -4089,7 +4089,7 @@ ImageRadioButton::ImageRadioButton( Window* pParent, WinBits nStyle ) : { } -// ----------------------------------------------------------------------- + ImageRadioButton::~ImageRadioButton() { @@ -4103,7 +4103,7 @@ TriStateBox::TriStateBox( Window* pParent, WinBits nStyle ) : EnableTriState( true ); } -// ----------------------------------------------------------------------- + TriStateBox::~TriStateBox() { @@ -4116,7 +4116,7 @@ DisclosureButton::DisclosureButton( Window* pParent, WinBits nStyle ) : { } -// ----------------------------------------------------------------------- + void DisclosureButton::ImplDrawCheckBoxState() { @@ -4168,7 +4168,7 @@ void DisclosureButton::ImplDrawCheckBoxState() } } -// ----------------------------------------------------------------------- + void DisclosureButton::KeyInput( const KeyEvent& rKEvt ) { diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index b6d8c9bc851e..22ae03aca7e2 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -56,7 +56,7 @@ ComboBox::ComboBox( WindowType nType ) : SetWidthInChars(-1); } -// ----------------------------------------------------------------------- + ComboBox::ComboBox( Window* pParent, WinBits nStyle ) : Edit( WINDOW_COMBOBOX ) @@ -66,7 +66,7 @@ ComboBox::ComboBox( Window* pParent, WinBits nStyle ) : SetWidthInChars(-1); } -// ----------------------------------------------------------------------- + ComboBox::ComboBox( Window* pParent, const ResId& rResId ) : Edit( WINDOW_COMBOBOX ) @@ -82,7 +82,7 @@ ComboBox::ComboBox( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + ComboBox::~ComboBox() { @@ -97,7 +97,7 @@ ComboBox::~ComboBox() delete mpBtn; } -// ----------------------------------------------------------------------- + void ComboBox::ImplInitComboBoxData() { @@ -114,7 +114,7 @@ void ComboBox::ImplInitComboBoxData() m_nMaxWidthChars = -1; } -// ----------------------------------------------------------------------- + void ComboBox::ImplCalcEditHeight() { @@ -140,7 +140,7 @@ void ComboBox::ImplCalcEditHeight() } } -// ----------------------------------------------------------------------- + void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) { @@ -219,7 +219,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) SetCompoundControl( true ); } -// ----------------------------------------------------------------------- + WinBits ComboBox::ImplInitStyle( WinBits nStyle ) { @@ -230,7 +230,7 @@ WinBits ComboBox::ImplInitStyle( WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------------- + void ComboBox::ImplLoadRes( const ResId& rResId ) { @@ -247,7 +247,7 @@ void ComboBox::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + void ComboBox::EnableAutocomplete( bool bEnable, bool bMatchCase ) { @@ -259,14 +259,14 @@ void ComboBox::EnableAutocomplete( bool bEnable, bool bMatchCase ) mpSubEdit->SetAutocompleteHdl( Link() ); } -// ----------------------------------------------------------------------- + bool ComboBox::IsAutocompleteEnabled() const { return mpSubEdit->GetAutocompleteHdl().IsSet(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl) { @@ -288,7 +288,7 @@ IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl) { @@ -313,7 +313,7 @@ IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit ) { @@ -370,7 +370,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) { @@ -476,7 +476,7 @@ IMPL_LINK_NOARG(ComboBox, ImplCancelHdl) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( ComboBox, ImplSelectionChangedHdl, void*, n ) { @@ -489,7 +489,7 @@ IMPL_LINK( ComboBox, ImplSelectionChangedHdl, void*, n ) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ComboBox, ImplDoubleClickHdl) { @@ -497,7 +497,7 @@ IMPL_LINK_NOARG(ComboBox, ImplDoubleClickHdl) return 0; } -// ----------------------------------------------------------------------- + void ComboBox::ToggleDropDown() { @@ -521,21 +521,21 @@ void ComboBox::ToggleDropDown() } } -// ----------------------------------------------------------------------- + void ComboBox::Select() { ImplCallEventListenersAndHandler( VCLEVENT_COMBOBOX_SELECT, maSelectHdl, this ); } -// ----------------------------------------------------------------------- + void ComboBox::DoubleClick() { ImplCallEventListenersAndHandler( VCLEVENT_COMBOBOX_DOUBLECLICK, maDoubleClickHdl, this ); } -// ----------------------------------------------------------------------- + void ComboBox::EnableAutoSize( bool bAuto ) { @@ -554,7 +554,7 @@ void ComboBox::EnableAutoSize( bool bAuto ) } } -// ----------------------------------------------------------------------- + void ComboBox::EnableDDAutoWidth( bool b ) { @@ -562,7 +562,7 @@ void ComboBox::EnableDDAutoWidth( bool b ) mpFloatWin->SetAutoWidth( b ); } - // ----------------------------------------------------------------------- + void ComboBox::SetDropDownLineCount( sal_uInt16 nLines ) { @@ -570,7 +570,7 @@ void ComboBox::SetDropDownLineCount( sal_uInt16 nLines ) mpFloatWin->SetDropDownLineCount( nLines ); } -// ----------------------------------------------------------------------- + void ComboBox::AdaptDropDownLineCountToMaximum() { @@ -578,7 +578,7 @@ void ComboBox::AdaptDropDownLineCountToMaximum() SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()); } -// ----------------------------------------------------------------------- + sal_uInt16 ComboBox::GetDropDownLineCount() const { @@ -588,7 +588,7 @@ sal_uInt16 ComboBox::GetDropDownLineCount() const return nLines; } -// ----------------------------------------------------------------------- + void ComboBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) @@ -609,7 +609,7 @@ void ComboBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, Edit::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags ); } -// ----------------------------------------------------------------------- + void ComboBox::Resize() { @@ -637,7 +637,7 @@ void ComboBox::Resize() mpFloatWin->SetSizePixel( mpFloatWin->CalcFloatSize() ); } -// ----------------------------------------------------------------------- + void ComboBox::FillLayoutData() const { @@ -661,7 +661,7 @@ void ComboBox::FillLayoutData() const } } -// ----------------------------------------------------------------------- + void ComboBox::StateChanged( StateChangedType nType ) { @@ -727,7 +727,7 @@ void ComboBox::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void ComboBox::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -751,7 +751,7 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + bool ComboBox::PreNotify( NotifyEvent& rNEvt ) { @@ -759,7 +759,7 @@ bool ComboBox::PreNotify( NotifyEvent& rNEvt ) return Edit::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool ComboBox::Notify( NotifyEvent& rNEvt ) { @@ -844,7 +844,7 @@ bool ComboBox::Notify( NotifyEvent& rNEvt ) return nDone || Edit::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void ComboBox::SetText( const OUString& rStr ) { @@ -854,7 +854,7 @@ void ComboBox::SetText( const OUString& rStr ) ImplUpdateFloatSelection(); } -// ----------------------------------------------------------------------- + void ComboBox::SetText( const OUString& rStr, const Selection& rNewSelection ) { @@ -864,7 +864,7 @@ void ComboBox::SetText( const OUString& rStr, const Selection& rNewSelection ) ImplUpdateFloatSelection(); } -// ----------------------------------------------------------------------- + void ComboBox::Modify() { @@ -874,7 +874,7 @@ void ComboBox::Modify() Edit::Modify(); } -// ----------------------------------------------------------------------- + void ComboBox::ImplUpdateFloatSelection() { @@ -925,7 +925,7 @@ void ComboBox::ImplUpdateFloatSelection() mpImplLB->SetCallSelectionChangedHdl( true ); } -// ----------------------------------------------------------------------- + sal_uInt16 ComboBox::InsertEntry(const OUString& rStr, sal_uInt16 const nPos) { @@ -935,7 +935,7 @@ sal_uInt16 ComboBox::InsertEntry(const OUString& rStr, sal_uInt16 const nPos) return nRealPos; } -// ----------------------------------------------------------------------- + void ComboBox::InsertEntryWithImage( const OUString& rStr, const Image& rImage, sal_uInt16 const nPos) @@ -945,14 +945,14 @@ void ComboBox::InsertEntryWithImage( CallEventListeners( VCLEVENT_COMBOBOX_ITEMADDED, (void*) sal_IntPtr(nRealPos) ); } -// ----------------------------------------------------------------------- + void ComboBox::RemoveEntry( const OUString& rStr ) { RemoveEntryAt(GetEntryPos(rStr)); } -// ----------------------------------------------------------------------- + void ComboBox::RemoveEntryAt(sal_uInt16 const nPos) { @@ -960,14 +960,14 @@ void ComboBox::RemoveEntryAt(sal_uInt16 const nPos) CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, (void*) sal_IntPtr(nPos) ); } -// ----------------------------------------------------------------------- + void ComboBox::Clear() { mpImplLB->Clear(); CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, (void*) sal_IntPtr(-1) ); } -// ----------------------------------------------------------------------- + Image ComboBox::GetEntryImage( sal_uInt16 nPos ) const { @@ -976,7 +976,7 @@ Image ComboBox::GetEntryImage( sal_uInt16 nPos ) const return Image(); } -// ----------------------------------------------------------------------- + sal_uInt16 ComboBox::GetEntryPos( const OUString& rStr ) const { @@ -986,35 +986,35 @@ sal_uInt16 ComboBox::GetEntryPos( const OUString& rStr ) const return nPos; } -// ----------------------------------------------------------------------- + OUString ComboBox::GetEntry( sal_uInt16 nPos ) const { return mpImplLB->GetEntryList()->GetEntryText( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); } -// ----------------------------------------------------------------------- + sal_uInt16 ComboBox::GetEntryCount() const { return mpImplLB->GetEntryList()->GetEntryCount() - mpImplLB->GetEntryList()->GetMRUCount(); } -// ----------------------------------------------------------------------- + bool ComboBox::IsTravelSelect() const { return mpImplLB->IsTravelSelect(); } -// ----------------------------------------------------------------------- + bool ComboBox::IsInDropDown() const { return mpFloatWin && mpFloatWin->IsInPopupMode(); } -// ----------------------------------------------------------------------- + void ComboBox::EnableMultiSelection( bool bMulti ) { @@ -1022,28 +1022,28 @@ void ComboBox::EnableMultiSelection( bool bMulti ) mpImplLB->SetMultiSelectionSimpleMode( true ); } -// ----------------------------------------------------------------------- + bool ComboBox::IsMultiSelectionEnabled() const { return mpImplLB->IsMultiSelectionEnabled(); } -// ----------------------------------------------------------------------- + long ComboBox::CalcWindowSizePixel( sal_uInt16 nLines ) const { return mpImplLB->GetEntryHeight() * nLines; } -// ----------------------------------------------------------------------- + Size ComboBox::GetOptimalSize() const { return CalcMinimumSize(); } -// ----------------------------------------------------------------------- + long ComboBox::getMaxWidthScrollBarAndDownButton() const { @@ -1105,7 +1105,7 @@ Size ComboBox::CalcMinimumSize() const return aSz; } -// ----------------------------------------------------------------------- + Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const { @@ -1132,7 +1132,7 @@ Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const return aSz; } -// ----------------------------------------------------------------------- + Size ComboBox::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const { @@ -1174,7 +1174,7 @@ Size ComboBox::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const return aSz; } -// ----------------------------------------------------------------------- + void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const { @@ -1193,7 +1193,7 @@ void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines } } -// ----------------------------------------------------------------------- + void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { @@ -1299,7 +1299,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, s } -// ----------------------------------------------------------------------- + IMPL_LINK( ComboBox, ImplUserDrawHdl, UserDrawEvent*, pEvent ) { @@ -1307,27 +1307,27 @@ IMPL_LINK( ComboBox, ImplUserDrawHdl, UserDrawEvent*, pEvent ) return 1; } -// ----------------------------------------------------------------------- + void ComboBox::UserDraw( const UserDrawEvent& ) { } -// ----------------------------------------------------------------------- + void ComboBox::SetUserItemSize( const Size& rSz ) { mpImplLB->GetMainWindow()->SetUserItemSize( rSz ); } -// ----------------------------------------------------------------------- + void ComboBox::EnableUserDraw( bool bUserDraw ) { mpImplLB->GetMainWindow()->EnableUserDraw( bUserDraw ); } -// ----------------------------------------------------------------------- + void ComboBox::DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos ) { @@ -1335,35 +1335,35 @@ void ComboBox::DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDraw mpImplLB->GetMainWindow()->DrawEntry( rEvt.GetItemId(), bDrawImage, bDrawText, bDrawTextAtImagePos ); } -// ----------------------------------------------------------------------- + void ComboBox::SetSeparatorPos( sal_uInt16 n ) { mpImplLB->SetSeparatorPos( n ); } -// ----------------------------------------------------------------------- + void ComboBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ) { mpImplLB->SetMRUEntries( rEntries, cSep ); } -// ----------------------------------------------------------------------- + OUString ComboBox::GetMRUEntries( sal_Unicode cSep ) const { return mpImplLB->GetMRUEntries( cSep ); } -// ----------------------------------------------------------------------- + void ComboBox::SetMaxMRUCount( sal_uInt16 n ) { mpImplLB->SetMaxMRUCount( n ); } -// ----------------------------------------------------------------------- + sal_uInt16 ComboBox::GetMaxMRUCount() const { @@ -1375,28 +1375,28 @@ sal_uInt16 ComboBox::GetMRUCount() const return mpImplLB->GetEntryList()->GetMRUCount(); } -// ----------------------------------------------------------------------- + sal_uInt16 ComboBox::GetDisplayLineCount() const { return mpImplLB->GetDisplayLineCount(); } -// ----------------------------------------------------------------------- + void ComboBox::SetEntryData( sal_uInt16 nPos, void* pNewData ) { mpImplLB->SetEntryData( nPos + mpImplLB->GetEntryList()->GetMRUCount(), pNewData ); } -// ----------------------------------------------------------------------- + void* ComboBox::GetEntryData( sal_uInt16 nPos ) const { return mpImplLB->GetEntryList()->GetEntryData( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); } -// ----------------------------------------------------------------------- + sal_uInt16 ComboBox::GetTopEntry() const { @@ -1406,21 +1406,21 @@ sal_uInt16 ComboBox::GetTopEntry() const return nPos; } -// ----------------------------------------------------------------------- + void ComboBox::SetProminentEntryType( ProminentEntry eType ) { mpImplLB->SetProminentEntryType( eType ); } -// ----------------------------------------------------------------------- + Rectangle ComboBox::GetDropDownPosSizePixel() const { return mpFloatWin ? mpFloatWin->GetWindowExtentsRelative( const_cast<ComboBox*>(this) ) : Rectangle(); } -// ----------------------------------------------------------------------- + const Wallpaper& ComboBox::GetDisplayBackground() const { @@ -1435,12 +1435,12 @@ const Wallpaper& ComboBox::GetDisplayBackground() const return Control::GetDisplayBackground(); return rBack; } -// ----------------------------------------------------------------------------- + sal_uInt16 ComboBox::GetSelectEntryCount() const { return mpImplLB->GetEntryList()->GetSelectEntryCount(); } -// ----------------------------------------------------------------------------- + sal_uInt16 ComboBox::GetSelectEntryPos( sal_uInt16 nIndex ) const { sal_uInt16 nPos = mpImplLB->GetEntryList()->GetSelectEntryPos( nIndex ); @@ -1452,24 +1452,24 @@ sal_uInt16 ComboBox::GetSelectEntryPos( sal_uInt16 nIndex ) const } return nPos; } -// ----------------------------------------------------------------------------- + bool ComboBox::IsEntryPosSelected( sal_uInt16 nPos ) const { return mpImplLB->GetEntryList()->IsEntryPosSelected( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); } -// ----------------------------------------------------------------------------- + void ComboBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect) { if ( nPos < mpImplLB->GetEntryList()->GetEntryCount() ) mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect ); } -// ----------------------------------------------------------------------------- + void ComboBox::SetNoSelection() { mpImplLB->SetNoSelection(); mpSubEdit->SetText( OUString() ); } -// ----------------------------------------------------------------------------- + Rectangle ComboBox::GetBoundingRectangle( sal_uInt16 nItem ) const { Rectangle aRect = mpImplLB->GetMainWindow()->GetBoundingRectangle( nItem ); @@ -1477,7 +1477,7 @@ Rectangle ComboBox::GetBoundingRectangle( sal_uInt16 nItem ) const aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() ); return aRect; } -// ----------------------------------------------------------------------------- + void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) { @@ -1488,7 +1488,7 @@ void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle ) mpImplLB->SetBorderStyle( nBorderStyle ); } } -// ----------------------------------------------------------------------------- + long ComboBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const { diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 84e25feb4cfb..9a458295c28a 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -43,7 +43,7 @@ void Control::ImplInitControlData() mpControlData = new ImplControlData; } -// ----------------------------------------------------------------------- + Control::Control( WindowType nType ) : Window( nType ) @@ -51,7 +51,7 @@ Control::Control( WindowType nType ) : ImplInitControlData(); } -// ----------------------------------------------------------------------- + Control::Control( Window* pParent, WinBits nStyle ) : Window( WINDOW_CONTROL ) @@ -73,28 +73,28 @@ Control::Control( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + Control::~Control() { delete mpControlData, mpControlData = NULL; } -// ----------------------------------------------------------------------- + void Control::GetFocus() { Window::GetFocus(); } -// ----------------------------------------------------------------------- + void Control::LoseFocus() { Window::LoseFocus(); } -// ----------------------------------------------------------------------- + void Control::Resize() { @@ -102,13 +102,13 @@ void Control::Resize() Window::Resize(); } -// ----------------------------------------------------------------------- + void Control::FillLayoutData() const { } -// ----------------------------------------------------------------------- + void Control::CreateLayoutData() const { @@ -116,21 +116,21 @@ void Control::CreateLayoutData() const mpControlData->mpLayoutData = new ::vcl::ControlLayoutData(); } -// ----------------------------------------------------------------------- + bool Control::HasLayoutData() const { return mpControlData->mpLayoutData != NULL; } -// ----------------------------------------------------------------------- + ::vcl::ControlLayoutData* Control::GetLayoutData() const { return mpControlData->mpLayoutData; } -// ----------------------------------------------------------------------- + void Control::SetText( const OUString& rStr ) { @@ -138,7 +138,7 @@ void Control::SetText( const OUString& rStr ) Window::SetText( rStr ); } -// ----------------------------------------------------------------------- + Rectangle ControlLayoutData::GetCharacterBounds( long nIndex ) const { @@ -146,7 +146,7 @@ Rectangle ControlLayoutData::GetCharacterBounds( long nIndex ) const } -// ----------------------------------------------------------------------- + Rectangle Control::GetCharacterBounds( long nIndex ) const { @@ -155,7 +155,7 @@ Rectangle Control::GetCharacterBounds( long nIndex ) const return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->GetCharacterBounds( nIndex ) : Rectangle(); } -// ----------------------------------------------------------------------- + long ControlLayoutData::GetIndexForPoint( const Point& rPoint ) const { @@ -174,7 +174,7 @@ long ControlLayoutData::GetIndexForPoint( const Point& rPoint ) const return nIndex; } -// ----------------------------------------------------------------------- + long Control::GetIndexForPoint( const Point& rPoint ) const { @@ -183,7 +183,7 @@ long Control::GetIndexForPoint( const Point& rPoint ) const return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->GetIndexForPoint( rPoint ) : -1; } -// ----------------------------------------------------------------------- + long ControlLayoutData::GetLineCount() const { @@ -193,7 +193,7 @@ long ControlLayoutData::GetLineCount() const return nLines; } -// ----------------------------------------------------------------------- + Pair ControlLayoutData::GetLineStartEnd( long nLine ) const { @@ -218,7 +218,7 @@ Pair ControlLayoutData::GetLineStartEnd( long nLine ) const return aPair; } -// ----------------------------------------------------------------------- + Pair Control::GetLineStartEnd( long nLine ) const { @@ -227,7 +227,7 @@ Pair Control::GetLineStartEnd( long nLine ) const return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->GetLineStartEnd( nLine ) : Pair( -1, -1 ); } -// ----------------------------------------------------------------------- + long ControlLayoutData::ToRelativeLineIndex( long nIndex ) const { @@ -261,7 +261,7 @@ long ControlLayoutData::ToRelativeLineIndex( long nIndex ) const return nIndex; } -// ----------------------------------------------------------------------- + long Control::ToRelativeLineIndex( long nIndex ) const { @@ -270,7 +270,7 @@ long Control::ToRelativeLineIndex( long nIndex ) const return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->ToRelativeLineIndex( nIndex ) : -1; } -// ----------------------------------------------------------------------- + OUString Control::GetDisplayText() const { @@ -279,7 +279,7 @@ OUString Control::GetDisplayText() const return mpControlData->mpLayoutData ? OUString(mpControlData->mpLayoutData->m_aDisplayText) : GetText(); } -// ----------------------------------------------------------------------- + bool Control::Notify( NotifyEvent& rNEvt ) { @@ -313,7 +313,7 @@ bool Control::Notify( NotifyEvent& rNEvt ) return Window::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void Control::StateChanged( StateChangedType nStateChange ) { @@ -329,7 +329,7 @@ void Control::StateChanged( StateChangedType nStateChange ) Window::StateChanged( nStateChange ); } -// ----------------------------------------------------------------------- + void Control::AppendLayoutData( const Control& rSubControl ) const { @@ -355,7 +355,7 @@ void Control::AppendLayoutData( const Control& rSubControl ) const } } -// ----------------------------------------------------------------- + bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link& rHandler, void* pCaller ) { @@ -376,7 +376,7 @@ bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link& r return true; } -// ----------------------------------------------------------------- + void Control::SetLayoutDataParent( const Control* pParent ) const { @@ -384,14 +384,14 @@ void Control::SetLayoutDataParent( const Control* pParent ) const mpControlData->mpLayoutData->m_pParent = pParent; } -// ----------------------------------------------------------------- + void Control::ImplClearLayoutData() const { delete mpControlData->mpLayoutData, mpControlData->mpLayoutData = NULL; } -// ----------------------------------------------------------------------- + void Control::ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ) { @@ -420,7 +420,7 @@ void Control::ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ) pDev->OutputDevice::SetSettings( aOriginalSettings ); } -// ----------------------------------------------------------------------- + void Control::DataChanged( const DataChangedEvent& rDCEvt) { @@ -447,7 +447,7 @@ void Control::DataChanged( const DataChangedEvent& rDCEvt) } } -// ----------------------------------------------------------------- + ControlLayoutData::~ControlLayoutData() { @@ -455,7 +455,7 @@ ControlLayoutData::~ControlLayoutData() m_pParent->ImplClearLayoutData(); } -// ----------------------------------------------------------------- + Size Control::GetOptimalSize() const { @@ -463,7 +463,7 @@ Size Control::GetOptimalSize() const GetTextHeight() + 2 * 6 ); } -// ----------------------------------------------------------------- + void Control::SetReferenceDevice( OutputDevice* _referenceDevice ) { @@ -474,27 +474,27 @@ void Control::SetReferenceDevice( OutputDevice* _referenceDevice ) Invalidate(); } -// ----------------------------------------------------------------- + OutputDevice* Control::GetReferenceDevice() const { return mpControlData->mpReferenceDevice; } -// ----------------------------------------------------------------- + const Font& Control::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetLabelFont(); } -// ----------------------------------------------------------------- + const Color& Control::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetLabelTextColor(); } -// ----------------------------------------------------------------- + void Control::ImplInitSettings( const bool _bFont, const bool _bForeground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -519,7 +519,7 @@ void Control::ImplInitSettings( const bool _bFont, const bool _bForeground ) } } -// ----------------------------------------------------------------- + void Control::DrawControlText( OutputDevice& _rTargetDevice, Rectangle& _io_rRect, const OUString& _rStr, sal_uInt16 _nStyle, MetricVector* _pVector, OUString* _pDisplayText ) const diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 165d73885552..e24a474a1324 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -137,7 +137,7 @@ struct Impl_IMEInfos void DestroyAttribs(); }; -// ----------------------------------------------------------------------- + Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos) : aOldTextAfterStartPos(rOldTextAfterStartPos) @@ -149,14 +149,14 @@ Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos bWasCursorOverwrite = false; } -// ----------------------------------------------------------------------- + Impl_IMEInfos::~Impl_IMEInfos() { delete[] pAttribs; } -// ----------------------------------------------------------------------- + void Impl_IMEInfos::CopyAttribs(const sal_uInt16* pA, sal_Int32 nL) { @@ -166,7 +166,7 @@ void Impl_IMEInfos::CopyAttribs(const sal_uInt16* pA, sal_Int32 nL) memcpy( pAttribs, pA, nL*sizeof(sal_uInt16) ); } -// ----------------------------------------------------------------------- + void Impl_IMEInfos::DestroyAttribs() { @@ -183,7 +183,7 @@ Edit::Edit( WindowType nType ) : ImplInitEditData(); } -// ----------------------------------------------------------------------- + Edit::Edit( Window* pParent, WinBits nStyle ) : Control( WINDOW_EDIT ) @@ -264,7 +264,7 @@ bool Edit::set_property(const OString &rKey, const OString &rValue) return true; } -// ----------------------------------------------------------------------- + Edit::~Edit() { @@ -298,7 +298,7 @@ Edit::~Edit() } } -// ----------------------------------------------------------------------- + void Edit::ImplInitEditData() { @@ -330,7 +330,7 @@ void Edit::ImplInitEditData() mxDnDListener = pDnDWrapper; } -// ----------------------------------------------------------------------- + bool Edit::ImplUseNativeBorder( WinBits nStyle ) { @@ -385,7 +385,7 @@ void Edit::ImplInit( Window* pParent, WinBits nStyle ) } } -// ----------------------------------------------------------------------- + WinBits Edit::ImplInitStyle( WinBits nStyle ) { @@ -397,7 +397,7 @@ WinBits Edit::ImplInitStyle( WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------------- + bool Edit::IsCharInput( const KeyEvent& rKeyEvent ) { @@ -409,7 +409,7 @@ bool Edit::IsCharInput( const KeyEvent& rKeyEvent ) !rKeyEvent.GetKeyCode().IsMod1() ); } -// ----------------------------------------------------------------------- + void Edit::ImplModified() { @@ -417,7 +417,7 @@ void Edit::ImplModified() Modify(); } -// ----------------------------------------------------------------------- + void Edit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { @@ -461,7 +461,7 @@ void Edit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) } } -// ----------------------------------------------------------------------- + long Edit::ImplGetExtraOffset() const { @@ -476,7 +476,7 @@ long Edit::ImplGetExtraOffset() const } -// ----------------------------------------------------------------------- + OUString Edit::ImplGetText() const { @@ -495,7 +495,7 @@ OUString Edit::ImplGetText() const return maText.toString(); } -// ----------------------------------------------------------------------- + void Edit::ImplInvalidateOrRepaint() { @@ -510,7 +510,7 @@ void Edit::ImplInvalidateOrRepaint() ImplRepaint(); } -// ----------------------------------------------------------------------- + long Edit::ImplGetTextYPosition() const { @@ -521,7 +521,7 @@ long Edit::ImplGetTextYPosition() const return ( GetOutputSizePixel().Height() - GetTextHeight() ) / 2; } -// ----------------------------------------------------------------------- + void Edit::ImplRepaint(bool bLayout) { @@ -743,7 +743,7 @@ void Edit::ImplRepaint(bool bLayout) delete [] pDXBuffer; } -// ----------------------------------------------------------------------- + void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode ) { @@ -813,7 +813,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI mbInternModified = true; } -// ----------------------------------------------------------------------- + OUString Edit::ImplGetValidString( const OUString& rString ) const { @@ -824,7 +824,7 @@ OUString Edit::ImplGetValidString( const OUString& rString ) const return aValidString; } -// ----------------------------------------------------------------------- + uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const { //!! since we don't want to become incompatible in the next minor update @@ -833,7 +833,7 @@ uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); return i18n::BreakIterator::create(xContext); } -// ----------------------------------------------------------------------- + uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenceChecker() { @@ -845,7 +845,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenc return mxISC; } -// ----------------------------------------------------------------------- + void Edit::ShowTruncationWarning( Window* pParent ) { @@ -857,7 +857,7 @@ void Edit::ShowTruncationWarning( Window* pParent ) } } -// ----------------------------------------------------------------------- + bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_Int32 nSelectionLen ) const { @@ -871,7 +871,7 @@ bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_Int32 nSelectionLen ) const return bWasTruncated; } -// ----------------------------------------------------------------------- + void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool bIsUserInput ) { @@ -974,7 +974,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool mbInternModified = true; } -// ----------------------------------------------------------------------- + void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection ) { @@ -1009,7 +1009,7 @@ void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection ) } } -// ----------------------------------------------------------------------- + int Edit::ImplGetNativeControlType() const { @@ -1140,7 +1140,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) } } -// ----------------------------------------------------------------------- + void Edit::ImplShowCursor( bool bOnlyIfVisible ) { @@ -1222,7 +1222,7 @@ void Edit::ImplShowCursor( bool bOnlyIfVisible ) delete [] pDXBuffer; } -// ----------------------------------------------------------------------- + void Edit::ImplAlign() { @@ -1262,7 +1262,7 @@ void Edit::ImplAlign() } -// ----------------------------------------------------------------------- + void Edit::ImplAlignAndPaint() { @@ -1271,7 +1271,7 @@ void Edit::ImplAlignAndPaint() ImplShowCursor(); } -// ----------------------------------------------------------------------- + sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const { @@ -1332,7 +1332,7 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const return nIndex; } -// ----------------------------------------------------------------------- + void Edit::ImplSetCursorPos( sal_Int32 nChar, bool bSelect ) { @@ -1343,7 +1343,7 @@ void Edit::ImplSetCursorPos( sal_Int32 nChar, bool bSelect ) ImplSetSelection( aSelection ); } -// ----------------------------------------------------------------------- + void Edit::ImplLoadRes( const ResId& rResId ) { @@ -1354,7 +1354,7 @@ void Edit::ImplLoadRes( const ResId& rResId ) SetMaxTextLen( nTextLength ); } -// ----------------------------------------------------------------------- + void Edit::ImplCopyToSelectionClipboard() { @@ -1370,7 +1370,7 @@ void Edit::ImplCopy( uno::Reference< datatransfer::clipboard::XClipboard >& rxCl ::vcl::unohelper::TextDataObject::CopyStringTo( GetSelected(), rxClipboard ); } -// ----------------------------------------------------------------------- + void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxClipboard ) { @@ -1410,7 +1410,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC } } -// ----------------------------------------------------------------------- + void Edit::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -1455,7 +1455,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt ) mbInMBDown = false; } -// ----------------------------------------------------------------------- + void Edit::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -1474,7 +1474,7 @@ void Edit::MouseButtonUp( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void Edit::Tracking( const TrackingEvent& rTEvt ) { @@ -1504,7 +1504,7 @@ void Edit::Tracking( const TrackingEvent& rTEvt ) mpUpdateDataTimer->Start();//do not update while the user is still travelling in the control } -// ----------------------------------------------------------------------- + bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) { @@ -1837,7 +1837,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) return bDone; } -// ----------------------------------------------------------------------- + void Edit::KeyInput( const KeyEvent& rKEvt ) { @@ -1848,7 +1848,7 @@ void Edit::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + void Edit::FillLayoutData() const { @@ -1856,7 +1856,7 @@ void Edit::FillLayoutData() const const_cast<Edit*>(this)->ImplRepaint(true); } -// ----------------------------------------------------------------------- + void Edit::Paint( const Rectangle& ) { @@ -1864,7 +1864,7 @@ void Edit::Paint( const Rectangle& ) ImplRepaint(); } -// ----------------------------------------------------------------------- + void Edit::Resize() { @@ -1879,7 +1879,7 @@ void Edit::Resize() } } -// ----------------------------------------------------------------------- + void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { @@ -1968,7 +1968,7 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_u } } -// ----------------------------------------------------------------------- + void Edit::ImplInvalidateOutermostBorder( Window* pWin ) { @@ -2036,7 +2036,7 @@ void Edit::GetFocus() Control::GetFocus(); } -// ----------------------------------------------------------------------- + Window* Edit::GetPreferredKeyInputWindow() { @@ -2046,7 +2046,7 @@ Window* Edit::GetPreferredKeyInputWindow() return this; } -// ----------------------------------------------------------------------- + void Edit::LoseFocus() { @@ -2075,7 +2075,7 @@ void Edit::LoseFocus() Control::LoseFocus(); } -// ----------------------------------------------------------------------- + void Edit::Command( const CommandEvent& rCEvt ) { @@ -2314,7 +2314,7 @@ void Edit::Command( const CommandEvent& rCEvt ) Control::Command( rCEvt ); } -// ----------------------------------------------------------------------- + void Edit::StateChanged( StateChangedType nType ) { @@ -2415,7 +2415,7 @@ void Edit::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void Edit::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -2435,7 +2435,7 @@ void Edit::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + void Edit::ImplShowDDCursor() { @@ -2452,7 +2452,7 @@ void Edit::ImplShowDDCursor() } } -// ----------------------------------------------------------------------- + void Edit::ImplHideDDCursor() { @@ -2463,7 +2463,7 @@ void Edit::ImplHideDDCursor() } } -// ----------------------------------------------------------------------- + void Edit::Modify() { @@ -2493,14 +2493,14 @@ void Edit::Modify() } } -// ----------------------------------------------------------------------- + void Edit::UpdateData() { maUpdateDataHdl.Call( this ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl) { @@ -2508,7 +2508,7 @@ IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl) return 0; } -// ----------------------------------------------------------------------- + void Edit::EnableUpdateData( sal_uLong nTimeout ) { @@ -2526,7 +2526,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout ) } } -// ----------------------------------------------------------------------- + void Edit::SetEchoChar( sal_Unicode c ) { @@ -2535,7 +2535,7 @@ void Edit::SetEchoChar( sal_Unicode c ) mpSubEdit->SetEchoChar( c ); } -// ----------------------------------------------------------------------- + void Edit::SetReadOnly( sal_Bool bReadOnly ) { @@ -2549,7 +2549,7 @@ void Edit::SetReadOnly( sal_Bool bReadOnly ) } } -// ----------------------------------------------------------------------- + void Edit::SetAutocompleteHdl( const Link& rHdl ) { @@ -2558,7 +2558,7 @@ void Edit::SetAutocompleteHdl( const Link& rHdl ) mpSubEdit->SetAutocompleteHdl( rHdl ); } -// ----------------------------------------------------------------------- + void Edit::SetInsertMode( bool bInsert ) { @@ -2572,7 +2572,7 @@ void Edit::SetInsertMode( bool bInsert ) } } -// ----------------------------------------------------------------------- + bool Edit::IsInsertMode() const { @@ -2582,7 +2582,7 @@ bool Edit::IsInsertMode() const return mbInsertMode; } -// ----------------------------------------------------------------------- + void Edit::SetMaxTextLen(sal_Int32 nMaxLen) { @@ -2597,7 +2597,7 @@ void Edit::SetMaxTextLen(sal_Int32 nMaxLen) } } -// ----------------------------------------------------------------------- + void Edit::SetSelection( const Selection& rSelection ) { @@ -2611,7 +2611,7 @@ void Edit::SetSelection( const Selection& rSelection ) ImplSetSelection( rSelection ); } -// ----------------------------------------------------------------------- + void Edit::ImplSetSelection( const Selection& rSelection, bool bPaint ) { @@ -2675,7 +2675,7 @@ void Edit::ImplSetSelection( const Selection& rSelection, bool bPaint ) } } -// ----------------------------------------------------------------------- + const Selection& Edit::GetSelection() const { @@ -2685,7 +2685,7 @@ const Selection& Edit::GetSelection() const return maSelection; } -// ----------------------------------------------------------------------- + void Edit::ReplaceSelected( const OUString& rStr ) { @@ -2695,7 +2695,7 @@ void Edit::ReplaceSelected( const OUString& rStr ) ImplInsertText( rStr ); } -// ----------------------------------------------------------------------- + void Edit::DeleteSelected() { @@ -2708,7 +2708,7 @@ void Edit::DeleteSelected() } } -// ----------------------------------------------------------------------- + OUString Edit::GetSelected() const { @@ -2722,7 +2722,7 @@ OUString Edit::GetSelected() const } } -// ----------------------------------------------------------------------- + void Edit::Cut() { @@ -2733,7 +2733,7 @@ void Edit::Cut() } } -// ----------------------------------------------------------------------- + void Edit::Copy() { @@ -2744,7 +2744,7 @@ void Edit::Copy() } } -// ----------------------------------------------------------------------- + void Edit::Paste() { @@ -2752,7 +2752,7 @@ void Edit::Paste() ImplPaste( aClipboard ); } -// ----------------------------------------------------------------------- + void Edit::Undo() { @@ -2768,7 +2768,7 @@ void Edit::Undo() } } -// ----------------------------------------------------------------------- + void Edit::SetText( const OUString& rStr ) { @@ -2781,7 +2781,7 @@ void Edit::SetText( const OUString& rStr ) } } -// ----------------------------------------------------------------------- + void Edit::SetText( const OUString& rStr, const Selection& rSelection ) { @@ -2791,7 +2791,7 @@ void Edit::SetText( const OUString& rStr, const Selection& rSelection ) ImplSetText( rStr, &rSelection ); } -// ----------------------------------------------------------------------- + OUString Edit::GetText() const { @@ -2801,7 +2801,7 @@ OUString Edit::GetText() const return maText.toString(); } -// ----------------------------------------------------------------------- + void Edit::SetPlaceholderText( const OUString& rStr ) { @@ -2815,7 +2815,7 @@ void Edit::SetPlaceholderText( const OUString& rStr ) } } -// ----------------------------------------------------------------------- + OUString Edit::GetPlaceholderText() const { @@ -2825,7 +2825,7 @@ OUString Edit::GetPlaceholderText() const return maPlaceholderText; } -// ----------------------------------------------------------------------- + void Edit::SetModifyFlag() { @@ -2835,7 +2835,7 @@ void Edit::SetModifyFlag() mbModified = true; } -// ----------------------------------------------------------------------- + void Edit::ClearModifyFlag() { @@ -2845,7 +2845,7 @@ void Edit::ClearModifyFlag() mbModified = false; } -// ----------------------------------------------------------------------- + void Edit::SetSubEdit( Edit* pEdit ) { @@ -2927,14 +2927,14 @@ Size Edit::GetMinimumEditSize() return aSize; } -// ----------------------------------------------------------------------- + Size Edit::GetOptimalSize() const { return CalcMinimumSize(); } -// ----------------------------------------------------------------------- + Size Edit::CalcSize(sal_Int32 nChars) const { @@ -2947,7 +2947,7 @@ Size Edit::CalcSize(sal_Int32 nChars) const return aSz; } -// ----------------------------------------------------------------------- + sal_Int32 Edit::GetMaxVisChars() const { @@ -2957,28 +2957,28 @@ sal_Int32 Edit::GetMaxVisChars() const return nCharWidth ? nOutWidth/nCharWidth : 0; } -// ----------------------------------------------------------------------- + sal_Int32 Edit::GetCharPos( const Point& rWindowPos ) const { return ImplGetCharPos( rWindowPos ); } -// ----------------------------------------------------------------------- + void Edit::SetGetSpecialCharsFunction( FncGetSpecialChars fn ) { pImplFncGetSpecialChars = fn; } -// ----------------------------------------------------------------------- + FncGetSpecialChars Edit::GetGetSpecialCharsFunction() { return pImplFncGetSpecialChars; } -// ----------------------------------------------------------------------- + PopupMenu* Edit::CreatePopupMenu() { @@ -3005,7 +3005,7 @@ PopupMenu* Edit::CreatePopupMenu() return pPopup; } -// ----------------------------------------------------------------------- + void Edit::DeletePopupMenu( PopupMenu* pMenu ) { diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 695d3ae6b8e7..ebe5367ef907 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -94,7 +94,7 @@ void FixedText::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -// ----------------------------------------------------------------------- + WinBits FixedText::ImplInitStyle( WinBits nStyle ) { @@ -103,20 +103,20 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------- + const Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const { return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont(); } -// ----------------------------------------------------------------- + const Color& FixedText::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoTextColor() : _rStyle.GetLabelTextColor(); } -// ----------------------------------------------------------------------- + void FixedText::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -147,7 +147,7 @@ void FixedText::ImplInitSettings( bool bFont, } } -// ----------------------------------------------------------------------- + FixedText::FixedText( Window* pParent, WinBits nStyle ) : Control(WINDOW_FIXEDTEXT) @@ -158,7 +158,7 @@ FixedText::FixedText( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + FixedText::FixedText( Window* pParent, const ResId& rResId ) : Control(WINDOW_FIXEDTEXT) @@ -175,7 +175,7 @@ FixedText::FixedText( Window* pParent, const ResId& rResId ) Show(); } -// ----------------------------------------------------------------------- + sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle ) { @@ -208,7 +208,7 @@ sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle ) return nTextStyle; } -// ----------------------------------------------------------------------- + void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, @@ -256,14 +256,14 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, ); } -// ----------------------------------------------------------------------- + void FixedText::Paint( const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } -// ----------------------------------------------------------------------- + void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) @@ -303,7 +303,7 @@ void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } -// ----------------------------------------------------------------------- + void FixedText::Resize() { @@ -311,7 +311,7 @@ void FixedText::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void FixedText::StateChanged( StateChangedType nType ) { @@ -352,7 +352,7 @@ void FixedText::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void FixedText::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -368,7 +368,7 @@ void FixedText::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth) { @@ -401,7 +401,7 @@ Size FixedText::CalcMinimumSize( long nMaxWidth ) const { return CalcWindowSize( CalcMinimumTextSize ( this, nMaxWidth ) ); } -// ----------------------------------------------------------------------- + Size FixedText::GetOptimalSize() const { @@ -425,7 +425,7 @@ Size FixedText::GetOptimalSize() const return aRet; } -// ----------------------------------------------------------------------- + void FixedText::FillLayoutData() const { @@ -514,7 +514,7 @@ SelectableFixedText::SelectableFixedText(Window* pParent, WinBits nStyle) SetPaintTransparent( true ); } -// ----------------------------------------------------------------------- + void SelectableFixedText::LoseFocus() { @@ -532,7 +532,7 @@ void FixedLine::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -// ----------------------------------------------------------------------- + WinBits FixedLine::ImplInitStyle( WinBits nStyle ) { @@ -541,20 +541,20 @@ WinBits FixedLine::ImplInitStyle( WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------- + const Font& FixedLine::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetGroupFont(); } -// ----------------------------------------------------------------- + const Color& FixedLine::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetGroupTextColor(); } -// ----------------------------------------------------------------------- + void FixedLine::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -585,7 +585,7 @@ void FixedLine::ImplInitSettings( bool bFont, } } -// ----------------------------------------------------------------------- + void FixedLine::ImplDraw( bool bLayout ) { @@ -660,7 +660,7 @@ void FixedLine::ImplDraw( bool bLayout ) } } -// ----------------------------------------------------------------------- + FixedLine::FixedLine( Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDLINE ) @@ -669,7 +669,7 @@ FixedLine::FixedLine( Window* pParent, WinBits nStyle ) : SetSizePixel( Size( 2, 2 ) ); } -// ----------------------------------------------------------------------- + FixedLine::FixedLine( Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDLINE ) @@ -683,7 +683,7 @@ FixedLine::FixedLine( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void FixedLine::FillLayoutData() const { @@ -692,20 +692,20 @@ void FixedLine::FillLayoutData() const } -// ----------------------------------------------------------------------- + void FixedLine::Paint( const Rectangle& ) { ImplDraw(); } -// ----------------------------------------------------------------------- + void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uLong ) { } -// ----------------------------------------------------------------------- + void FixedLine::Resize() { @@ -713,7 +713,7 @@ void FixedLine::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void FixedLine::StateChanged( StateChangedType nType ) { @@ -752,7 +752,7 @@ void FixedLine::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void FixedLine::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -768,7 +768,7 @@ void FixedLine::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + Size FixedLine::GetOptimalSize() const { @@ -784,7 +784,7 @@ void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } -// ----------------------------------------------------------------------- + WinBits FixedBitmap::ImplInitStyle( WinBits nStyle ) { @@ -793,7 +793,7 @@ WinBits FixedBitmap::ImplInitStyle( WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------------- + void FixedBitmap::ImplInitSettings() { @@ -818,7 +818,7 @@ void FixedBitmap::ImplInitSettings() } } -// ----------------------------------------------------------------------- + void FixedBitmap::ImplLoadRes( const ResId& rResId ) { @@ -833,7 +833,7 @@ void FixedBitmap::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDBITMAP ) @@ -841,7 +841,7 @@ FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDBITMAP ) @@ -855,13 +855,13 @@ FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + FixedBitmap::~FixedBitmap() { } -// ----------------------------------------------------------------------- + void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */, const Point& rPos, const Size& rSize ) @@ -881,14 +881,14 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */, } } -// ----------------------------------------------------------------------- + void FixedBitmap::Paint( const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } -// ----------------------------------------------------------------------- + void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) @@ -912,7 +912,7 @@ void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize pDev->Pop(); } -// ----------------------------------------------------------------------- + void FixedBitmap::Resize() { @@ -920,7 +920,7 @@ void FixedBitmap::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void FixedBitmap::StateChanged( StateChangedType nType ) { @@ -946,7 +946,7 @@ void FixedBitmap::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -960,7 +960,7 @@ void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) { @@ -979,7 +979,7 @@ void FixedImage::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } -// ----------------------------------------------------------------------- + WinBits FixedImage::ImplInitStyle( WinBits nStyle ) { @@ -988,7 +988,7 @@ WinBits FixedImage::ImplInitStyle( WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------------- + void FixedImage::ImplInitSettings() { @@ -1013,7 +1013,7 @@ void FixedImage::ImplInitSettings() } } -// ----------------------------------------------------------------------- + void FixedImage::ImplLoadRes( const ResId& rResId ) { @@ -1028,7 +1028,7 @@ void FixedImage::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + FixedImage::FixedImage( Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDIMAGE ) @@ -1036,7 +1036,7 @@ FixedImage::FixedImage( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + FixedImage::FixedImage( Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDIMAGE ) @@ -1050,13 +1050,13 @@ FixedImage::FixedImage( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + FixedImage::~FixedImage() { } -// ----------------------------------------------------------------------- + void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) @@ -1088,27 +1088,27 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, mbInUserDraw = false; } -// ----------------------------------------------------------------------- + void FixedImage::Paint( const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } -// ----------------------------------------------------------------------- + Size FixedImage::GetOptimalSize() const { return maImage.GetSizePixel(); } -// ----------------------------------------------------------------------- + void FixedImage::UserDraw( const UserDrawEvent& ) { } -// ----------------------------------------------------------------------- + void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) @@ -1131,7 +1131,7 @@ void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } -// ----------------------------------------------------------------------- + void FixedImage::Resize() { @@ -1139,7 +1139,7 @@ void FixedImage::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void FixedImage::StateChanged( StateChangedType nType ) { @@ -1166,7 +1166,7 @@ void FixedImage::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void FixedImage::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1180,7 +1180,7 @@ void FixedImage::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void FixedImage::SetImage( const Image& rImage ) { @@ -1192,7 +1192,7 @@ void FixedImage::SetImage( const Image& rImage ) } } -// ----------------------------------------------------------------------- + bool FixedImage::SetModeImage( const Image& rImage ) { @@ -1200,7 +1200,7 @@ bool FixedImage::SetModeImage( const Image& rImage ) return true; } -// ----------------------------------------------------------------------- + const Image& FixedImage::GetModeImage( ) const { diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 8e1ef5bf1f51..47fd9e25c8db 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -43,7 +43,7 @@ void GroupBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -// ----------------------------------------------------------------------- + WinBits GroupBox::ImplInitStyle( WinBits nStyle ) { @@ -52,20 +52,20 @@ WinBits GroupBox::ImplInitStyle( WinBits nStyle ) return nStyle; } -// ----------------------------------------------------------------- + const Font& GroupBox::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetGroupFont(); } -// ----------------------------------------------------------------- + const Color& GroupBox::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetGroupTextColor(); } -// ----------------------------------------------------------------------- + void GroupBox::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -98,7 +98,7 @@ void GroupBox::ImplInitSettings( bool bFont, } } -// ----------------------------------------------------------------------- + GroupBox::GroupBox( Window* pParent, WinBits nStyle ) : Control( WINDOW_GROUPBOX ) @@ -106,7 +106,7 @@ GroupBox::GroupBox( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + GroupBox::GroupBox( Window* pParent, const ResId& rResId ) : Control( WINDOW_GROUPBOX ) @@ -120,7 +120,7 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void GroupBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout ) @@ -212,7 +212,7 @@ void GroupBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, DrawControlText( *pDev, aRect, aText, nTextStyle, pVector, pDisplayText ); } -// ----------------------------------------------------------------------- + void GroupBox::FillLayoutData() const { @@ -220,14 +220,14 @@ void GroupBox::FillLayoutData() const const_cast<GroupBox*>(this)-> ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true ); } -// ----------------------------------------------------------------------- + void GroupBox::Paint( const Rectangle& ) { ImplDraw( this, 0, Point(), GetOutputSizePixel() ); } -// ----------------------------------------------------------------------- + void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) @@ -249,7 +249,7 @@ void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->Pop(); } -// ----------------------------------------------------------------------- + void GroupBox::Resize() { @@ -257,7 +257,7 @@ void GroupBox::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void GroupBox::StateChanged( StateChangedType nType ) { @@ -295,7 +295,7 @@ void GroupBox::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void GroupBox::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 9d1b2f60cabf..252fb7f67552 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -76,7 +76,7 @@ void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBa } } -// ----------------------------------------------------------------------- + void ImplInitDropDownButton( PushButton* pButton ) { @@ -104,14 +104,14 @@ ImplEntryList::ImplEntryList( Window* pWindow ) mnMaxMRUCount = 0; } -// ----------------------------------------------------------------------- + ImplEntryList::~ImplEntryList() { Clear(); } -// ----------------------------------------------------------------------- + void ImplEntryList::Clear() { @@ -119,7 +119,7 @@ void ImplEntryList::Clear() maEntries.clear(); } -// ----------------------------------------------------------------------- + void ImplEntryList::SelectEntry( sal_uInt16 nPos, bool bSelect ) { @@ -249,7 +249,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry return insPos; } -// ----------------------------------------------------------------------- + void ImplEntryList::RemoveEntry( sal_uInt16 nPos ) { @@ -264,7 +264,7 @@ void ImplEntryList::RemoveEntry( sal_uInt16 nPos ) } } -// ----------------------------------------------------------------------- + sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUArea ) const { @@ -278,7 +278,7 @@ sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUAre return LISTBOX_ENTRY_NOTFOUND; } - // ----------------------------------------------------------------------- + sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart, bool bForward, bool bLazy ) const { @@ -316,7 +316,7 @@ sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nS return nPos; } -// ----------------------------------------------------------------------- + sal_uInt16 ImplEntryList::FindEntry( const void* pData ) const { @@ -333,7 +333,7 @@ sal_uInt16 ImplEntryList::FindEntry( const void* pData ) const return nPos; } -// ----------------------------------------------------------------------- + long ImplEntryList::GetAddedHeight( sal_uInt16 i_nEndIndex, sal_uInt16 i_nBeginIndex, long i_nBeginHeight ) const { @@ -361,7 +361,7 @@ long ImplEntryList::GetAddedHeight( sal_uInt16 i_nEndIndex, sal_uInt16 i_nBeginI return i_nEndIndex > i_nBeginIndex ? nHeight : -nHeight; } -// ----------------------------------------------------------------------- + long ImplEntryList::GetEntryHeight( sal_uInt16 nPos ) const { @@ -369,7 +369,7 @@ long ImplEntryList::GetEntryHeight( sal_uInt16 nPos ) const return pImplEntry ? pImplEntry->mnHeight : 0; } -// ----------------------------------------------------------------------- + OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const { @@ -380,7 +380,7 @@ OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const return aEntryText; } -// ----------------------------------------------------------------------- + bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const { @@ -391,7 +391,7 @@ bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const return bImage; } -// ----------------------------------------------------------------------- + Image ImplEntryList::GetEntryImage( sal_uInt16 nPos ) const { @@ -402,7 +402,7 @@ Image ImplEntryList::GetEntryImage( sal_uInt16 nPos ) const return aImage; } -// ----------------------------------------------------------------------- + void ImplEntryList::SetEntryData( sal_uInt16 nPos, void* pNewData ) { @@ -411,7 +411,7 @@ void ImplEntryList::SetEntryData( sal_uInt16 nPos, void* pNewData ) pImplEntry->mpUserData = pNewData; } -// ----------------------------------------------------------------------- + void* ImplEntryList::GetEntryData( sal_uInt16 nPos ) const { @@ -419,7 +419,7 @@ void* ImplEntryList::GetEntryData( sal_uInt16 nPos ) const return pImplEntry ? pImplEntry->mpUserData : NULL; } -// ----------------------------------------------------------------------- + void ImplEntryList::SetEntryFlags( sal_uInt16 nPos, long nFlags ) { @@ -428,7 +428,7 @@ void ImplEntryList::SetEntryFlags( sal_uInt16 nPos, long nFlags ) pImplEntry->mnFlags = nFlags; } -// ----------------------------------------------------------------------- + long ImplEntryList::GetEntryFlags( sal_uInt16 nPos ) const { @@ -436,7 +436,7 @@ long ImplEntryList::GetEntryFlags( sal_uInt16 nPos ) const return pImplEntry ? pImplEntry->mnFlags : 0; } -// ----------------------------------------------------------------------- + sal_uInt16 ImplEntryList::GetSelectEntryCount() const { @@ -450,14 +450,14 @@ sal_uInt16 ImplEntryList::GetSelectEntryCount() const return nSelCount; } -// ----------------------------------------------------------------------- + OUString ImplEntryList::GetSelectEntry( sal_uInt16 nIndex ) const { return GetEntryText( GetSelectEntryPos( nIndex ) ); } -// ----------------------------------------------------------------------- + sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const { @@ -482,7 +482,7 @@ sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const return nSelEntryPos; } -// ----------------------------------------------------------------------- + bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const { @@ -490,7 +490,7 @@ bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const return pImplEntry ? pImplEntry->mbIsSelected : sal_False; } -// ----------------------------------------------------------------------- + bool ImplEntryList::IsEntrySelectable( sal_uInt16 nPos ) const { @@ -498,7 +498,7 @@ bool ImplEntryList::IsEntrySelectable( sal_uInt16 nPos ) const return pImplEntry ? ((pImplEntry->mnFlags & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION) == 0) : true; } -// ----------------------------------------------------------------------- + sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /* = true */ ) { @@ -574,21 +574,21 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : ImplCalcMetrics(); } -// ----------------------------------------------------------------------- + ImplListBoxWindow::~ImplListBoxWindow() { delete mpEntryList; } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { ImplInitFieldSettings( this, bFont, bForeground, bBackground ); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ImplCalcMetrics() { @@ -620,7 +620,7 @@ void ImplListBoxWindow::ImplCalcMetrics() } } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::Clear() { @@ -650,7 +650,7 @@ void ImplListBoxWindow::SetUserItemSize( const Size& rSz ) ImplCalcMetrics(); } -// ----------------------------------------------------------------------- + struct ImplEntryMetrics { @@ -663,7 +663,7 @@ struct ImplEntryMetrics long nImgHeight; }; -// ----------------------------------------------------------------------- + void ImplListBoxWindow::EnableQuickSelection( const bool& b ) { maQuickSelectionEngine.SetEnabled( b ); @@ -751,7 +751,7 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry ) rEntry.mnHeight = aMetrics.nEntryHeight; } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ImplCallSelect() { @@ -794,7 +794,7 @@ void ImplListBoxWindow::ImplCallSelect() mbSelectionChanged = false; } -// ----------------------------------------------------------------------- + sal_uInt16 ImplListBoxWindow::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry ) { @@ -808,7 +808,7 @@ sal_uInt16 ImplListBoxWindow::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewE return nNewPos; } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::RemoveEntry( sal_uInt16 nPos ) { @@ -819,7 +819,7 @@ void ImplListBoxWindow::RemoveEntry( sal_uInt16 nPos ) ImplCalcMetrics(); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::SetEntryFlags( sal_uInt16 nPos, long nFlags ) { @@ -829,7 +829,7 @@ void ImplListBoxWindow::SetEntryFlags( sal_uInt16 nPos, long nFlags ) ImplUpdateEntryMetrics( *pEntry ); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ImplShowFocusRect() { @@ -839,7 +839,7 @@ void ImplListBoxWindow::ImplShowFocusRect() mbHasFocusRect = true; } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ImplHideFocusRect() { @@ -851,7 +851,7 @@ void ImplListBoxWindow::ImplHideFocusRect() } -// ----------------------------------------------------------------------- + sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const { @@ -870,7 +870,7 @@ sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const return nSelect; } -// ----------------------------------------------------------------------- + bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const { @@ -888,7 +888,7 @@ bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const return bRet; } -// ----------------------------------------------------------------------- + sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const { @@ -908,7 +908,7 @@ sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const return nPos; } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -949,7 +949,7 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) { @@ -1030,7 +1030,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::DeselectAll() { @@ -1041,7 +1041,7 @@ void ImplListBoxWindow::DeselectAll() } } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect ) { @@ -1092,7 +1092,7 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect ) } } -// ----------------------------------------------------------------------- + bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, bool bShift, bool bCtrl, bool bSelectPosChange /*=FALSE*/ ) { @@ -1249,7 +1249,7 @@ bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, b return bSelectionChanged; } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) { @@ -1418,7 +1418,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt ) { @@ -1426,7 +1426,7 @@ void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) { @@ -1715,7 +1715,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) return bDone; } -// ----------------------------------------------------------------------- + namespace { static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_uInt16 _nPos, OUString& _out_entryText ) @@ -1738,20 +1738,20 @@ namespace } } -// ----------------------------------------------------------------------- + ::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const { return lcl_getEntry( *GetEntryList(), ( mnCurrentPos == LISTBOX_ENTRY_NOTFOUND ) ? 0 : mnCurrentPos + 1, _out_entryText ); } -// ----------------------------------------------------------------------- + ::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const { sal_uInt16 nNextPos = lcl_getEntryPos( _currentEntry ) + 1; return lcl_getEntry( *GetEntryList(), nNextPos, _out_entryText ); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry ) { sal_uInt16 nSelect = lcl_getEntryPos( _entry ); @@ -1781,7 +1781,7 @@ void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry ) } } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout ) { @@ -1838,7 +1838,7 @@ void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout ) } } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout ) { @@ -1958,7 +1958,7 @@ void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawT } } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::FillLayoutData() const { @@ -1967,7 +1967,7 @@ void ImplListBoxWindow::FillLayoutData() const ImplDoPaint( Rectangle( Point( 0, 0 ), GetOutputSize() ), true ); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) { @@ -1999,14 +1999,14 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) ImplShowFocusRect(); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::Paint( const Rectangle& rRect ) { ImplDoPaint( rRect ); } -// ----------------------------------------------------------------------- + sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const { @@ -2021,7 +2021,7 @@ sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const return nEntries; } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::Resize() { @@ -2043,7 +2043,7 @@ void ImplListBoxWindow::Resize() ImplClearLayoutData(); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::GetFocus() { @@ -2058,7 +2058,7 @@ void ImplListBoxWindow::GetFocus() Control::GetFocus(); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::LoseFocus() { @@ -2066,7 +2066,7 @@ void ImplListBoxWindow::LoseFocus() Control::LoseFocus(); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop ) { @@ -2097,7 +2097,7 @@ void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop ) } } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ShowProminentEntry( sal_uInt16 nEntryPos ) { @@ -2111,14 +2111,14 @@ void ImplListBoxWindow::ShowProminentEntry( sal_uInt16 nEntryPos ) SetTopEntry( nEntryPos ); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::SetLeftIndent( long n ) { ScrollHorz( n - mnLeft ); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::ScrollHorz( long n ) { @@ -2152,7 +2152,7 @@ void ImplListBoxWindow::ScrollHorz( long n ) } } -// ----------------------------------------------------------------------- + Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const { @@ -2164,7 +2164,7 @@ Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const return aSz; } -// ----------------------------------------------------------------------- + Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_uInt16 nItem ) const { @@ -2175,7 +2175,7 @@ Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_uInt16 nItem ) const return aRect; } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::StateChanged( StateChangedType nType ) { @@ -2211,7 +2211,7 @@ void ImplListBoxWindow::StateChanged( StateChangedType nType ) ImplClearLayoutData(); } -// ----------------------------------------------------------------------- + void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -2229,7 +2229,7 @@ void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const { @@ -2275,7 +2275,7 @@ ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) : maLBWindow.Show(); } -// ----------------------------------------------------------------------- + ImplListBox::~ImplListBox() { @@ -2284,7 +2284,7 @@ ImplListBox::~ImplListBox() delete mpScrollBarBox; } -// ----------------------------------------------------------------------- + void ImplListBox::Clear() { @@ -2299,7 +2299,7 @@ void ImplListBox::Clear() StateChanged( STATE_CHANGE_DATA ); } -// ----------------------------------------------------------------------- + sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr ) { @@ -2309,7 +2309,7 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr ) return nNewPos; } -// ----------------------------------------------------------------------- + sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, const Image& rImage ) { @@ -2319,7 +2319,7 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, cons return nNewPos; } -// ----------------------------------------------------------------------- + void ImplListBox::RemoveEntry( sal_uInt16 nPos ) { @@ -2327,42 +2327,42 @@ void ImplListBox::RemoveEntry( sal_uInt16 nPos ) StateChanged( STATE_CHANGE_DATA ); } -// ----------------------------------------------------------------------- + void ImplListBox::SetEntryFlags( sal_uInt16 nPos, long nFlags ) { maLBWindow.SetEntryFlags( nPos, nFlags ); } -// ----------------------------------------------------------------------- + void ImplListBox::SelectEntry( sal_uInt16 nPos, bool bSelect ) { maLBWindow.SelectEntry( nPos, bSelect ); } -// ----------------------------------------------------------------------- + void ImplListBox::SetNoSelection() { maLBWindow.DeselectAll(); } -// ----------------------------------------------------------------------- + void ImplListBox::GetFocus() { maLBWindow.GrabFocus(); } -// ----------------------------------------------------------------------- + Window* ImplListBox::GetPreferredKeyInputWindow() { return &maLBWindow; } -// ----------------------------------------------------------------------- + void ImplListBox::Resize() { @@ -2372,7 +2372,7 @@ void ImplListBox::Resize() } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ImplListBox, MRUChanged) { @@ -2380,7 +2380,7 @@ IMPL_LINK_NOARG(ImplListBox, MRUChanged) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled) { @@ -2396,7 +2396,7 @@ IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled) return 1; } -// ----------------------------------------------------------------------- + IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB ) { @@ -2409,7 +2409,7 @@ IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB ) return 1; } -// ----------------------------------------------------------------------- + void ImplListBox::ImplCheckScrollBars() { @@ -2492,7 +2492,7 @@ void ImplListBox::ImplCheckScrollBars() ImplInitScrollBars(); } -// ----------------------------------------------------------------------- + void ImplListBox::ImplInitScrollBars() { @@ -2516,7 +2516,7 @@ void ImplListBox::ImplInitScrollBars() } } -// ----------------------------------------------------------------------- + void ImplListBox::ImplResizeControls() { @@ -2580,7 +2580,7 @@ void ImplListBox::ImplResizeControls() } } -// ----------------------------------------------------------------------- + void ImplListBox::StateChanged( StateChangedType nType ) { @@ -2630,14 +2630,14 @@ void ImplListBox::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt ) { Control::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + bool ImplListBox::Notify( NotifyEvent& rNEvt ) { @@ -2658,14 +2658,14 @@ bool ImplListBox::Notify( NotifyEvent& rNEvt ) return nDone || Window::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + const Wallpaper& ImplListBox::GetDisplayBackground() const { return maLBWindow.GetDisplayBackground(); } -// ----------------------------------------------------------------------- + bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) { @@ -2683,7 +2683,7 @@ bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) return bDone; } -// ----------------------------------------------------------------------- + void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ) { @@ -2716,7 +2716,7 @@ void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ) } } -// ----------------------------------------------------------------------- + OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const { @@ -2730,7 +2730,7 @@ OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const return aEntries.makeStringAndClear(); } -// ----------------------------------------------------------------------- + void ImplListBox::SetEdgeBlending(bool bNew) { @@ -2758,7 +2758,7 @@ ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) : mnItemPos = LISTBOX_ENTRY_NOTFOUND; } -// ----------------------------------------------------------------------- + void ImplWin::MBDown() { @@ -2766,7 +2766,7 @@ void ImplWin::MBDown() maMBDownHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ImplWin::MouseButtonDown( const MouseEvent& ) { @@ -2776,7 +2776,7 @@ void ImplWin::MouseButtonDown( const MouseEvent& ) } } -// ----------------------------------------------------------------------- + void ImplWin::FillLayoutData() const { @@ -2784,7 +2784,7 @@ void ImplWin::FillLayoutData() const const_cast<ImplWin*>(this)->ImplDraw( true ); } -// ----------------------------------------------------------------------- + bool ImplWin::PreNotify( NotifyEvent& rNEvt ) { @@ -2807,7 +2807,7 @@ bool ImplWin::PreNotify( NotifyEvent& rNEvt ) return Control::PreNotify(rNEvt); } -// ----------------------------------------------------------------------- + void ImplWin::ImplDraw( bool bLayout ) { @@ -2918,14 +2918,14 @@ void ImplWin::ImplDraw( bool bLayout ) } } -// ----------------------------------------------------------------------- + void ImplWin::Paint( const Rectangle& ) { ImplDraw(); } -// ----------------------------------------------------------------------- + void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout ) { @@ -3000,7 +3000,7 @@ void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImageP ShowFocus( maFocusRect ); } -// ----------------------------------------------------------------------- + void ImplWin::Resize() { @@ -3009,7 +3009,7 @@ void ImplWin::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void ImplWin::GetFocus() { @@ -3028,7 +3028,7 @@ void ImplWin::GetFocus() Control::GetFocus(); } -// ----------------------------------------------------------------------- + void ImplWin::LoseFocus() { @@ -3055,7 +3055,7 @@ ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) : { } -// ----------------------------------------------------------------------- + void ImplBtn::MBDown() { @@ -3063,7 +3063,7 @@ void ImplBtn::MBDown() maMBDownHdl.Call( this ); } -// ----------------------------------------------------------------------- + void ImplBtn::MouseButtonDown( const MouseEvent& ) { @@ -3101,7 +3101,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : } -// ----------------------------------------------------------------------- + bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt ) { @@ -3114,7 +3114,7 @@ bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt ) return FloatingWindow::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { @@ -3150,7 +3150,7 @@ void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, } } -// ----------------------------------------------------------------------- + void ImplListBoxFloatingWindow::Resize() { @@ -3158,7 +3158,7 @@ void ImplListBoxFloatingWindow::Resize() FloatingWindow::Resize(); } -// ----------------------------------------------------------------------- + Size ImplListBoxFloatingWindow::CalcFloatSize() { @@ -3232,7 +3232,7 @@ Size ImplListBoxFloatingWindow::CalcFloatSize() return aFloatSz; } -// ----------------------------------------------------------------------- + void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking ) { diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 5b41fc616994..1e3441a01705 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -26,7 +26,7 @@ namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; -// ----------------------------------------------------------------------- + ImageControl::ImageControl( Window* pParent, WinBits nStyle ) :FixedImage( pParent, nStyle ) @@ -34,7 +34,7 @@ ImageControl::ImageControl( Window* pParent, WinBits nStyle ) { } -// ----------------------------------------------------------------------- + ImageControl::ImageControl( Window* pParent, const ResId& rResId ) :FixedImage( pParent, rResId ) @@ -42,7 +42,7 @@ ImageControl::ImageControl( Window* pParent, const ResId& rResId ) { } -// ----------------------------------------------------------------------- + void ImageControl::SetScaleMode( const ::sal_Int16 _nMode ) { @@ -53,14 +53,14 @@ void ImageControl::SetScaleMode( const ::sal_Int16 _nMode ) } } -// ----------------------------------------------------------------------- + void ImageControl::Resize() { Invalidate(); } -// ----------------------------------------------------------------------- + namespace { static Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size& _rBitmapSize ) @@ -83,7 +83,7 @@ namespace } } -// ----------------------------------------------------------------------- + void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const { @@ -149,7 +149,7 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi } // switch ( mnScaleMode ) } -// ----------------------------------------------------------------------- + void ImageControl::Paint( const Rectangle& /*rRect*/ ) { @@ -177,7 +177,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) } } -// ----------------------------------------------------------------------- + void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { const Point aPos = pDev->LogicToPixel( rPos ); @@ -198,7 +198,7 @@ void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSiz pDev->Pop(); } -// ----------------------------------------------------------------------- + void ImageControl::GetFocus() { @@ -206,7 +206,7 @@ void ImageControl::GetFocus() GetWindow( WINDOW_BORDER )->Invalidate(); } -// ----------------------------------------------------------------------- + void ImageControl::LoseFocus() { diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index bf87289c1677..0ee8067a2a20 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -615,7 +615,7 @@ void ListBox::AdaptDropDownLineCountToMaximum() SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()); } -// ----------------------------------------------------------------------- + sal_uInt16 ListBox::GetDropDownLineCount() const { @@ -1536,7 +1536,7 @@ bool ListBox::set_property(const OString &rKey, const OString &rValue) return true; } -// ----------------------------------------------------------------------- + void ListBox::SetEdgeBlending(bool bNew) { diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index a942545ec792..35d01ed13c10 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -78,7 +78,7 @@ void Slider::ImplInit( Window* pParent, WinBits nStyle ) SetSizePixel( CalcWindowSizePixel() ); } -// ----------------------------------------------------------------------- + Slider::Slider( Window* pParent, WinBits nStyle ) : Control( WINDOW_SLIDER ) @@ -86,7 +86,7 @@ Slider::Slider( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + void Slider::ImplInitSettings() { @@ -111,7 +111,7 @@ void Slider::ImplInitSettings() } } -// ----------------------------------------------------------------------- + void Slider::ImplUpdateRects( bool bUpdate ) { @@ -220,7 +220,7 @@ void Slider::ImplUpdateRects( bool bUpdate ) } } -// ----------------------------------------------------------------------- + long Slider::ImplCalcThumbPos( long nPixPos ) { @@ -231,7 +231,7 @@ long Slider::ImplCalcThumbPos( long nPixPos ) return nCalcThumbPos; } -// ----------------------------------------------------------------------- + long Slider::ImplCalcThumbPosPix( long nPos ) { @@ -248,7 +248,7 @@ long Slider::ImplCalcThumbPosPix( long nPos ) return nCalcThumbPos+mnThumbPixOffset; } -// ----------------------------------------------------------------------- + void Slider::ImplCalc( bool bUpdate ) { @@ -319,7 +319,7 @@ void Slider::ImplCalc( bool bUpdate ) ImplUpdateRects( bUpdate ); } -// ----------------------------------------------------------------------- + void Slider::ImplDraw( sal_uInt16 nDrawFlags ) { @@ -459,7 +459,7 @@ void Slider::ImplDraw( sal_uInt16 nDrawFlags ) } } -// ----------------------------------------------------------------------- + bool Slider::ImplIsPageUp( const Point& rPos ) { @@ -478,7 +478,7 @@ bool Slider::ImplIsPageUp( const Point& rPos ) return aRect.IsInside( rPos ); } -// ----------------------------------------------------------------------- + bool Slider::ImplIsPageDown( const Point& rPos ) { @@ -497,7 +497,7 @@ bool Slider::ImplIsPageDown( const Point& rPos ) return aRect.IsInside( rPos ); } -// ----------------------------------------------------------------------- + long Slider::ImplSlide( long nNewPos, bool bCallEndSlide ) { @@ -515,7 +515,7 @@ long Slider::ImplSlide( long nNewPos, bool bCallEndSlide ) return nDelta; } -// ----------------------------------------------------------------------- + long Slider::ImplDoAction( bool bCallEndSlide ) { @@ -549,7 +549,7 @@ long Slider::ImplDoAction( bool bCallEndSlide ) return nDelta; } -// ----------------------------------------------------------------------- + void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) { @@ -611,7 +611,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) ImplDraw( mnDragDraw ); } -// ----------------------------------------------------------------------- + long Slider::ImplDoSlide( long nNewPos ) { @@ -624,7 +624,7 @@ long Slider::ImplDoSlide( long nNewPos ) return nDelta; } -// ----------------------------------------------------------------------- + long Slider::ImplDoSlideAction( ScrollType eScrollType ) { @@ -639,7 +639,7 @@ long Slider::ImplDoSlideAction( ScrollType eScrollType ) return nDelta; } -// ----------------------------------------------------------------------- + void Slider::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -700,7 +700,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void Slider::MouseButtonUp( const MouseEvent& ) { @@ -720,7 +720,7 @@ void Slider::MouseButtonUp( const MouseEvent& ) } } -// ----------------------------------------------------------------------- + void Slider::Tracking( const TrackingEvent& rTEvt ) { @@ -807,7 +807,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt ) } } -// ----------------------------------------------------------------------- + void Slider::KeyInput( const KeyEvent& rKEvt ) { @@ -849,14 +849,14 @@ void Slider::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + void Slider::Paint( const Rectangle& ) { ImplDraw( SLIDER_DRAW_ALL ); } -// ----------------------------------------------------------------------- + void Slider::Resize() { @@ -867,14 +867,14 @@ void Slider::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void Slider::RequestHelp( const HelpEvent& rHEvt ) { Control::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + void Slider::StateChanged( StateChangedType nType ) { @@ -920,7 +920,7 @@ void Slider::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void Slider::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -934,21 +934,21 @@ void Slider::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void Slider::Slide() { maSlideHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Slider::EndSlide() { maEndSlideHdl.Call( this ); } -// ----------------------------------------------------------------------- + void Slider::SetRange( const Range& rRange ) { @@ -975,7 +975,7 @@ void Slider::SetRange( const Range& rRange ) } } -// ----------------------------------------------------------------------- + void Slider::SetThumbPos( long nNewThumbPos ) { @@ -991,7 +991,7 @@ void Slider::SetThumbPos( long nNewThumbPos ) } } -// ----------------------------------------------------------------------- + Size Slider::CalcWindowSizePixel() { diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 6d6d7dbc256f..fccfe301b48e 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -50,7 +50,7 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) Control::ImplInit( pParent, nStyle, NULL ); } -// ----------------------------------------------------------------------- + SpinButton::SpinButton( Window* pParent, WinBits nStyle ) :Control( WINDOW_SPINBUTTON ) @@ -59,13 +59,13 @@ SpinButton::SpinButton( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- + SpinButton::~SpinButton() { } -// ----------------------------------------------------------------------- + IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer ) { @@ -85,7 +85,7 @@ IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer ) return 0; } -// ----------------------------------------------------------------------- + void SpinButton::Up() { @@ -100,7 +100,7 @@ void SpinButton::Up() ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_UP, maUpHdlLink, this ); } -// ----------------------------------------------------------------------- + void SpinButton::Down() { @@ -115,7 +115,7 @@ void SpinButton::Down() ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_DOWN, maDownHdlLink, this ); } -// ----------------------------------------------------------------------- + void SpinButton::Resize() { @@ -140,7 +140,7 @@ void SpinButton::Resize() Invalidate(); } -// ----------------------------------------------------------------------- + void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { @@ -199,7 +199,7 @@ void SpinButton::Paint( const Rectangle& ) ShowFocus( maFocusRect ); } -// ----------------------------------------------------------------------- + void SpinButton::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -225,7 +225,7 @@ void SpinButton::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void SpinButton::MouseButtonUp( const MouseEvent& ) { @@ -254,7 +254,7 @@ void SpinButton::MouseButtonUp( const MouseEvent& ) mbInitialUp = mbInitialDown = false; } -// ----------------------------------------------------------------------- + void SpinButton::MouseMove( const MouseEvent& rMEvt ) { @@ -297,7 +297,7 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void SpinButton::KeyInput( const KeyEvent& rKEvt ) { @@ -336,7 +336,7 @@ void SpinButton::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + void SpinButton::StateChanged( StateChangedType nType ) { @@ -373,21 +373,21 @@ void SpinButton::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void SpinButton::SetRangeMin( long nNewRange ) { SetRange( Range( nNewRange, GetRangeMax() ) ); } -// ----------------------------------------------------------------------- + void SpinButton::SetRangeMax( long nNewRange ) { SetRange( Range( GetRangeMin(), nNewRange ) ); } -// ----------------------------------------------------------------------- + void SpinButton::SetRange( const Range& rRange ) { @@ -414,7 +414,7 @@ void SpinButton::SetRange( const Range& rRange ) } } -// ----------------------------------------------------------------------- + void SpinButton::SetValue( long nValue ) { @@ -431,7 +431,7 @@ void SpinButton::SetValue( long nValue ) } } -// ----------------------------------------------------------------------- + void SpinButton::GetFocus() { @@ -439,7 +439,7 @@ void SpinButton::GetFocus() Control::GetFocus(); } -// ----------------------------------------------------------------------- + void SpinButton::LoseFocus() { @@ -447,7 +447,7 @@ void SpinButton::LoseFocus() Control::LoseFocus(); } -// ----------------------------------------------------------------------- + bool SpinButton::ImplMoveFocus( bool _bUpper ) { @@ -461,7 +461,7 @@ bool SpinButton::ImplMoveFocus( bool _bUpper ) return true; } -// ----------------------------------------------------------------------- + void SpinButton::ImplCalcFocusRect( bool _bUpper ) { @@ -474,7 +474,7 @@ void SpinButton::ImplCalcFocusRect( bool _bUpper ) mbUpperIsFocused = _bUpper; } -// ----------------------------------------------------------------------- + Rectangle* SpinButton::ImplFindPartRect( const Point& rPt ) { @@ -523,6 +523,6 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt ) return Control::PreNotify(rNEvt); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 3e72b136c363..8251a50d6951 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -303,7 +303,7 @@ void SpinField::ImplInitSpinFieldData() mbInDropDown = false; } -// -------------------------------------------------------------------- + void SpinField::ImplInit( Window* pParent, WinBits nWinStyle ) { @@ -339,7 +339,7 @@ void SpinField::ImplInit( Window* pParent, WinBits nWinStyle ) } } -// -------------------------------------------------------------------- + SpinField::SpinField( WindowType nTyp ) : Edit( nTyp ) @@ -347,7 +347,7 @@ SpinField::SpinField( WindowType nTyp ) : ImplInitSpinFieldData(); } -// -------------------------------------------------------------------- + SpinField::SpinField( Window* pParent, WinBits nWinStyle ) : Edit( WINDOW_SPINFIELD ) @@ -369,42 +369,42 @@ SpinField::SpinField( Window* pParent, const ResId& rResId ) : Show(); } -// -------------------------------------------------------------------- + SpinField::~SpinField() { delete mpEdit; } -// -------------------------------------------------------------------- + void SpinField::Up() { ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_UP, maUpHdlLink, this ); } -// -------------------------------------------------------------------- + void SpinField::Down() { ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_DOWN, maDownHdlLink, this ); } -// -------------------------------------------------------------------- + void SpinField::First() { ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_FIRST, maFirstHdlLink, this ); } -// -------------------------------------------------------------------- + void SpinField::Last() { ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_LAST, maLastHdlLink, this ); } -// -------------------------------------------------------------------- + void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -448,7 +448,7 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) Edit::MouseButtonDown( rMEvt ); } -// -------------------------------------------------------------------- + void SpinField::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -475,7 +475,7 @@ void SpinField::MouseButtonUp( const MouseEvent& rMEvt ) Edit::MouseButtonUp( rMEvt ); } -// -------------------------------------------------------------------- + void SpinField::MouseMove( const MouseEvent& rMEvt ) { @@ -522,7 +522,7 @@ void SpinField::MouseMove( const MouseEvent& rMEvt ) Edit::MouseMove( rMEvt ); } -// -------------------------------------------------------------------- + bool SpinField::Notify( NotifyEvent& rNEvt ) { @@ -610,14 +610,14 @@ bool SpinField::Notify( NotifyEvent& rNEvt ) return nDone || Edit::Notify( rNEvt ); } -// -------------------------------------------------------------------- + void SpinField::Command( const CommandEvent& rCEvt ) { Edit::Command( rCEvt ); } -// -------------------------------------------------------------------- + void SpinField::FillLayoutData() const { @@ -631,7 +631,7 @@ void SpinField::FillLayoutData() const Edit::FillLayoutData(); } -// -------------------------------------------------------------------- + void SpinField::Paint( const Rectangle& rRect ) { @@ -662,7 +662,7 @@ void SpinField::Paint( const Rectangle& rRect ) Edit::Paint( rRect ); } -// -------------------------------------------------------------------- + void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ) { @@ -747,7 +747,7 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec } } -// -------------------------------------------------------------------- + void SpinField::Resize() { @@ -808,7 +808,7 @@ void SpinField::Resize() } } -// ----------------------------------------------------------------------- + void SpinField::StateChanged( StateChangedType nType ) { @@ -872,7 +872,7 @@ void SpinField::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void SpinField::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -886,7 +886,7 @@ void SpinField::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + Rectangle* SpinField::ImplFindPartRect( const Point& rPt ) { @@ -947,7 +947,7 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt ) return Edit::PreNotify(rNEvt); } -// ----------------------------------------------------------------------- + void SpinField::EndDropDown() { @@ -955,7 +955,7 @@ void SpinField::EndDropDown() Paint( Rectangle( Point(), GetOutputSizePixel() ) ); } -// ----------------------------------------------------------------------- + bool SpinField::ShowDropDown( sal_Bool ) { @@ -996,14 +996,14 @@ Size SpinField::CalcMinimumSize() const return CalcMinimumSizeForText(GetText()); } -// ----------------------------------------------------------------------- + Size SpinField::GetOptimalSize() const { return CalcMinimumSize(); } -// ----------------------------------------------------------------------- + Size SpinField::CalcSize(sal_Int32 nChars) const { @@ -1017,7 +1017,7 @@ Size SpinField::CalcSize(sal_Int32 nChars) const return aSz; } -// -------------------------------------------------------------------- + IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer ) { @@ -1036,7 +1036,7 @@ IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer ) return 0; } -// ----------------------------------------------------------------------- + void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 81d2119b29d3..1f388c42d553 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -63,7 +63,7 @@ struct ImplTabItem {} }; -// ----------------------------------------------------------------------- + struct ImplTabCtrlData { @@ -75,7 +75,7 @@ struct ImplTabCtrlData ListBox* mpListBox; }; -// ----------------------------------------------------------------------- + #define TAB_OFFSET 3 #define TAB_TABOFFSET_X 3 @@ -137,20 +137,20 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle ) pParent->AddChildEventListener( LINK( this, TabControl, ImplWindowEventListener ) ); } -// ----------------------------------------------------------------- + const Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetAppFont(); } -// ----------------------------------------------------------------- + const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { return _rStyle.GetButtonTextColor(); } -// ----------------------------------------------------------------------- + void TabControl::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) @@ -188,7 +188,7 @@ void TabControl::ImplInitSettings( bool bFont, } } -// ----------------------------------------------------------------------- + void TabControl::ImplFreeLayoutData() { @@ -200,7 +200,7 @@ void TabControl::ImplFreeLayoutData() } } -// ----------------------------------------------------------------------- + TabControl::TabControl( Window* pParent, WinBits nStyle ) : Control( WINDOW_TABCONTROL ) @@ -209,7 +209,7 @@ TabControl::TabControl( Window* pParent, WinBits nStyle ) : OSL_TRACE("*** TABCONTROL no notabs? %s", ( GetStyle() & WB_NOBORDER ) ? "true" : "false" ); } -// ----------------------------------------------------------------------- + TabControl::TabControl( Window* pParent, const ResId& rResId ) : Control( WINDOW_TABCONTROL ) @@ -223,7 +223,7 @@ TabControl::TabControl( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- + void TabControl::ImplLoadRes( const ResId& rResId ) { @@ -244,7 +244,7 @@ void TabControl::ImplLoadRes( const ResId& rResId ) } } -// ----------------------------------------------------------------------- + TabControl::~TabControl() { @@ -262,7 +262,7 @@ TabControl::~TabControl() } } -// ----------------------------------------------------------------------- + ImplTabItem* TabControl::ImplGetItem( sal_uInt16 nId ) const { @@ -276,7 +276,7 @@ ImplTabItem* TabControl::ImplGetItem( sal_uInt16 nId ) const return NULL; } -// ----------------------------------------------------------------------- + Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ) { @@ -627,7 +627,7 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, long nHe return size_t(nItemPos) < mpTabCtrlData->maItemList.size() ? mpTabCtrlData->maItemList[nItemPos].maRect : Rectangle(); } -// ----------------------------------------------------------------------- + void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) { @@ -733,7 +733,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) Invalidate( aRect ); } -// ----------------------------------------------------------------------- + bool TabControl::ImplPosCurTabPage() { @@ -755,7 +755,7 @@ bool TabControl::ImplPosCurTabPage() return false; } -// ----------------------------------------------------------------------- + void TabControl::ImplActivateTabPage( bool bNext ) { @@ -774,7 +774,7 @@ void TabControl::ImplActivateTabPage( bool bNext ) SelectTabPage( GetPageId( nCurPos ) ); } -// ----------------------------------------------------------------------- + void TabControl::ImplShowFocus() { @@ -826,7 +826,7 @@ void TabControl::ImplShowFocus() ShowFocus( aRect ); } -// ----------------------------------------------------------------------- + void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout, bool bFirstInGroup, bool bLastInGroup, bool /* bIsCurrentItem */ ) { @@ -1026,7 +1026,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo } } -// ----------------------------------------------------------------------- + bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) { @@ -1062,7 +1062,7 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl) { @@ -1070,7 +1070,7 @@ IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( TabControl, ImplWindowEventListener, VclSimpleEvent*, pEvent ) { @@ -1088,7 +1088,7 @@ IMPL_LINK( TabControl, ImplWindowEventListener, VclSimpleEvent*, pEvent ) } -// ----------------------------------------------------------------------- + void TabControl::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -1104,7 +1104,7 @@ void TabControl::MouseButtonDown( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void TabControl::KeyInput( const KeyEvent& rKEvt ) { @@ -1125,7 +1125,7 @@ void TabControl::KeyInput( const KeyEvent& rKEvt ) Control::KeyInput( rKEvt ); } -// ----------------------------------------------------------------------- + void TabControl::Paint( const Rectangle& rRect ) { @@ -1133,7 +1133,7 @@ void TabControl::Paint( const Rectangle& rRect ) ImplPaint( rRect, false ); } -// ----------------------------------------------------------------------- + void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) { @@ -1315,7 +1315,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) mbSmallInvalidate = true; } -// ----------------------------------------------------------------------- + void TabControl::setAllocation(const Size &rAllocation) { @@ -1407,7 +1407,7 @@ void TabControl::Resize() setAllocation(Control::GetOutputSizePixel()); } -// ----------------------------------------------------------------------- + void TabControl::GetFocus() { @@ -1424,7 +1424,7 @@ void TabControl::GetFocus() Control::GetFocus(); } -// ----------------------------------------------------------------------- + void TabControl::LoseFocus() { @@ -1433,7 +1433,7 @@ void TabControl::LoseFocus() Control::LoseFocus(); } -// ----------------------------------------------------------------------- + void TabControl::RequestHelp( const HelpEvent& rHEvt ) { @@ -1518,7 +1518,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt ) Control::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- + void TabControl::Command( const CommandEvent& rCEvt ) { @@ -1559,7 +1559,7 @@ void TabControl::Command( const CommandEvent& rCEvt ) Control::Command( rCEvt ); } -// ----------------------------------------------------------------------- + void TabControl::StateChanged( StateChangedType nType ) { @@ -1594,7 +1594,7 @@ void TabControl::StateChanged( StateChangedType nType ) } } -// ----------------------------------------------------------------------- + void TabControl::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -1610,7 +1610,7 @@ void TabControl::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + Rectangle* TabControl::ImplFindPartRect( const Point& rPt ) { @@ -1678,7 +1678,7 @@ bool TabControl::PreNotify( NotifyEvent& rNEvt ) return Control::PreNotify(rNEvt); } -// ----------------------------------------------------------------------- + bool TabControl::Notify( NotifyEvent& rNEvt ) { @@ -1690,21 +1690,21 @@ bool TabControl::Notify( NotifyEvent& rNEvt ) return nRet || Control::Notify( rNEvt ); } -// ----------------------------------------------------------------------- + void TabControl::ActivatePage() { maActivateHdl.Call( this ); } -// ----------------------------------------------------------------------- + bool TabControl::DeactivatePage() { return !maDeactivateHdl.IsSet() || maDeactivateHdl.Call( this ); } -// ----------------------------------------------------------------------- + void TabControl::SetTabPageSizePixel( const Size& rSize ) { @@ -1718,7 +1718,7 @@ void TabControl::SetTabPageSizePixel( const Size& rSize ) Window::SetOutputSizePixel( aNewSize ); } -// ----------------------------------------------------------------------- + Size TabControl::GetTabPageSizePixel() const { @@ -1726,7 +1726,7 @@ Size TabControl::GetTabPageSizePixel() const return aRect.GetSize(); } -// ----------------------------------------------------------------------- + void TabControl::InsertPage( const ResId& rResId, sal_uInt16 nPos ) { @@ -1753,7 +1753,7 @@ void TabControl::InsertPage( const ResId& rResId, sal_uInt16 nPos ) } } -// ----------------------------------------------------------------------- + void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText, sal_uInt16 nPos ) @@ -1807,7 +1807,7 @@ void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText, ImplCallEventListeners( VCLEVENT_TABPAGE_INSERTED, (void*) (sal_uLong)nPageId ); } -// ----------------------------------------------------------------------- + void TabControl::RemovePage( sal_uInt16 nPageId ) { @@ -1855,7 +1855,7 @@ void TabControl::RemovePage( sal_uInt16 nPageId ) } } -// ----------------------------------------------------------------------- + void TabControl::Clear() { @@ -1874,7 +1874,7 @@ void TabControl::Clear() ImplCallEventListeners( VCLEVENT_TABPAGE_REMOVEDALL ); } -// ----------------------------------------------------------------------- + void TabControl::EnablePage( sal_uInt16 i_nPageId, bool i_bEnable ) { @@ -1897,14 +1897,14 @@ void TabControl::EnablePage( sal_uInt16 i_nPageId, bool i_bEnable ) } } -// ----------------------------------------------------------------------- + sal_uInt16 TabControl::GetPageCount() const { return (sal_uInt16)mpTabCtrlData->maItemList.size(); } -// ----------------------------------------------------------------------- + sal_uInt16 TabControl::GetPageId( sal_uInt16 nPos ) const { @@ -1913,7 +1913,7 @@ sal_uInt16 TabControl::GetPageId( sal_uInt16 nPos ) const return 0; } -// ----------------------------------------------------------------------- + sal_uInt16 TabControl::GetPagePos( sal_uInt16 nPageId ) const { @@ -1927,7 +1927,7 @@ sal_uInt16 TabControl::GetPagePos( sal_uInt16 nPageId ) const return TAB_PAGE_NOTFOUND; } -// ----------------------------------------------------------------------- + sal_uInt16 TabControl::GetPageId( const Point& rPos ) const { @@ -1964,7 +1964,7 @@ sal_uInt16 TabControl::GetPageId( const OString& rName ) const return 0; } -// ----------------------------------------------------------------------- + void TabControl::SetCurPageId( sal_uInt16 nPageId ) { @@ -2001,7 +2001,7 @@ void TabControl::SetCurPageId( sal_uInt16 nPageId ) } } -// ----------------------------------------------------------------------- + sal_uInt16 TabControl::GetCurPageId() const { @@ -2011,7 +2011,7 @@ sal_uInt16 TabControl::GetCurPageId() const return mnCurPageId; } -// ----------------------------------------------------------------------- + void TabControl::SelectTabPage( sal_uInt16 nPageId ) { @@ -2035,7 +2035,7 @@ void TabControl::SelectTabPage( sal_uInt16 nPageId ) } } -// ----------------------------------------------------------------------- + void TabControl::SetTabPage( sal_uInt16 nPageId, TabPage* pTabPage ) { @@ -2065,7 +2065,7 @@ void TabControl::SetTabPage( sal_uInt16 nPageId, TabPage* pTabPage ) } } -// ----------------------------------------------------------------------- + TabPage* TabControl::GetTabPage( sal_uInt16 nPageId ) const { @@ -2077,7 +2077,7 @@ TabPage* TabControl::GetTabPage( sal_uInt16 nPageId ) const return NULL; } -// ----------------------------------------------------------------------- + void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText ) { @@ -2100,7 +2100,7 @@ void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText ) } } -// ----------------------------------------------------------------------- + OUString TabControl::GetPageText( sal_uInt16 nPageId ) const { @@ -2111,7 +2111,7 @@ OUString TabControl::GetPageText( sal_uInt16 nPageId ) const return pItem->maText; } -// ----------------------------------------------------------------------- + void TabControl::SetHelpText( sal_uInt16 nPageId, const OUString& rText ) { @@ -2122,7 +2122,7 @@ void TabControl::SetHelpText( sal_uInt16 nPageId, const OUString& rText ) pItem->maHelpText = rText; } -// ----------------------------------------------------------------------- + const OUString& TabControl::GetHelpText( sal_uInt16 nPageId ) const { @@ -2139,7 +2139,7 @@ const OUString& TabControl::GetHelpText( sal_uInt16 nPageId ) const return pItem->maHelpText; } -// ----------------------------------------------------------------------- + void TabControl::SetHelpId( sal_uInt16 nPageId, const OString& rId ) const { @@ -2177,7 +2177,7 @@ OString TabControl::GetPageName( sal_uInt16 nPageId ) const return OString(); } -// ----------------------------------------------------------------------- + void TabControl::SetPageImage( sal_uInt16 i_nPageId, const Image& i_rImage ) { @@ -2192,7 +2192,7 @@ void TabControl::SetPageImage( sal_uInt16 i_nPageId, const Image& i_rImage ) } } -// ----------------------------------------------------------------------- + Rectangle TabControl::GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) const { @@ -2215,7 +2215,7 @@ Rectangle TabControl::GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) cons return aRet; } -// ----------------------------------------------------------------------- + long TabControl::GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) const { @@ -2248,7 +2248,7 @@ long TabControl::GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) co return nRet; } -// ----------------------------------------------------------------------- + void TabControl::FillLayoutData() const { @@ -2257,7 +2257,7 @@ void TabControl::FillLayoutData() const const_cast<TabControl*>(this)->ImplPaint( Rectangle(), true ); } -// ----------------------------------------------------------------------- + Rectangle TabControl::GetTabBounds( sal_uInt16 nPageId ) const { @@ -2270,7 +2270,7 @@ Rectangle TabControl::GetTabBounds( sal_uInt16 nPageId ) const return aRet; } -// ----------------------------------------------------------------------- + void TabControl::SetItemsOffset( const Point& rOffs ) { @@ -2286,7 +2286,7 @@ Point TabControl::GetItemsOffset() const return Point(); } -// ----------------------------------------------------------------------- + Size TabControl::calculateRequisition() const { diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 969e5898d29a..6a8c268a1a4e 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -2271,9 +2271,9 @@ sal_Int32 TextView::GetLineNumberOfCursorInSelection() const } -// ------------------------------------------------------------------------- + // (+) class TextSelFunctionSet -// ------------------------------------------------------------------------- + TextSelFunctionSet::TextSelFunctionSet( TextView* pView ) { mpView = pView; diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index c543c563d4e1..0f8f1342e277 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -223,9 +223,9 @@ bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea } -// ------------------------------------------------------------------------- + // class ExtTextView -// ------------------------------------------------------------------------- + ExtTextView::ExtTextView( ExtTextEngine* pEng, Window* pWindow ) : TextView( pEng, pWindow ) { diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index cbb35a2ccd61..47962c368793 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -300,7 +300,7 @@ void FilterConfigCache::ImplInitSmart() } } -// ------------------------------------------------------------------------ + FilterConfigCache::FilterConfigCache( bool bConfig ) : bUseConfig ( bConfig ) @@ -442,7 +442,7 @@ bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; } -// ------------------------------------------------------------------------ + OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat ) { @@ -556,6 +556,6 @@ bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat ) return (nFormat < aExport.size()) && aExport[ nFormat ].bIsPixelFormat; } -// ------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index db9af7ad21ed..253566b1be8e 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -400,14 +400,14 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } } -// ------------------------------------------------------------------------ + Sequence< PropertyValue > FilterConfigItem::GetFilterData() const { return aFilterData; } -// ------------------------------------------------------------------------ + Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const { diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index abdcbea87bdb..ded84a24c523 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -782,7 +782,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, return bTest && !bSomethingTested; } -//-------------------------------------------------------------------------- + sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ) { @@ -828,7 +828,7 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& return GRFILTER_OK; } -//-------------------------------------------------------------------------- + #ifndef DISABLE_EXPORT @@ -1343,7 +1343,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pExtHeader ); } -//------------------------------------------------------------------------- + sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, sal_uInt32 nImportFlags, diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx index fd92fba99856..db1bc12725bb 100644 --- a/vcl/source/filter/igif/decode.cxx +++ b/vcl/source/filter/igif/decode.cxx @@ -20,7 +20,7 @@ #include "decode.hxx" -// ------------------------------------------------------------------------ + struct GIFLZWTableEntry { @@ -29,7 +29,7 @@ struct GIFLZWTableEntry sal_uInt8 nData; }; -// ------------------------------------------------------------------------ + GIFLZWDecompressor::GIFLZWDecompressor( sal_uInt8 cDataSize ) : nInputBitsBuf ( 0 ), @@ -57,7 +57,7 @@ GIFLZWDecompressor::GIFLZWDecompressor( sal_uInt8 cDataSize ) : } } -// ------------------------------------------------------------------------ + GIFLZWDecompressor::~GIFLZWDecompressor() { @@ -65,7 +65,7 @@ GIFLZWDecompressor::~GIFLZWDecompressor() delete[] pTable; } -// ------------------------------------------------------------------------ + HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, sal_uLong& rCount, bool& rEOI ) @@ -111,7 +111,7 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, return pTarget; } -// ------------------------------------------------------------------------ + void GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData ) { @@ -130,7 +130,7 @@ void GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 nCodeFirst } } -// ------------------------------------------------------------------------ + bool GIFLZWDecompressor::ProcessOneCode() { diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx index 8b99c81c7f80..3b94c802b343 100644 --- a/vcl/source/filter/ixbm/xbmread.cxx +++ b/vcl/source/filter/ixbm/xbmread.cxx @@ -23,9 +23,9 @@ #include <comphelper/string.hxx> #include "xbmread.hxx" -// ------------- + // - XBMReader - -// ------------- + XBMReader::XBMReader( SvStream& rStm ) : rIStm ( rStm ), @@ -40,7 +40,7 @@ XBMReader::XBMReader( SvStream& rStm ) : InitTable(); } -// ------------------------------------------------------------------------ + XBMReader::~XBMReader() { @@ -50,7 +50,7 @@ XBMReader::~XBMReader() aBmp1.ReleaseAccess( pAcc1 ); } -// ------------------------------------------------------------------------ + void XBMReader::InitTable() { @@ -88,7 +88,7 @@ void XBMReader::InitTable() pHexTable[(int)'\0'] = -1; } -// ------------------------------------------------------------------------ + OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2, const char* pTok3 ) @@ -135,7 +135,7 @@ OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, return aRet; } -// ------------------------------------------------------------------------ + long XBMReader::ParseDefine( const sal_Char* pDefine ) { @@ -184,7 +184,7 @@ long XBMReader::ParseDefine( const sal_Char* pDefine ) return nRet; } -// ------------------------------------------------------------------------ + bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat ) { @@ -257,7 +257,7 @@ bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat return true; } -// ------------------------------------------------------------------------ + ReadState XBMReader::ReadXBM( Graphic& rGraphic ) { @@ -353,9 +353,9 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic ) return eReadState; } -// ------------- + // - ImportXBM - -// ------------- + bool ImportXBM( SvStream& rStm, Graphic& rGraphic ) { diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 27f49b19e2f3..9d3ad23145c4 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -24,9 +24,9 @@ #define _XPMPRIVATE #include "xpmread.hxx" -// ------------- + // - XPMReader - -// ------------- + XPMReader::XPMReader( SvStream& rStm ) : mrIStm ( rStm ), @@ -49,7 +49,7 @@ XPMReader::XPMReader( SvStream& rStm ) : } -// ------------------------------------------------------------------------ + XPMReader::~XPMReader() { @@ -57,7 +57,7 @@ XPMReader::~XPMReader() maBmp.ReleaseAccess( mpAcc ); } -// ------------------------------------------------------------------------ + ReadState XPMReader::ReadXPM( Graphic& rGraphic ) { @@ -214,7 +214,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) return eReadState; } -// ------------------------------------------------------------------------ + // ImplGetColor returns variouls colour values, // returns TRUE if various colours could be assigned @@ -233,7 +233,7 @@ bool XPMReader::ImplGetColor( sal_uLong nNumb ) return bStatus; } -// ------------------------------------------------------------------------ + // ImpGetScanLine reads the string mpBufSize and writes the pixel in the // Bitmap. Parameter nY is the horizontal position. @@ -299,7 +299,7 @@ bool XPMReader::ImplGetScanLine( sal_uLong nY ) return bStatus; } -// ------------------------------------------------------------------------ + // tries to determine a colour value from mpStringBuf // if a colour was found the RGB value is written a pDest[1]..pDest[2] // pDest[0] contains 0xFF if the colour is transparent otherwise 0 @@ -367,7 +367,7 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest ) return bColStatus; } -// ------------------------------------------------------------------------ + // ImplGetColKey searches string mpStringBuf for a parameter 'nKey' // and returns a boolean. (if TRUE mpPara and mnParaSize will be set) @@ -411,7 +411,7 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey ) return ( mnParaSize ) ? true : false; } -// ------------------------------------------------------------------------ + // ImplGetRGBHex translates the ASCII-Hexadecimalvalue belonging to mpPara // in a RGB value and writes this to pDest // below formats should be contained in mpPara: @@ -441,7 +441,7 @@ void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong nAdd ) } } -// ------------------------------------------------------------------------ + // ImplGetUlong returns the value of a up to 6-digit long ASCII-decimal number. sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) @@ -464,7 +464,7 @@ sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) else return 0; } -// ------------------------------------------------------------------------ + bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSize, sal_uLong nMode ) { @@ -495,7 +495,7 @@ bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSi return bRet; } -// ------------------------------------------------------------------------ + // ImplGetPara tries to retrieve nNumb (0...x) parameters from mpStringBuf. // Parameters are separated by spaces or tabs. // If a parameter was found then the return value is TRUE and mpPara + mnParaSize @@ -551,7 +551,7 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb ) return ( ( nCount == nNumb ) && ( mpPara ) ); } -// ------------------------------------------------------------------------ + // The next string is read and stored in mpStringBuf (terminated with 0); // mnStringSize contains the size of the string read. // Comments like '//' and '/*....*/' are skipped. @@ -650,9 +650,9 @@ bool XPMReader::ImplGetString( void ) return mbStatus; } -// ------------- + // - ImportXPM - -// ------------- + bool ImportXPM( SvStream& rStm, Graphic& rGraphic ) { diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 8d6fd89787aa..26efbadd9a0a 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -139,7 +139,7 @@ inline Point WMFReader::ReadPoint() return Point( nX, nY ); } -// ------------------------------------------------------------------------ + inline Point WMFReader::ReadYX() { @@ -148,7 +148,7 @@ inline Point WMFReader::ReadYX() return Point( nX, nY ); } -// ------------------------------------------------------------------------ + Rectangle WMFReader::ReadRectangle() { @@ -160,7 +160,7 @@ Rectangle WMFReader::ReadRectangle() return Rectangle( aTL, aBR ); } -// ------------------------------------------------------------------------ + Size WMFReader::ReadYXExt() { @@ -169,7 +169,7 @@ Size WMFReader::ReadYXExt() return Size( nW, nH ); } -// ------------------------------------------------------------------------ + void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) { @@ -1089,7 +1089,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) } } -// ------------------------------------------------------------------------ + bool WMFReader::ReadHeader() { @@ -1304,7 +1304,7 @@ void WMFReader::ReadWMF() pWMF->Seek( nStartPos ); } -// ------------------------------------------------------------------------ + bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm ) { diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index f9e51a2a8724..2100052336ab 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -25,7 +25,7 @@ #include <vcl/gdimetafiletools.hxx> #include <comphelper/scopeguard.hxx> -// ----------------------------------------------------------------------------- + bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_EXTERNALHEADER *pExtHeader ) { @@ -56,7 +56,7 @@ bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, return !rStreamWMF.GetError(); } -// ----------------------------------------------------------------------------- + bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pFilterConfigItem ) { @@ -90,7 +90,7 @@ bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* return rStream.good(); } -// ----------------------------------------------------------------------------- + bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem, bool bPlaceable) @@ -109,7 +109,7 @@ bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream return aWMFWriter.WriteWMF( aGdiMetaFile, rTargetStream, pConfigItem, bPlaceable ); } -// ----------------------------------------------------------------------------- + bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem ) @@ -128,7 +128,7 @@ bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream return aEMFWriter.WriteEMF( aGdiMetaFile, pConfigItem ); } -// ----------------------------------------------------------------------------- + bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ) { diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 1baff780e01f..ac979a20a6ef 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -1651,7 +1651,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) } } -// ------------------------------------------------------------------------ + void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) { @@ -1685,7 +1685,7 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) .WriteUInt16( (sal_uInt16)0x0000 ); // reserved } -// ------------------------------------------------------------------------ + void WMFWriter::UpdateHeader() { @@ -1707,7 +1707,7 @@ void WMFWriter::UpdateHeader() pWMF->Seek(nPos); } -// ------------------------------------------------------------------------ + bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, FilterConfigItem* pFConfigItem, bool bPlaceable ) @@ -1833,7 +1833,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, return bStatus; } -// ------------------------------------------------------------------------ + sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, const Size& rPrefSize) @@ -1859,7 +1859,7 @@ sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, return nDivisor; } -// ------------------------------------------------------------------------ + void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF ) { @@ -1912,7 +1912,7 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF ) } } -// ------------------------------------------------------------------------ + void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sal_uInt32 nRemainingSize, sal_uInt32 nTotalSize, sal_uInt32 nRecCounts, sal_uInt16 nCheckSum ) diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index d57b849ad965..79c9f50ab577 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -142,9 +142,9 @@ static const char* pStringIds[] = { "Regular", "Roman", "Semibold" }; -// -------------------------------------------------------------------- -// -------------------------------------------------------------------- + + // TOP DICT keywords (also covers PRIV DICT keywords) static const char* pDictOps[] = { @@ -158,7 +158,7 @@ static const char* pDictOps[] = { "shortint", "longint", "BCD", NULL }; -// -------------------------------------------------------------------- + // TOP DICT escapes (also covers PRIV DICT escapes) static const char* pDictEscs[] = { @@ -174,7 +174,7 @@ static const char* pDictEscs[] = { "nFDArray", "nFDSelect", "sFontName" }; -// -------------------------------------------------------------------- + static const char* pType1Ops[] = { NULL, "2hstem", NULL, "2vstem", @@ -187,7 +187,7 @@ static const char* pType1Ops[] = { NULL, NULL, "4vhcurveto", "4hvcurveto" }; -// -------------------------------------------------------------------- + static const char* pT1EscOps[] = { "0dotsection", "6vstem3", "6hstem3", NULL, @@ -201,7 +201,7 @@ static const char* pT1EscOps[] = { NULL, "2setcurrentpoint" }; -// -------------------------------------------------------------------- + struct TYPE1OP { @@ -222,7 +222,7 @@ struct TYPE1OP }; }; -// -------------------------------------------------------------------- + static const char* pType2Ops[] = { NULL, "hhstem", NULL, "vvstem", @@ -235,7 +235,7 @@ static const char* pType2Ops[] = { ".shortint", "Gcallgsubr", ".vhcurveto", ".hvcurveto" }; -// -------------------------------------------------------------------- + static const char* pT2EscOps[] = { NULL, NULL, NULL, "2and", @@ -250,7 +250,7 @@ static const char* pT2EscOps[] = { "9hflex1", "fflex1" }; -// -------------------------------------------------------------------- + struct TYPE2OP { @@ -350,7 +350,7 @@ public: GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) = 0; }; -// -------------------------------------------------------------------- + SubsetterContext::~SubsetterContext( void) {} @@ -463,7 +463,7 @@ private: ValType maCharWidth; }; -// -------------------------------------------------------------------- + CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) : mpBasePtr( pBasePtr) @@ -478,14 +478,14 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) mpCffLocal = &maCffLocal[0]; } -// -------------------------------------------------------------------- + CffSubsetterContext::~CffSubsetterContext( void) { // TODO: delete[] maCffLocal; } -// -------------------------------------------------------------------- + inline int CffSubsetterContext::popInt( void) { @@ -495,7 +495,7 @@ inline int CffSubsetterContext::popInt( void) return nInt; } -// -------------------------------------------------------------------- + inline int CffSubsetterContext::peekInt( void) const { @@ -505,7 +505,7 @@ inline int CffSubsetterContext::peekInt( void) const return nInt; } -// -------------------------------------------------------------------- + inline int CffSubsetterContext::getInt( int nIndex) const { @@ -515,7 +515,7 @@ inline int CffSubsetterContext::getInt( int nIndex) const return nInt; } -// -------------------------------------------------------------------- + inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) { @@ -535,7 +535,7 @@ inline void CffSubsetterContext::updateWidth( bool bUseFirstVal) } } -// -------------------------------------------------------------------- + void CffSubsetterContext::addHints( bool bVerticalHints) { @@ -568,7 +568,7 @@ void CffSubsetterContext::addHints( bool bVerticalHints) mnStackIdx = 0; } -// -------------------------------------------------------------------- + void CffSubsetterContext::setCharStringType( int nVal) { @@ -579,7 +579,7 @@ void CffSubsetterContext::setCharStringType( int nVal) } } -// -------------------------------------------------------------------- + void CffSubsetterContext::readDictOp( void) { @@ -718,7 +718,7 @@ void CffSubsetterContext::readDictOp( void) } } -// -------------------------------------------------------------------- + void CffSubsetterContext::read2push() { @@ -752,7 +752,7 @@ void CffSubsetterContext::read2push() push( aVal); } -// -------------------------------------------------------------------- + void CffSubsetterContext::writeType1Val( ValType aVal) { @@ -789,7 +789,7 @@ void CffSubsetterContext::writeType1Val( ValType aVal) mpWritePtr = pOut; } -// -------------------------------------------------------------------- + inline void CffSubsetterContext::pop2write( void) { @@ -797,14 +797,14 @@ inline void CffSubsetterContext::pop2write( void) writeType1Val( aVal); } -// -------------------------------------------------------------------- + inline void CffSubsetterContext::writeTypeOp( int nTypeOp) { *(mpWritePtr++) = static_cast<U8>(nTypeOp); } -// -------------------------------------------------------------------- + inline void CffSubsetterContext::writeTypeEsc( int nTypeEsc) { @@ -812,7 +812,7 @@ inline void CffSubsetterContext::writeTypeEsc( int nTypeEsc) *(mpWritePtr++) = static_cast<U8>(nTypeEsc); } -// -------------------------------------------------------------------- + void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTypeXor) { @@ -828,7 +828,7 @@ void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTy clear(); } -// -------------------------------------------------------------------- + void CffSubsetterContext::popAll2Write( int nTypeOp) { @@ -841,7 +841,7 @@ void CffSubsetterContext::popAll2Write( int nTypeOp) writeTypeOp( nTypeOp); } -// -------------------------------------------------------------------- + void CffSubsetterContext::writeCurveTo( int nStackPos, int nIX1, int nIY1, int nIX2, int nIY2, int nIX3, int nIY3) @@ -866,7 +866,7 @@ void CffSubsetterContext::writeCurveTo( int nStackPos, writeTypeOp( TYPE1OP::RCURVETO ); } -// -------------------------------------------------------------------- + void CffSubsetterContext::convertOneTypeOp( void) { @@ -1093,7 +1093,7 @@ void CffSubsetterContext::convertOneTypeOp( void) } } -// -------------------------------------------------------------------- + void CffSubsetterContext::convertOneTypeEsc( void) { @@ -1276,7 +1276,7 @@ void CffSubsetterContext::convertOneTypeEsc( void) } } -// -------------------------------------------------------------------- + void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber) { @@ -1298,7 +1298,7 @@ void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber) mpReadEnd = pOldReadEnd; } -// -------------------------------------------------------------------- + static const int MAX_T1OPS_SIZE = 81920; // TODO: use dynamic value @@ -1375,7 +1375,7 @@ if( mbSawError) { return nType1Len; } -// -------------------------------------------------------------------- + RealType CffSubsetterContext::readRealVal() { @@ -1447,7 +1447,7 @@ RealType CffSubsetterContext::readRealVal() return fReal; } -// -------------------------------------------------------------------- + // prepare to access an element inside a CFF/CID index table int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex) @@ -1488,7 +1488,7 @@ int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex) return (nOfs2 - nOfs1); } -// -------------------------------------------------------------------- + // skip over a CFF/CID index table void CffSubsetterContext::seekIndexEnd( int nIndexBase) @@ -1543,7 +1543,7 @@ CffLocal::CffLocal( void) maFamilyOtherBlues.clear(); } -// -------------------------------------------------------------------- + CffGlobal::CffGlobal( void) : mnNameIdxBase( 0) @@ -1569,7 +1569,7 @@ CffGlobal::CffGlobal( void) // TODO; maFontMatrix.clear(); } -// -------------------------------------------------------------------- + void CffSubsetterContext::initialCffRead( void) { @@ -1672,7 +1672,7 @@ void CffSubsetterContext::initialCffRead( void) // ignore the Notices info } -// -------------------------------------------------------------------- + // get a cstring from a StringID const char* CffSubsetterContext::getString( int nStringID) @@ -1706,7 +1706,7 @@ const char* CffSubsetterContext::getString( int nStringID) return aNameBuf; } -// -------------------------------------------------------------------- + // access a CID's FDSelect table int CffSubsetterContext::getFDSelect( int nGlyphIndex) const @@ -1752,7 +1752,7 @@ int CffSubsetterContext::getFDSelect( int nGlyphIndex) const return -1; } -// -------------------------------------------------------------------- + int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const { @@ -1801,7 +1801,7 @@ int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const return nSID; } -// -------------------------------------------------------------------- + // NOTE: the result becomes invalid with the next call to this method const char* CffSubsetterContext::getGlyphName( int nGlyphIndex) @@ -1839,7 +1839,7 @@ const char* CffSubsetterContext::getGlyphName( int nGlyphIndex) return pGlyphName; } -// -------------------------------------------------------------------- + class Type1Emitter { @@ -1868,7 +1868,7 @@ public: int mnHexLineCol; }; -// -------------------------------------------------------------------- + Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset) : mpFileOut( pOutFile) @@ -1881,7 +1881,7 @@ Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset) maSubsetName[0] = '\0'; } -// -------------------------------------------------------------------- + Type1Emitter::~Type1Emitter( void) { @@ -1892,7 +1892,7 @@ Type1Emitter::~Type1Emitter( void) mpFileOut = NULL; } -// -------------------------------------------------------------------- + void Type1Emitter::setSubsetName( const char* pSubsetName) { @@ -1902,7 +1902,7 @@ void Type1Emitter::setSubsetName( const char* pSubsetName) maSubsetName[sizeof(maSubsetName)-1] = '\0'; } -// -------------------------------------------------------------------- + int Type1Emitter::tellPos( void) const { @@ -1910,7 +1910,7 @@ int Type1Emitter::tellPos( void) const return nTellPos; } -// -------------------------------------------------------------------- + size_t Type1Emitter::updateLen( int nTellPos, size_t nLength) { @@ -1928,14 +1928,14 @@ size_t Type1Emitter::updateLen( int nTellPos, size_t nLength) return nWrote; } -// -------------------------------------------------------------------- + inline size_t Type1Emitter::emitRawData(const char* pData, size_t nLength) const { return fwrite( pData, 1, nLength, mpFileOut); } -// -------------------------------------------------------------------- + inline void Type1Emitter::emitAllRaw( void) { @@ -1946,7 +1946,7 @@ inline void Type1Emitter::emitAllRaw( void) mpPtr = maBuffer; } -// -------------------------------------------------------------------- + inline void Type1Emitter::emitAllHex( void) { @@ -1974,7 +1974,7 @@ inline void Type1Emitter::emitAllHex( void) mpPtr = maBuffer; } -// -------------------------------------------------------------------- + void Type1Emitter::emitAllCrypted( void) { @@ -1991,7 +1991,7 @@ void Type1Emitter::emitAllCrypted( void) emitAllHex(); } -// -------------------------------------------------------------------- + // #i110387# quick-and-dirty double->ascii conversion // needed because sprintf/ecvt/etc. alone are too localized (LC_NUMERIC) @@ -2002,7 +2002,7 @@ inline int dbl2str( char* pOut, double fVal, int nPrecision=6) return nLen; } -// -------------------------------------------------------------------- + void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail, const ValVector& rVector) @@ -2028,7 +2028,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail, mpPtr += sprintf( mpPtr, "%s", pLineTail); } -// -------------------------------------------------------------------- + bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, const sal_GlyphId* pReqGlyphIds, const U8* pReqEncoding, diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index 8b8970486cad..ab0636f73c04 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -36,12 +36,12 @@ FontSubsetInfo::FontSubsetInfo() , mpSftTTFont( NULL) {} -// -------------------------------------------------------------------- + FontSubsetInfo::~FontSubsetInfo() {} -// -------------------------------------------------------------------- + // prepare subsetting for fonts where the input font file is mapped bool FontSubsetInfo::LoadFont( @@ -55,7 +55,7 @@ bool FontSubsetInfo::LoadFont( return (mnInByteLength > 0); } -// -------------------------------------------------------------------- + // prepare subsetting for fonts that are known to the SFT-parser bool FontSubsetInfo::LoadFont( vcl::_TrueTypeFont* pSftTTFont ) @@ -66,7 +66,7 @@ bool FontSubsetInfo::LoadFont( vcl::_TrueTypeFont* pSftTTFont ) return (mpSftTTFont == NULL); } -// -------------------------------------------------------------------- + bool FontSubsetInfo::CreateFontSubset( int nReqFontTypeMask, @@ -113,7 +113,7 @@ bool FontSubsetInfo::CreateFontSubset( return bOK; } -// -------------------------------------------------------------------- + // TODO: move function to sft.cxx to replace dummy implementation bool FontSubsetInfo::CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths ) @@ -158,7 +158,7 @@ bool FontSubsetInfo::CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths ) return (nSFTErr != vcl::SF_OK); } -// -------------------------------------------------------------------- + // TODO: replace dummy implementation bool FontSubsetInfo::CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths) diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx index b92d6b670757..22365b709764 100644 --- a/vcl/source/fontsubset/xlat.cxx +++ b/vcl/source/fontsubset/xlat.cxx @@ -51,7 +51,7 @@ ConverterCache::ConverterCache( void) } } -// -------------------------------------------------------------------- + ConverterCache::~ConverterCache( void) { @@ -64,7 +64,7 @@ ConverterCache::~ConverterCache( void) } } -// -------------------------------------------------------------------- + void ConverterCache::ensureConverter( int nSelect ) { @@ -93,7 +93,7 @@ void ConverterCache::ensureConverter( int nSelect ) rtl_resetUnicodeToTextContext( maConverterCache[ nSelect ], aContext ); } -// -------------------------------------------------------------------- + sal_uInt16 ConverterCache::convertOne( int nSelect, sal_Unicode aChar ) { @@ -118,7 +118,7 @@ sal_uInt16 ConverterCache::convertOne( int nSelect, sal_Unicode aChar ) return aCode; } -// -------------------------------------------------------------------- + void ConverterCache::convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount ) { diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 73029540a90b..22afc65c627e 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -946,7 +946,7 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nSc return bRetval; } -// ------------------------------------------------------------------------ + bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { @@ -965,14 +965,14 @@ bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) return bRet; } -// ------------------------------------------------------------------------ + void Bitmap::AdaptBitCount(Bitmap& rNew) const { ImplAdaptBitCount(rNew); } -// ------------------------------------------------------------------------ + void Bitmap::ImplAdaptBitCount(Bitmap& rNew) const { @@ -2084,7 +2084,7 @@ bool Bitmap::ImplScaleSuper( return bRet; } -//----------------------------------------------------------------------------------- + namespace { @@ -2442,7 +2442,7 @@ bool Bitmap::ImplScaleConvolution( return bResult; } -// ------------------------------------------------------------------------ + bool Bitmap::Dither( sal_uLong nDitherFlags ) { diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index a6fb09f1ad05..91c299177d63 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -27,9 +27,9 @@ #include <numeric> -// ---------------- + // - ImplLineInfo - -// ---------------- + ImplLineInfo::ImplLineInfo() : mnRefCount ( 1 ), @@ -45,7 +45,7 @@ ImplLineInfo::ImplLineInfo() : { } -// ----------------------------------------------------------------------- + ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : mnRefCount ( 1 ), @@ -61,7 +61,7 @@ ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : { } -// ----------------------------------------------------------------------- + inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const { @@ -76,9 +76,9 @@ inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const && meLineCap == rB.meLineCap); } -// ------------ + // - LineInfo - -// ------------ + LineInfo::LineInfo( LineStyle eStyle, long nWidth ) { @@ -87,7 +87,7 @@ LineInfo::LineInfo( LineStyle eStyle, long nWidth ) mpImplLineInfo->mnWidth = nWidth; } -// ----------------------------------------------------------------------- + LineInfo::LineInfo( const LineInfo& rLineInfo ) { @@ -95,7 +95,7 @@ LineInfo::LineInfo( const LineInfo& rLineInfo ) mpImplLineInfo->mnRefCount++; } -// ----------------------------------------------------------------------- + LineInfo::~LineInfo() { @@ -103,7 +103,7 @@ LineInfo::~LineInfo() delete mpImplLineInfo; } -// ----------------------------------------------------------------------- + LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) { @@ -117,7 +117,7 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) return *this; } -// ----------------------------------------------------------------------- + bool LineInfo::operator==( const LineInfo& rLineInfo ) const { @@ -126,7 +126,7 @@ bool LineInfo::operator==( const LineInfo& rLineInfo ) const *mpImplLineInfo == *rLineInfo.mpImplLineInfo ); } -// ----------------------------------------------------------------------- + void LineInfo::ImplMakeUnique() { @@ -139,7 +139,7 @@ void LineInfo::ImplMakeUnique() } } -// ----------------------------------------------------------------------- + void LineInfo::SetStyle( LineStyle eStyle ) { @@ -147,7 +147,7 @@ void LineInfo::SetStyle( LineStyle eStyle ) mpImplLineInfo->meStyle = eStyle; } -// ----------------------------------------------------------------------- + void LineInfo::SetWidth( long nWidth ) { @@ -155,7 +155,7 @@ void LineInfo::SetWidth( long nWidth ) mpImplLineInfo->mnWidth = nWidth; } -// ----------------------------------------------------------------------- + void LineInfo::SetDashCount( sal_uInt16 nDashCount ) { @@ -163,7 +163,7 @@ void LineInfo::SetDashCount( sal_uInt16 nDashCount ) mpImplLineInfo->mnDashCount = nDashCount; } -// ----------------------------------------------------------------------- + void LineInfo::SetDashLen( long nDashLen ) { @@ -171,7 +171,7 @@ void LineInfo::SetDashLen( long nDashLen ) mpImplLineInfo->mnDashLen = nDashLen; } -// ----------------------------------------------------------------------- + void LineInfo::SetDotCount( sal_uInt16 nDotCount ) { @@ -179,7 +179,7 @@ void LineInfo::SetDotCount( sal_uInt16 nDotCount ) mpImplLineInfo->mnDotCount = nDotCount; } -// ----------------------------------------------------------------------- + void LineInfo::SetDotLen( long nDotLen ) { @@ -187,7 +187,7 @@ void LineInfo::SetDotLen( long nDotLen ) mpImplLineInfo->mnDotLen = nDotLen; } -// ----------------------------------------------------------------------- + void LineInfo::SetDistance( long nDistance ) { @@ -195,7 +195,7 @@ void LineInfo::SetDistance( long nDistance ) mpImplLineInfo->mnDistance = nDistance; } -// ----------------------------------------------------------------------- + void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) { @@ -207,7 +207,7 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) } } -// ----------------------------------------------------------------------- + void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) { @@ -218,7 +218,7 @@ void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) } } -// ----------------------------------------------------------------------- + bool LineInfo::IsDefault() const { @@ -227,7 +227,7 @@ bool LineInfo::IsDefault() const && ( com::sun::star::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap)); } -// ----------------------------------------------------------------------- + SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) { @@ -266,7 +266,7 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) return rIStm; } -// ----------------------------------------------------------------------- + SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ) { @@ -290,7 +290,7 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo return rOStm; } -// ----------------------------------------------------------------------- + SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ) { @@ -298,14 +298,14 @@ SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ) return ReadImplLineInfo( rIStm, *rLineInfo.mpImplLineInfo ); } -// ----------------------------------------------------------------------- + SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ) { return WriteImplLineInfo( rOStm, *rLineInfo.mpImplLineInfo ); } -// ----------------------------------------------------------------------- + void LineInfo::applyToB2DPolyPolygon( basegfx::B2DPolyPolygon& io_rLinePolyPolygon, diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 16ecaa20ac57..e3977355321b 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -38,7 +38,7 @@ inline void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY ) rPt.Y() = FRound( fScaleY * rPt.Y() ); } -// ------------------------------------------------------------------------ + inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY ) { @@ -52,7 +52,7 @@ inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY ) rRect.Justify(); } -// ------------------------------------------------------------------------ + inline void ImplScalePoly( Polygon& rPoly, double fScaleX, double fScaleY ) { @@ -60,7 +60,7 @@ inline void ImplScalePoly( Polygon& rPoly, double fScaleX, double fScaleY ) ImplScalePoint( rPoly[ i ], fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScaleY ) { @@ -90,7 +90,7 @@ MetaAction::MetaAction() : { } -// ------------------------------------------------------------------------ + MetaAction::MetaAction( sal_uInt16 nType ) : mnRefCount( 1 ), @@ -98,59 +98,59 @@ MetaAction::MetaAction( sal_uInt16 nType ) : { } -// ------------------------------------------------------------------------ + MetaAction::~MetaAction() { } -// ------------------------------------------------------------------------ + void MetaAction::Execute( OutputDevice* ) { } -// ------------------------------------------------------------------------ + MetaAction* MetaAction::Clone() { return new MetaAction; } -// ------------------------------------------------------------------------ + void MetaAction::Move( long, long ) { } -// ------------------------------------------------------------------------ + void MetaAction::Scale( double, double ) { } -// ------------------------------------------------------------------------ + bool MetaAction::Compare( const MetaAction& ) const { return true; } -// ------------------------------------------------------------------------ + void MetaAction::Write( SvStream& rOStm, ImplMetaWriteData* ) { rOStm.WriteUInt16( mnType ); } -// ------------------------------------------------------------------------ + void MetaAction::Read( SvStream&, ImplMetaReadData* ) { // DO NOT read mnType - ReadMetaAction already did that! } -// ------------------------------------------------------------------------ + MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ) { @@ -237,7 +237,7 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData IMPL_META_ACTION( Pixel, META_PIXEL_ACTION ) -// ------------------------------------------------------------------------ + MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) : MetaAction ( META_PIXEL_ACTION ), @@ -246,14 +246,14 @@ MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) : { } -// ------------------------------------------------------------------------ + void MetaPixelAction::Execute( OutputDevice* pOut ) { pOut->DrawPixel( maPt, maColor ); } -// ------------------------------------------------------------------------ + MetaAction* MetaPixelAction::Clone() { @@ -262,21 +262,21 @@ MetaAction* MetaPixelAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaPixelAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaPixelAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const { @@ -284,7 +284,7 @@ bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const ( maColor == ((MetaPixelAction&)rMetaAction).maColor ); } -// ------------------------------------------------------------------------ + void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -293,7 +293,7 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maColor.Write( rOStm, true ); } -// ------------------------------------------------------------------------ + void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -306,7 +306,7 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Point, META_POINT_ACTION ) -// ------------------------------------------------------------------------ + MetaPointAction::MetaPointAction( const Point& rPt ) : MetaAction ( META_POINT_ACTION ), @@ -314,14 +314,14 @@ MetaPointAction::MetaPointAction( const Point& rPt ) : { } -// ------------------------------------------------------------------------ + void MetaPointAction::Execute( OutputDevice* pOut ) { pOut->DrawPixel( maPt ); } -// ------------------------------------------------------------------------ + MetaAction* MetaPointAction::Clone() { @@ -330,28 +330,28 @@ MetaAction* MetaPointAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaPointAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaPointAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const { return maPt == ((MetaPointAction&)rMetaAction).maPt; } -// ------------------------------------------------------------------------ + void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -359,7 +359,7 @@ void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maPt ); } -// ------------------------------------------------------------------------ + void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -371,7 +371,7 @@ void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Line, META_LINE_ACTION ) -// ------------------------------------------------------------------------ + MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : MetaAction ( META_LINE_ACTION ), @@ -380,7 +380,7 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) : { } -// ------------------------------------------------------------------------ + MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ) : @@ -391,7 +391,7 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd, { } -// ------------------------------------------------------------------------ + void MetaLineAction::Execute( OutputDevice* pOut ) { @@ -401,7 +401,7 @@ void MetaLineAction::Execute( OutputDevice* pOut ) pOut->DrawLine( maStartPt, maEndPt, maLineInfo ); } -// ------------------------------------------------------------------------ + MetaAction* MetaLineAction::Clone() { @@ -410,7 +410,7 @@ MetaAction* MetaLineAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaLineAction::Move( long nHorzMove, long nVertMove ) { @@ -418,7 +418,7 @@ void MetaLineAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaLineAction::Scale( double fScaleX, double fScaleY ) { @@ -427,7 +427,7 @@ void MetaLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const { @@ -436,7 +436,7 @@ bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaLineAction&)rMetaAction).maEndPt ); } -// ------------------------------------------------------------------------ + void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -447,7 +447,7 @@ void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteLineInfo( rOStm, maLineInfo ); // Version 2 } -// ------------------------------------------------------------------------ + void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -468,7 +468,7 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Rect, META_RECT_ACTION ) -// ------------------------------------------------------------------------ + MetaRectAction::MetaRectAction( const Rectangle& rRect ) : MetaAction ( META_RECT_ACTION ), @@ -476,14 +476,14 @@ MetaRectAction::MetaRectAction( const Rectangle& rRect ) : { } -// ------------------------------------------------------------------------ + void MetaRectAction::Execute( OutputDevice* pOut ) { pOut->DrawRect( maRect ); } -// ------------------------------------------------------------------------ + MetaAction* MetaRectAction::Clone() { @@ -492,28 +492,28 @@ MetaAction* MetaRectAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaRectAction&)rMetaAction).maRect; } -// ------------------------------------------------------------------------ + void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -521,7 +521,7 @@ void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteRectangle( rOStm, maRect ); } -// ------------------------------------------------------------------------ + void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -533,7 +533,7 @@ void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) -// ------------------------------------------------------------------------ + MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ) : @@ -544,14 +544,14 @@ MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect, { } -// ------------------------------------------------------------------------ + void MetaRoundRectAction::Execute( OutputDevice* pOut ) { pOut->DrawRect( maRect, mnHorzRound, mnVertRound ); } -// ------------------------------------------------------------------------ + MetaAction* MetaRoundRectAction::Clone() { @@ -560,14 +560,14 @@ MetaAction* MetaRoundRectAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaRoundRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) { @@ -576,7 +576,7 @@ void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) mnVertRound = FRound( mnVertRound * fabs(fScaleY) ); } -// ------------------------------------------------------------------------ + bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const { @@ -585,7 +585,7 @@ bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const ( mnVertRound == ((MetaRoundRectAction&)rMetaAction).mnVertRound ); } -// ------------------------------------------------------------------------ + void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -594,7 +594,7 @@ void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound ); } -// ------------------------------------------------------------------------ + void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -606,7 +606,7 @@ void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) -// ------------------------------------------------------------------------ + MetaEllipseAction::MetaEllipseAction( const Rectangle& rRect ) : MetaAction ( META_ELLIPSE_ACTION ), @@ -614,14 +614,14 @@ MetaEllipseAction::MetaEllipseAction( const Rectangle& rRect ) : { } -// ------------------------------------------------------------------------ + void MetaEllipseAction::Execute( OutputDevice* pOut ) { pOut->DrawEllipse( maRect ); } -// ------------------------------------------------------------------------ + MetaAction* MetaEllipseAction::Clone() { @@ -630,28 +630,28 @@ MetaAction* MetaEllipseAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaEllipseAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaEllipseAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaEllipseAction&)rMetaAction).maRect; } -// ------------------------------------------------------------------------ + void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -659,7 +659,7 @@ void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteRectangle( rOStm, maRect ); } -// ------------------------------------------------------------------------ + void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -671,7 +671,7 @@ void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Arc, META_ARC_ACTION ) -// ------------------------------------------------------------------------ + MetaArcAction::MetaArcAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : @@ -682,14 +682,14 @@ MetaArcAction::MetaArcAction( const Rectangle& rRect, { } -// ------------------------------------------------------------------------ + void MetaArcAction::Execute( OutputDevice* pOut ) { pOut->DrawArc( maRect, maStartPt, maEndPt ); } -// ------------------------------------------------------------------------ + MetaAction* MetaArcAction::Clone() { @@ -698,7 +698,7 @@ MetaAction* MetaArcAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaArcAction::Move( long nHorzMove, long nVertMove ) { @@ -707,7 +707,7 @@ void MetaArcAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaArcAction::Scale( double fScaleX, double fScaleY ) { @@ -716,7 +716,7 @@ void MetaArcAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const { @@ -725,7 +725,7 @@ bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaArcAction&)rMetaAction).maEndPt ); } -// ------------------------------------------------------------------------ + void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -735,7 +735,7 @@ void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } -// ------------------------------------------------------------------------ + void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -749,7 +749,7 @@ void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Pie, META_PIE_ACTION ) -// ------------------------------------------------------------------------ + MetaPieAction::MetaPieAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : @@ -760,14 +760,14 @@ MetaPieAction::MetaPieAction( const Rectangle& rRect, { } -// ------------------------------------------------------------------------ + void MetaPieAction::Execute( OutputDevice* pOut ) { pOut->DrawPie( maRect, maStartPt, maEndPt ); } -// ------------------------------------------------------------------------ + MetaAction* MetaPieAction::Clone() { @@ -776,7 +776,7 @@ MetaAction* MetaPieAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaPieAction::Move( long nHorzMove, long nVertMove ) { @@ -785,7 +785,7 @@ void MetaPieAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaPieAction::Scale( double fScaleX, double fScaleY ) { @@ -794,7 +794,7 @@ void MetaPieAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const { @@ -803,7 +803,7 @@ bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaPieAction&)rMetaAction).maEndPt ); } -// ------------------------------------------------------------------------ + void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -813,7 +813,7 @@ void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } -// ------------------------------------------------------------------------ + void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -827,7 +827,7 @@ void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Chord, META_CHORD_ACTION ) -// ------------------------------------------------------------------------ + MetaChordAction::MetaChordAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) : @@ -838,14 +838,14 @@ MetaChordAction::MetaChordAction( const Rectangle& rRect, { } -// ------------------------------------------------------------------------ + void MetaChordAction::Execute( OutputDevice* pOut ) { pOut->DrawChord( maRect, maStartPt, maEndPt ); } -// ------------------------------------------------------------------------ + MetaAction* MetaChordAction::Clone() { @@ -854,7 +854,7 @@ MetaAction* MetaChordAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaChordAction::Move( long nHorzMove, long nVertMove ) { @@ -863,7 +863,7 @@ void MetaChordAction::Move( long nHorzMove, long nVertMove ) maEndPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaChordAction::Scale( double fScaleX, double fScaleY ) { @@ -872,7 +872,7 @@ void MetaChordAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const { @@ -881,7 +881,7 @@ bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const ( maEndPt == ((MetaChordAction&)rMetaAction).maEndPt ); } -// ------------------------------------------------------------------------ + void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -891,7 +891,7 @@ void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WritePair( rOStm, maEndPt ); } -// ------------------------------------------------------------------------ + void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -905,7 +905,7 @@ void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) -// ------------------------------------------------------------------------ + MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly ) : MetaAction ( META_POLYLINE_ACTION ), @@ -913,7 +913,7 @@ MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly ) : { } -// ------------------------------------------------------------------------ + MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo ) : MetaAction ( META_POLYLINE_ACTION ), @@ -922,7 +922,7 @@ MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rL { } -// ------------------------------------------------------------------------ + void MetaPolyLineAction::Execute( OutputDevice* pOut ) { @@ -932,7 +932,7 @@ void MetaPolyLineAction::Execute( OutputDevice* pOut ) pOut->DrawPolyLine( maPoly, maLineInfo ); } -// ------------------------------------------------------------------------ + MetaAction* MetaPolyLineAction::Clone() { @@ -941,14 +941,14 @@ MetaAction* MetaPolyLineAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaPolyLineAction::Move( long nHorzMove, long nVertMove ) { maPoly.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaPolyLineAction::Scale( double fScaleX, double fScaleY ) { @@ -956,7 +956,7 @@ void MetaPolyLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const { @@ -969,7 +969,7 @@ bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const } -// ------------------------------------------------------------------------ + void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -987,7 +987,7 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.Write( rOStm ); } -// ------------------------------------------------------------------------ + void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -1012,7 +1012,7 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Polygon, META_POLYGON_ACTION ) -// ------------------------------------------------------------------------ + MetaPolygonAction::MetaPolygonAction( const Polygon& rPoly ) : MetaAction ( META_POLYGON_ACTION ), @@ -1020,14 +1020,14 @@ MetaPolygonAction::MetaPolygonAction( const Polygon& rPoly ) : { } -// ------------------------------------------------------------------------ + void MetaPolygonAction::Execute( OutputDevice* pOut ) { pOut->DrawPolygon( maPoly ); } -// ------------------------------------------------------------------------ + MetaAction* MetaPolygonAction::Clone() { @@ -1036,28 +1036,28 @@ MetaAction* MetaPolygonAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaPolygonAction::Move( long nHorzMove, long nVertMove ) { maPoly.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaPolygonAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoly( maPoly, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPoly.IsEqual(((MetaPolygonAction&)rMetaAction).maPoly ); } -// ------------------------------------------------------------------------ + void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1073,7 +1073,7 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPoly.Write( rOStm ); } -// ------------------------------------------------------------------------ + void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -1094,7 +1094,7 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) -// ------------------------------------------------------------------------ + MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) : MetaAction ( META_POLYPOLYGON_ACTION ), @@ -1102,14 +1102,14 @@ MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) : { } -// ------------------------------------------------------------------------ + void MetaPolyPolygonAction::Execute( OutputDevice* pOut ) { pOut->DrawPolyPolygon( maPolyPoly ); } -// ------------------------------------------------------------------------ + MetaAction* MetaPolyPolygonAction::Clone() { @@ -1118,14 +1118,14 @@ MetaAction* MetaPolyPolygonAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaPolyPolygonAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY ) { @@ -1133,14 +1133,14 @@ void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPolyPoly.IsEqual(((MetaPolyPolygonAction&)rMetaAction).maPolyPoly ); } -// ------------------------------------------------------------------------ + void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1174,7 +1174,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -1199,7 +1199,7 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Text, META_TEXT_ACTION ) -// ------------------------------------------------------------------------ + MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) : @@ -1211,14 +1211,14 @@ MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr, { } -// ------------------------------------------------------------------------ + void MetaTextAction::Execute( OutputDevice* pOut ) { pOut->DrawText( maPt, maStr, mnIndex, mnLen ); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextAction::Clone() { @@ -1227,21 +1227,21 @@ MetaAction* MetaTextAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaTextAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaTextAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const { @@ -1251,7 +1251,7 @@ bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const ( mnLen == ((MetaTextAction&)rMetaAction).mnLen ); } -// ------------------------------------------------------------------------ + void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1264,7 +1264,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } -// ------------------------------------------------------------------------ + void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { @@ -1288,7 +1288,7 @@ MetaTextArrayAction::MetaTextArrayAction() : { } -// ------------------------------------------------------------------------ + MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : MetaAction ( META_TEXTARRAY_ACTION ), @@ -1308,7 +1308,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) : mpDXAry = NULL; } -// ------------------------------------------------------------------------ + MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, const OUString& rStr, @@ -1332,21 +1332,21 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt, mpDXAry = NULL; } -// ------------------------------------------------------------------------ + MetaTextArrayAction::~MetaTextArrayAction() { delete[] mpDXAry; } -// ------------------------------------------------------------------------ + void MetaTextArrayAction::Execute( OutputDevice* pOut ) { pOut->DrawTextArray( maStartPt, maStr, mpDXAry, mnIndex, mnLen ); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextArrayAction::Clone() { @@ -1355,14 +1355,14 @@ MetaAction* MetaTextArrayAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaTextArrayAction::Move( long nHorzMove, long nVertMove ) { maStartPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) { @@ -1375,7 +1375,7 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) } } -// ------------------------------------------------------------------------ + bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const { @@ -1386,7 +1386,7 @@ bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const ( memcmp( mpDXAry, ((MetaTextArrayAction&)rMetaAction).mpDXAry, mnLen ) == 0 ); } -// ------------------------------------------------------------------------ + void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1405,7 +1405,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } -// ------------------------------------------------------------------------ + void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { @@ -1469,7 +1469,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) -// ------------------------------------------------------------------------ + MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, const OUString& rStr, @@ -1483,14 +1483,14 @@ MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidt { } -// ------------------------------------------------------------------------ + void MetaStretchTextAction::Execute( OutputDevice* pOut ) { pOut->DrawStretchText( maPt, mnWidth, maStr, mnIndex, mnLen ); } -// ------------------------------------------------------------------------ + MetaAction* MetaStretchTextAction::Clone() { @@ -1499,14 +1499,14 @@ MetaAction* MetaStretchTextAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaStretchTextAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) { @@ -1514,7 +1514,7 @@ void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) mnWidth = (sal_uLong)FRound( mnWidth * fabs(fScaleX) ); } -// ------------------------------------------------------------------------ + bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const { @@ -1525,7 +1525,7 @@ bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const ( mnLen == ((MetaStretchTextAction&)rMetaAction).mnLen ); } -// ------------------------------------------------------------------------ + void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1539,7 +1539,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } -// ------------------------------------------------------------------------ + void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { @@ -1558,7 +1558,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) -// ------------------------------------------------------------------------ + MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle ) : @@ -1569,14 +1569,14 @@ MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect, { } -// ------------------------------------------------------------------------ + void MetaTextRectAction::Execute( OutputDevice* pOut ) { pOut->DrawText( maRect, maStr, mnStyle ); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextRectAction::Clone() { @@ -1585,21 +1585,21 @@ MetaAction* MetaTextRectAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaTextRectAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaTextRectAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const { @@ -1608,7 +1608,7 @@ bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const ( mnStyle == ((MetaTextRectAction&)rMetaAction).mnStyle ); } -// ------------------------------------------------------------------------ + void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1620,7 +1620,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2 } -// ------------------------------------------------------------------------ + void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { @@ -1637,7 +1637,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) IMPL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) -// ------------------------------------------------------------------------ + MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth, FontStrikeout eStrikeout, @@ -1652,14 +1652,14 @@ MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth, { } -// ------------------------------------------------------------------------ + void MetaTextLineAction::Execute( OutputDevice* pOut ) { pOut->DrawTextLine( maPos, mnWidth, meStrikeout, meUnderline, meOverline ); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextLineAction::Clone() { @@ -1668,14 +1668,14 @@ MetaAction* MetaTextLineAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaTextLineAction::Move( long nHorzMove, long nVertMove ) { maPos.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaTextLineAction::Scale( double fScaleX, double fScaleY ) { @@ -1683,7 +1683,7 @@ void MetaTextLineAction::Scale( double fScaleX, double fScaleY ) mnWidth = FRound( mnWidth * fabs(fScaleX) ); } -// ------------------------------------------------------------------------ + bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const { @@ -1694,7 +1694,7 @@ bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const ( meOverline == ((MetaTextLineAction&)rMetaAction).meOverline ); } -// ------------------------------------------------------------------------ + void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1709,7 +1709,7 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( static_cast<sal_uInt32>(meOverline) ); } -// ------------------------------------------------------------------------ + void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -1735,7 +1735,7 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Bmp, META_BMP_ACTION ) -// ------------------------------------------------------------------------ + MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) : MetaAction ( META_BMP_ACTION ), @@ -1744,14 +1744,14 @@ MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) : { } -// ------------------------------------------------------------------------ + void MetaBmpAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maPt, maBmp ); } -// ------------------------------------------------------------------------ + MetaAction* MetaBmpAction::Clone() { @@ -1760,21 +1760,21 @@ MetaAction* MetaBmpAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaBmpAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaBmpAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const { @@ -1782,7 +1782,7 @@ bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const ( maPt == ((MetaBmpAction&)rMetaAction).maPt ); } -// ------------------------------------------------------------------------ + void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1794,7 +1794,7 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -1807,7 +1807,7 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) -// ------------------------------------------------------------------------ + MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ) : @@ -1818,14 +1818,14 @@ MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz, { } -// ------------------------------------------------------------------------ + void MetaBmpScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maPt, maSz, maBmp ); } -// ------------------------------------------------------------------------ + MetaAction* MetaBmpScaleAction::Clone() { @@ -1834,14 +1834,14 @@ MetaAction* MetaBmpScaleAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaBmpScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) { @@ -1851,7 +1851,7 @@ void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -// ------------------------------------------------------------------------ + bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const { @@ -1860,7 +1860,7 @@ bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaBmpScaleAction&)rMetaAction).maSz ); } -// ------------------------------------------------------------------------ + void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1873,7 +1873,7 @@ void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -1887,7 +1887,7 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) -// ------------------------------------------------------------------------ + MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, @@ -1901,14 +1901,14 @@ MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& { } -// ------------------------------------------------------------------------ + void MetaBmpScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmap( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp ); } -// ------------------------------------------------------------------------ + MetaAction* MetaBmpScalePartAction::Clone() { @@ -1917,14 +1917,14 @@ MetaAction* MetaBmpScalePartAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaBmpScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) { @@ -1934,7 +1934,7 @@ void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -// ------------------------------------------------------------------------ + bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const { @@ -1945,7 +1945,7 @@ bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaBmpScalePartAction&)rMetaAction).maSrcSz ); } -// ------------------------------------------------------------------------ + void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -1960,7 +1960,7 @@ void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -1976,7 +1976,7 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( BmpEx, META_BMPEX_ACTION ) -// ------------------------------------------------------------------------ + MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) : MetaAction ( META_BMPEX_ACTION ), @@ -1985,14 +1985,14 @@ MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) : { } -// ------------------------------------------------------------------------ + void MetaBmpExAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maPt, maBmpEx ); } -// ------------------------------------------------------------------------ + MetaAction* MetaBmpExAction::Clone() { @@ -2001,21 +2001,21 @@ MetaAction* MetaBmpExAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaBmpExAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaBmpExAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const { @@ -2023,7 +2023,7 @@ bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const ( maPt == ((MetaBmpExAction&)rMetaAction).maPt ); } -// ------------------------------------------------------------------------ + void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2035,7 +2035,7 @@ void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2048,7 +2048,7 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) -// ------------------------------------------------------------------------ + MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) : @@ -2059,14 +2059,14 @@ MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz, { } -// ------------------------------------------------------------------------ + void MetaBmpExScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maPt, maSz, maBmpEx ); } -// ------------------------------------------------------------------------ + MetaAction* MetaBmpExScaleAction::Clone() { @@ -2075,14 +2075,14 @@ MetaAction* MetaBmpExScaleAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaBmpExScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) { @@ -2092,7 +2092,7 @@ void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -// ------------------------------------------------------------------------ + bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const { @@ -2101,7 +2101,7 @@ bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaBmpExScaleAction&)rMetaAction).maSz ); } -// ------------------------------------------------------------------------ + void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2114,7 +2114,7 @@ void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2128,7 +2128,7 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) -// ------------------------------------------------------------------------ + MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, @@ -2142,14 +2142,14 @@ MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const S { } -// ------------------------------------------------------------------------ + void MetaBmpExScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawBitmapEx( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmpEx ); } -// ------------------------------------------------------------------------ + MetaAction* MetaBmpExScalePartAction::Clone() { @@ -2158,14 +2158,14 @@ MetaAction* MetaBmpExScalePartAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaBmpExScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) { @@ -2175,7 +2175,7 @@ void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -// ------------------------------------------------------------------------ + bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const { @@ -2186,7 +2186,7 @@ bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaBmpExScalePartAction&)rMetaAction).maSrcSz ); } -// ------------------------------------------------------------------------ + void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2201,7 +2201,7 @@ void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData } } -// ------------------------------------------------------------------------ + void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2217,7 +2217,7 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Mask, META_MASK_ACTION ) -// ------------------------------------------------------------------------ + MetaMaskAction::MetaMaskAction( const Point& rPt, const Bitmap& rBmp, @@ -2229,14 +2229,14 @@ MetaMaskAction::MetaMaskAction( const Point& rPt, { } -// ------------------------------------------------------------------------ + void MetaMaskAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maPt, maBmp, maColor ); } -// ------------------------------------------------------------------------ + MetaAction* MetaMaskAction::Clone() { @@ -2245,21 +2245,21 @@ MetaAction* MetaMaskAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaMaskAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaMaskAction::Scale( double fScaleX, double fScaleY ) { ImplScalePoint( maPt, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const { @@ -2268,7 +2268,7 @@ bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const ( maPt == ((MetaMaskAction&)rMetaAction).maPt ); } -// ------------------------------------------------------------------------ + void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2280,7 +2280,7 @@ void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2293,7 +2293,7 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) -// ------------------------------------------------------------------------ + MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp, @@ -2306,14 +2306,14 @@ MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz, { } -// ------------------------------------------------------------------------ + void MetaMaskScaleAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maPt, maSz, maBmp, maColor ); } -// ------------------------------------------------------------------------ + MetaAction* MetaMaskScaleAction::Clone() { @@ -2322,14 +2322,14 @@ MetaAction* MetaMaskScaleAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaMaskScaleAction::Move( long nHorzMove, long nVertMove ) { maPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) { @@ -2339,7 +2339,7 @@ void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -// ------------------------------------------------------------------------ + bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const { @@ -2349,7 +2349,7 @@ bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const ( maSz == ((MetaMaskScaleAction&)rMetaAction).maSz ); } -// ------------------------------------------------------------------------ + void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2362,7 +2362,7 @@ void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2376,7 +2376,7 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) -// ------------------------------------------------------------------------ + MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Size& rDstSz, const Point& rSrcPt, const Size& rSrcSz, @@ -2392,14 +2392,14 @@ MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Siz { } -// ------------------------------------------------------------------------ + void MetaMaskScalePartAction::Execute( OutputDevice* pOut ) { pOut->DrawMask( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp, maColor ); } -// ------------------------------------------------------------------------ + MetaAction* MetaMaskScalePartAction::Clone() { @@ -2408,14 +2408,14 @@ MetaAction* MetaMaskScalePartAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaMaskScalePartAction::Move( long nHorzMove, long nVertMove ) { maDstPt.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) { @@ -2425,7 +2425,7 @@ void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -// ------------------------------------------------------------------------ + bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const { @@ -2437,7 +2437,7 @@ bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const ( maSrcSz == ((MetaMaskScalePartAction&)rMetaAction).maSrcSz ); } -// ------------------------------------------------------------------------ + void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2453,7 +2453,7 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) } } -// ------------------------------------------------------------------------ + void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2470,7 +2470,7 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Gradient, META_GRADIENT_ACTION ) -// ------------------------------------------------------------------------ + MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ) : MetaAction ( META_GRADIENT_ACTION ), @@ -2479,14 +2479,14 @@ MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& { } -// ------------------------------------------------------------------------ + void MetaGradientAction::Execute( OutputDevice* pOut ) { pOut->DrawGradient( maRect, maGradient ); } -// ------------------------------------------------------------------------ + MetaAction* MetaGradientAction::Clone() { @@ -2495,21 +2495,21 @@ MetaAction* MetaGradientAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaGradientAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaGradientAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const { @@ -2517,7 +2517,7 @@ bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const ( maGradient == ((MetaGradientAction&)rMetaAction).maGradient ); } -// ------------------------------------------------------------------------ + void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2526,7 +2526,7 @@ void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteGradient( rOStm, maGradient ); } -// ------------------------------------------------------------------------ + void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2542,7 +2542,7 @@ MetaGradientExAction::MetaGradientExAction() : { } -// ------------------------------------------------------------------------ + MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) : MetaAction ( META_GRADIENTEX_ACTION ), @@ -2551,13 +2551,13 @@ MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const { } -// ------------------------------------------------------------------------ + MetaGradientExAction::~MetaGradientExAction() { } -// ------------------------------------------------------------------------ + void MetaGradientExAction::Execute( OutputDevice* pOut ) { @@ -2568,7 +2568,7 @@ void MetaGradientExAction::Execute( OutputDevice* pOut ) } } -// ------------------------------------------------------------------------ + MetaAction* MetaGradientExAction::Clone() { @@ -2577,14 +2577,14 @@ MetaAction* MetaGradientExAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaGradientExAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaGradientExAction::Scale( double fScaleX, double fScaleY ) { @@ -2592,7 +2592,7 @@ void MetaGradientExAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const { @@ -2600,7 +2600,7 @@ bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const ( maGradient == ((MetaGradientExAction&)rMetaAction).maGradient ); } -// ------------------------------------------------------------------------ + void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2614,7 +2614,7 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteGradient( rOStm, maGradient ); } -// ------------------------------------------------------------------------ + void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2627,7 +2627,7 @@ void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Hatch, META_HATCH_ACTION ) -// ------------------------------------------------------------------------ + MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) : MetaAction ( META_HATCH_ACTION ), @@ -2636,14 +2636,14 @@ MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHa { } -// ------------------------------------------------------------------------ + void MetaHatchAction::Execute( OutputDevice* pOut ) { pOut->DrawHatch( maPolyPoly, maHatch ); } -// ------------------------------------------------------------------------ + MetaAction* MetaHatchAction::Clone() { @@ -2652,14 +2652,14 @@ MetaAction* MetaHatchAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaHatchAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaHatchAction::Scale( double fScaleX, double fScaleY ) { @@ -2667,7 +2667,7 @@ void MetaHatchAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const { @@ -2675,7 +2675,7 @@ bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const ( maHatch == ((MetaHatchAction&)rMetaAction).maHatch ); } -// ------------------------------------------------------------------------ + void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2689,7 +2689,7 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteHatch( rOStm, maHatch ); } -// ------------------------------------------------------------------------ + void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2702,7 +2702,7 @@ void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) -// ------------------------------------------------------------------------ + MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect, const Wallpaper& rPaper ) : @@ -2712,14 +2712,14 @@ MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect, { } -// ------------------------------------------------------------------------ + void MetaWallpaperAction::Execute( OutputDevice* pOut ) { pOut->DrawWallpaper( maRect, maWallpaper ); } -// ------------------------------------------------------------------------ + MetaAction* MetaWallpaperAction::Clone() { @@ -2728,21 +2728,21 @@ MetaAction* MetaWallpaperAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaWallpaperAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaWallpaperAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const { @@ -2750,7 +2750,7 @@ bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const ( maWallpaper == ((MetaWallpaperAction&)rMetaAction).maWallpaper ); } -// ------------------------------------------------------------------------ + void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2758,7 +2758,7 @@ void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteWallpaper( rOStm, maWallpaper ); } -// ------------------------------------------------------------------------ + void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2770,7 +2770,7 @@ void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) -// ------------------------------------------------------------------------ + MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) : MetaAction ( META_CLIPREGION_ACTION ), @@ -2779,7 +2779,7 @@ MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) { } -// ------------------------------------------------------------------------ + void MetaClipRegionAction::Execute( OutputDevice* pOut ) { @@ -2789,7 +2789,7 @@ void MetaClipRegionAction::Execute( OutputDevice* pOut ) pOut->SetClipRegion(); } -// ------------------------------------------------------------------------ + MetaAction* MetaClipRegionAction::Clone() { @@ -2798,21 +2798,21 @@ MetaAction* MetaClipRegionAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRegion.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaClipRegionAction::Scale( double fScaleX, double fScaleY ) { maRegion.Scale( fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const { @@ -2820,7 +2820,7 @@ bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const ( mbClip == ((MetaClipRegionAction&)rMetaAction).mbClip ); } -// ------------------------------------------------------------------------ + void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2829,7 +2829,7 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbClip ); } -// ------------------------------------------------------------------------ + void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2842,7 +2842,7 @@ void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) -// ------------------------------------------------------------------------ + MetaISectRectClipRegionAction::MetaISectRectClipRegionAction( const Rectangle& rRect ) : MetaAction ( META_ISECTRECTCLIPREGION_ACTION ), @@ -2850,14 +2850,14 @@ MetaISectRectClipRegionAction::MetaISectRectClipRegionAction( const Rectangle& r { } -// ------------------------------------------------------------------------ + void MetaISectRectClipRegionAction::Execute( OutputDevice* pOut ) { pOut->IntersectClipRegion( maRect ); } -// ------------------------------------------------------------------------ + MetaAction* MetaISectRectClipRegionAction::Clone() { @@ -2866,28 +2866,28 @@ MetaAction* MetaISectRectClipRegionAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaISectRectClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRect.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaISectRectClipRegionAction::Scale( double fScaleX, double fScaleY ) { ImplScaleRect( maRect, fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaISectRectClipRegionAction&)rMetaAction).maRect; } -// ------------------------------------------------------------------------ + void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2895,7 +2895,7 @@ void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* p WriteRectangle( rOStm, maRect ); } -// ------------------------------------------------------------------------ + void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2907,7 +2907,7 @@ void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) -// ------------------------------------------------------------------------ + MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region& rRegion ) : MetaAction ( META_ISECTREGIONCLIPREGION_ACTION ), @@ -2915,14 +2915,14 @@ MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region& { } -// ------------------------------------------------------------------------ + void MetaISectRegionClipRegionAction::Execute( OutputDevice* pOut ) { pOut->IntersectClipRegion( maRegion ); } -// ------------------------------------------------------------------------ + MetaAction* MetaISectRegionClipRegionAction::Clone() { @@ -2931,28 +2931,28 @@ MetaAction* MetaISectRegionClipRegionAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaISectRegionClipRegionAction::Move( long nHorzMove, long nVertMove ) { maRegion.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaISectRegionClipRegionAction::Scale( double fScaleX, double fScaleY ) { maRegion.Scale( fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRegion == ((MetaISectRegionClipRegionAction&)rMetaAction).maRegion; } -// ------------------------------------------------------------------------ + void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -2960,7 +2960,7 @@ void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* WriteRegion( rOStm, maRegion ); } -// ------------------------------------------------------------------------ + void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -2972,7 +2972,7 @@ void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) -// ------------------------------------------------------------------------ + MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMove ) : MetaAction ( META_MOVECLIPREGION_ACTION ), @@ -2981,14 +2981,14 @@ MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMo { } -// ------------------------------------------------------------------------ + void MetaMoveClipRegionAction::Execute( OutputDevice* pOut ) { pOut->MoveClipRegion( mnHorzMove, mnVertMove ); } -// ------------------------------------------------------------------------ + MetaAction* MetaMoveClipRegionAction::Clone() { @@ -2997,7 +2997,7 @@ MetaAction* MetaMoveClipRegionAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY ) { @@ -3005,7 +3005,7 @@ void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY ) mnVertMove = FRound( mnVertMove * fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const { @@ -3013,7 +3013,7 @@ bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const ( mnVertMove == ((MetaMoveClipRegionAction&)rMetaAction).mnVertMove ); } -// ------------------------------------------------------------------------ + void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3022,7 +3022,7 @@ void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnHorzMove) ).WriteInt32( sal::static_int_cast<sal_Int32>(mnVertMove) ); } -// ------------------------------------------------------------------------ + void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3038,7 +3038,7 @@ void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) -// ------------------------------------------------------------------------ + MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_LINECOLOR_ACTION ), @@ -3047,7 +3047,7 @@ MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : { } -// ------------------------------------------------------------------------ + void MetaLineColorAction::Execute( OutputDevice* pOut ) { @@ -3057,7 +3057,7 @@ void MetaLineColorAction::Execute( OutputDevice* pOut ) pOut->SetLineColor(); } -// ------------------------------------------------------------------------ + MetaAction* MetaLineColorAction::Clone() { @@ -3066,7 +3066,7 @@ MetaAction* MetaLineColorAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const { @@ -3074,7 +3074,7 @@ bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const ( mbSet == ((MetaLineColorAction&)rMetaAction).mbSet ); } -// ------------------------------------------------------------------------ + void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3083,7 +3083,7 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } -// ------------------------------------------------------------------------ + void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3096,7 +3096,7 @@ void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) -// ------------------------------------------------------------------------ + MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_FILLCOLOR_ACTION ), @@ -3105,7 +3105,7 @@ MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : { } -// ------------------------------------------------------------------------ + void MetaFillColorAction::Execute( OutputDevice* pOut ) { @@ -3115,7 +3115,7 @@ void MetaFillColorAction::Execute( OutputDevice* pOut ) pOut->SetFillColor(); } -// ------------------------------------------------------------------------ + MetaAction* MetaFillColorAction::Clone() { @@ -3124,7 +3124,7 @@ MetaAction* MetaFillColorAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const { @@ -3132,7 +3132,7 @@ bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const ( mbSet == ((MetaFillColorAction&)rMetaAction).mbSet ); } -// ------------------------------------------------------------------------ + void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3141,7 +3141,7 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } -// ------------------------------------------------------------------------ + void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3154,7 +3154,7 @@ void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) -// ------------------------------------------------------------------------ + MetaTextColorAction::MetaTextColorAction( const Color& rColor ) : MetaAction ( META_TEXTCOLOR_ACTION ), @@ -3162,14 +3162,14 @@ MetaTextColorAction::MetaTextColorAction( const Color& rColor ) : { } -// ------------------------------------------------------------------------ + void MetaTextColorAction::Execute( OutputDevice* pOut ) { pOut->SetTextColor( maColor ); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextColorAction::Clone() { @@ -3178,14 +3178,14 @@ MetaAction* MetaTextColorAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const { return maColor == ((MetaTextColorAction&)rMetaAction).maColor; } -// ------------------------------------------------------------------------ + void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3193,7 +3193,7 @@ void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maColor.Write( rOStm, true ); } -// ------------------------------------------------------------------------ + void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3205,7 +3205,7 @@ void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) -// ------------------------------------------------------------------------ + MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTFILLCOLOR_ACTION ), @@ -3214,7 +3214,7 @@ MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet { } -// ------------------------------------------------------------------------ + void MetaTextFillColorAction::Execute( OutputDevice* pOut ) { @@ -3224,7 +3224,7 @@ void MetaTextFillColorAction::Execute( OutputDevice* pOut ) pOut->SetTextFillColor(); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextFillColorAction::Clone() { @@ -3233,7 +3233,7 @@ MetaAction* MetaTextFillColorAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const { @@ -3241,7 +3241,7 @@ bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const ( mbSet == ((MetaTextFillColorAction&)rMetaAction).mbSet ); } -// ------------------------------------------------------------------------ + void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3250,7 +3250,7 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } -// ------------------------------------------------------------------------ + void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3263,7 +3263,7 @@ void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) -// ------------------------------------------------------------------------ + MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTLINECOLOR_ACTION ), @@ -3272,7 +3272,7 @@ MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet { } -// ------------------------------------------------------------------------ + void MetaTextLineColorAction::Execute( OutputDevice* pOut ) { @@ -3282,7 +3282,7 @@ void MetaTextLineColorAction::Execute( OutputDevice* pOut ) pOut->SetTextLineColor(); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextLineColorAction::Clone() { @@ -3291,7 +3291,7 @@ MetaAction* MetaTextLineColorAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const { @@ -3299,7 +3299,7 @@ bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const ( mbSet == ((MetaTextLineColorAction&)rMetaAction).mbSet ); } -// ------------------------------------------------------------------------ + void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3308,7 +3308,7 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } -// ------------------------------------------------------------------------ + void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3321,7 +3321,7 @@ void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) -// ------------------------------------------------------------------------ + MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_OVERLINECOLOR_ACTION ), @@ -3330,7 +3330,7 @@ MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet { } -// ------------------------------------------------------------------------ + void MetaOverlineColorAction::Execute( OutputDevice* pOut ) { @@ -3340,7 +3340,7 @@ void MetaOverlineColorAction::Execute( OutputDevice* pOut ) pOut->SetOverlineColor(); } -// ------------------------------------------------------------------------ + MetaAction* MetaOverlineColorAction::Clone() { @@ -3349,7 +3349,7 @@ MetaAction* MetaOverlineColorAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const { @@ -3357,7 +3357,7 @@ bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const ( mbSet == ((MetaOverlineColorAction&)rMetaAction).mbSet ); } -// ------------------------------------------------------------------------ + void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3366,7 +3366,7 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } -// ------------------------------------------------------------------------ + void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3379,7 +3379,7 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) -// ------------------------------------------------------------------------ + MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) : MetaAction ( META_TEXTALIGN_ACTION ), @@ -3387,14 +3387,14 @@ MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) : { } -// ------------------------------------------------------------------------ + void MetaTextAlignAction::Execute( OutputDevice* pOut ) { pOut->SetTextAlign( maAlign ); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextAlignAction::Clone() { @@ -3403,14 +3403,14 @@ MetaAction* MetaTextAlignAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const { return maAlign == ((MetaTextAlignAction&)rMetaAction).maAlign; } -// ------------------------------------------------------------------------ + void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3418,7 +3418,7 @@ void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt16( (sal_uInt16) maAlign ); } -// ------------------------------------------------------------------------ + void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3432,7 +3432,7 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( MapMode, META_MAPMODE_ACTION ) -// ------------------------------------------------------------------------ + MetaMapModeAction::MetaMapModeAction( const MapMode& rMapMode ) : MetaAction ( META_MAPMODE_ACTION ), @@ -3440,14 +3440,14 @@ MetaMapModeAction::MetaMapModeAction( const MapMode& rMapMode ) : { } -// ------------------------------------------------------------------------ + void MetaMapModeAction::Execute( OutputDevice* pOut ) { pOut->SetMapMode( maMapMode ); } -// ------------------------------------------------------------------------ + MetaAction* MetaMapModeAction::Clone() { @@ -3456,7 +3456,7 @@ MetaAction* MetaMapModeAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) { @@ -3466,14 +3466,14 @@ void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) maMapMode.SetOrigin( aPoint ); } -// ------------------------------------------------------------------------ + bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const { return maMapMode == ((MetaMapModeAction&)rMetaAction).maMapMode; } -// ------------------------------------------------------------------------ + void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3481,7 +3481,7 @@ void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WriteMapMode( rOStm, maMapMode ); } -// ------------------------------------------------------------------------ + void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3493,7 +3493,7 @@ void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Font, META_FONT_ACTION ) -// ------------------------------------------------------------------------ + MetaFontAction::MetaFontAction( const Font& rFont ) : MetaAction ( META_FONT_ACTION ), @@ -3510,14 +3510,14 @@ MetaFontAction::MetaFontAction( const Font& rFont ) : } } -// ------------------------------------------------------------------------ + void MetaFontAction::Execute( OutputDevice* pOut ) { pOut->SetFont( maFont ); } -// ------------------------------------------------------------------------ + MetaAction* MetaFontAction::Clone() { @@ -3526,7 +3526,7 @@ MetaAction* MetaFontAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaFontAction::Scale( double fScaleX, double fScaleY ) { @@ -3536,14 +3536,14 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY ) maFont.SetSize( aSize ); } -// ------------------------------------------------------------------------ + bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const { return maFont == ((MetaFontAction&)rMetaAction).maFont; } -// ------------------------------------------------------------------------ + void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3554,7 +3554,7 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } -// ------------------------------------------------------------------------ + void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { @@ -3569,7 +3569,7 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) IMPL_META_ACTION( Push, META_PUSH_ACTION ) -// ------------------------------------------------------------------------ + MetaPushAction::MetaPushAction( sal_uInt16 nFlags ) : MetaAction ( META_PUSH_ACTION ), @@ -3577,14 +3577,14 @@ MetaPushAction::MetaPushAction( sal_uInt16 nFlags ) : { } -// ------------------------------------------------------------------------ + void MetaPushAction::Execute( OutputDevice* pOut ) { pOut->Push( mnFlags ); } -// ------------------------------------------------------------------------ + MetaAction* MetaPushAction::Clone() { @@ -3593,14 +3593,14 @@ MetaAction* MetaPushAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const { return mnFlags == ((MetaPushAction&)rMetaAction).mnFlags; } -// ------------------------------------------------------------------------ + void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3608,7 +3608,7 @@ void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt16( mnFlags ); } -// ------------------------------------------------------------------------ + void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3620,14 +3620,14 @@ void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Pop, META_POP_ACTION ) -// ------------------------------------------------------------------------ + void MetaPopAction::Execute( OutputDevice* pOut ) { pOut->Pop(); } -// ------------------------------------------------------------------------ + MetaAction* MetaPopAction::Clone() { @@ -3636,14 +3636,14 @@ MetaAction* MetaPopAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaPopAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); } -// ------------------------------------------------------------------------ + void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3654,7 +3654,7 @@ void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) -// ------------------------------------------------------------------------ + MetaRasterOpAction::MetaRasterOpAction( RasterOp eRasterOp ) : MetaAction ( META_RASTEROP_ACTION ), @@ -3662,14 +3662,14 @@ MetaRasterOpAction::MetaRasterOpAction( RasterOp eRasterOp ) : { } -// ------------------------------------------------------------------------ + void MetaRasterOpAction::Execute( OutputDevice* pOut ) { pOut->SetRasterOp( meRasterOp ); } -// ------------------------------------------------------------------------ + MetaAction* MetaRasterOpAction::Clone() { @@ -3678,14 +3678,14 @@ MetaAction* MetaRasterOpAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const { return meRasterOp == ((MetaRasterOpAction&)rMetaAction).meRasterOp; } -// ------------------------------------------------------------------------ + void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3693,7 +3693,7 @@ void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt16( (sal_uInt16) meRasterOp ); } -// ------------------------------------------------------------------------ + void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3707,7 +3707,7 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) -// ------------------------------------------------------------------------ + MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) : MetaAction ( META_TRANSPARENT_ACTION ), @@ -3716,14 +3716,14 @@ MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_ { } -// ------------------------------------------------------------------------ + void MetaTransparentAction::Execute( OutputDevice* pOut ) { pOut->DrawTransparent( maPolyPoly, mnTransPercent ); } -// ------------------------------------------------------------------------ + MetaAction* MetaTransparentAction::Clone() { @@ -3732,14 +3732,14 @@ MetaAction* MetaTransparentAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaTransparentAction::Move( long nHorzMove, long nVertMove ) { maPolyPoly.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaTransparentAction::Scale( double fScaleX, double fScaleY ) { @@ -3747,7 +3747,7 @@ void MetaTransparentAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -// ------------------------------------------------------------------------ + bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const { @@ -3755,7 +3755,7 @@ bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const ( mnTransPercent == ((MetaTransparentAction&)rMetaAction).mnTransPercent ); } -// ------------------------------------------------------------------------ + void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3777,7 +3777,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt16( mnTransPercent ); } -// ------------------------------------------------------------------------ + void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3790,7 +3790,7 @@ void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) -// ------------------------------------------------------------------------ + MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ) : @@ -3802,14 +3802,14 @@ MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, { } -// ------------------------------------------------------------------------ + void MetaFloatTransparentAction::Execute( OutputDevice* pOut ) { pOut->DrawTransparent( maMtf, maPoint, maSize, maGradient ); } -// ------------------------------------------------------------------------ + MetaAction* MetaFloatTransparentAction::Clone() { @@ -3818,14 +3818,14 @@ MetaAction* MetaFloatTransparentAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaFloatTransparentAction::Move( long nHorzMove, long nVertMove ) { maPoint.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) { @@ -3835,7 +3835,7 @@ void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } -// ------------------------------------------------------------------------ + bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const { @@ -3845,7 +3845,7 @@ bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const ( maGradient == ((MetaFloatTransparentAction&)rMetaAction).maGradient ); } -// ------------------------------------------------------------------------ + void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3857,7 +3857,7 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat WriteGradient( rOStm, maGradient ); } -// ------------------------------------------------------------------------ + void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3872,7 +3872,7 @@ void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( EPS, META_EPS_ACTION ) -// ------------------------------------------------------------------------ + MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ) : @@ -3884,14 +3884,14 @@ MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize, { } -// ------------------------------------------------------------------------ + void MetaEPSAction::Execute( OutputDevice* pOut ) { pOut->DrawEPS( maPoint, maSize, maGfxLink, &maSubst ); } -// ------------------------------------------------------------------------ + MetaAction* MetaEPSAction::Clone() { @@ -3900,14 +3900,14 @@ MetaAction* MetaEPSAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + void MetaEPSAction::Move( long nHorzMove, long nVertMove ) { maPoint.Move( nHorzMove, nVertMove ); } -// ------------------------------------------------------------------------ + void MetaEPSAction::Scale( double fScaleX, double fScaleY ) { @@ -3917,7 +3917,7 @@ void MetaEPSAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } -// ------------------------------------------------------------------------ + bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const { @@ -3927,7 +3927,7 @@ bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const ( maSize == ((MetaEPSAction&)rMetaAction).maSize ); } -// ------------------------------------------------------------------------ + void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3938,7 +3938,7 @@ void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maSubst.Write( rOStm ); } -// ------------------------------------------------------------------------ + void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -3953,7 +3953,7 @@ void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) -// ------------------------------------------------------------------------ + MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : MetaAction ( META_REFPOINT_ACTION ), @@ -3962,7 +3962,7 @@ MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : { } -// ------------------------------------------------------------------------ + void MetaRefPointAction::Execute( OutputDevice* pOut ) { @@ -3972,7 +3972,7 @@ void MetaRefPointAction::Execute( OutputDevice* pOut ) pOut->SetRefPoint(); } -// ------------------------------------------------------------------------ + MetaAction* MetaRefPointAction::Clone() { @@ -3981,7 +3981,7 @@ MetaAction* MetaRefPointAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const { @@ -3989,7 +3989,7 @@ bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const ( mbSet == ((MetaRefPointAction&)rMetaAction).mbSet ); } -// ------------------------------------------------------------------------ + void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -3998,7 +3998,7 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUChar( mbSet ); } -// ------------------------------------------------------------------------ + void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -4015,7 +4015,7 @@ MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : ImplInitDynamicData( NULL, 0UL ); } -// ------------------------------------------------------------------------ + MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : MetaAction ( META_COMMENT_ACTION ), @@ -4025,7 +4025,7 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) : ImplInitDynamicData( rAct.mpData, rAct.mnDataSize ); } -// ------------------------------------------------------------------------ + MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) : MetaAction ( META_COMMENT_ACTION ), @@ -4035,7 +4035,7 @@ MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, ImplInitDynamicData( pData, nDataSize ); } -// ------------------------------------------------------------------------ + MetaCommentAction::~MetaCommentAction() { @@ -4043,7 +4043,7 @@ MetaCommentAction::~MetaCommentAction() delete[] mpData; } -// ------------------------------------------------------------------------ + void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ) { @@ -4059,7 +4059,7 @@ void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 } } -// ------------------------------------------------------------------------ + void MetaCommentAction::Execute( OutputDevice* pOut ) { @@ -4070,7 +4070,7 @@ void MetaCommentAction::Execute( OutputDevice* pOut ) } } -// ------------------------------------------------------------------------ + MetaAction* MetaCommentAction::Clone() { @@ -4131,7 +4131,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) } } -// ------------------------------------------------------------------------ + // SJ: 25.07.06 #i56656# we are not able to mirrorcertain kind of // comments properly, especially the XPATHSTROKE and XPATHFILL lead to // problems, so it is better to remove these comments when mirroring @@ -4197,7 +4197,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) } } -// ------------------------------------------------------------------------ + bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const { @@ -4207,7 +4207,7 @@ bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const ( memcmp( mpData, ((MetaCommentAction&)rMetaAction).mpData, mnDataSize ) == 0 ); } -// ------------------------------------------------------------------------ + void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -4219,7 +4219,7 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.Write( mpData, mnDataSize ); } -// ------------------------------------------------------------------------ + void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -4244,7 +4244,7 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) -// ------------------------------------------------------------------------ + MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) : MetaAction ( META_LAYOUTMODE_ACTION ), @@ -4252,14 +4252,14 @@ MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) : { } -// ------------------------------------------------------------------------ + void MetaLayoutModeAction::Execute( OutputDevice* pOut ) { pOut->SetLayoutMode( mnLayoutMode ); } -// ------------------------------------------------------------------------ + MetaAction* MetaLayoutModeAction::Clone() { @@ -4268,14 +4268,14 @@ MetaAction* MetaLayoutModeAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const { return mnLayoutMode == ((MetaLayoutModeAction&)rMetaAction).mnLayoutMode; } -// ------------------------------------------------------------------------ + void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -4283,7 +4283,7 @@ void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt32( mnLayoutMode ); } -// ------------------------------------------------------------------------ + void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { @@ -4295,7 +4295,7 @@ void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) IMPL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) -// ------------------------------------------------------------------------ + MetaTextLanguageAction::MetaTextLanguageAction( LanguageType eTextLanguage ) : MetaAction ( META_TEXTLANGUAGE_ACTION ), @@ -4303,14 +4303,14 @@ MetaTextLanguageAction::MetaTextLanguageAction( LanguageType eTextLanguage ) : { } -// ------------------------------------------------------------------------ + void MetaTextLanguageAction::Execute( OutputDevice* pOut ) { pOut->SetDigitLanguage( meTextLanguage ); } -// ------------------------------------------------------------------------ + MetaAction* MetaTextLanguageAction::Clone() { @@ -4319,14 +4319,14 @@ MetaAction* MetaTextLanguageAction::Clone() return pClone; } -// ------------------------------------------------------------------------ + bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const { return meTextLanguage == ((MetaTextLanguageAction&)rMetaAction).meTextLanguage; } -// ------------------------------------------------------------------------ + void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { @@ -4334,7 +4334,7 @@ void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm.WriteUInt16( meTextLanguage ); } -// ------------------------------------------------------------------------ + void MetaTextLanguageAction::Read( SvStream& rIStm, ImplMetaReadData* ) { diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 0a6a8c1ddc13..4e7222cdb2f5 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -25,15 +25,15 @@ #include "octree.hxx" -// --------- + // - pMask - -// --------- + static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; -// ------------- + // - NodeCache - -// ------------- + ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : pActNode( NULL ) @@ -49,7 +49,7 @@ ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) : } } -// ------------------------------------------------------------------------ + ImpNodeCache::~ImpNodeCache() { @@ -62,9 +62,9 @@ ImpNodeCache::~ImpNodeCache() } } -// ---------- + // - Octree - -// ---------- + Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : nMax ( nColors ), @@ -77,7 +77,7 @@ Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) : ImplCreateOctree(); } -// ------------------------------------------------------------------------ + Octree::~Octree() { @@ -85,7 +85,7 @@ Octree::~Octree() delete pNodeCache; } -// ------------------------------------------------------------------------ + void Octree::ImplCreateOctree() { @@ -131,7 +131,7 @@ void Octree::ImplCreateOctree() } } -// ------------------------------------------------------------------------ + void Octree::ImplDeleteOctree( PPNODE ppNode ) { @@ -145,7 +145,7 @@ void Octree::ImplDeleteOctree( PPNODE ppNode ) *ppNode = NULL; } -// ------------------------------------------------------------------------ + void Octree::ImplAdd( PPNODE ppNode ) { @@ -184,7 +184,7 @@ void Octree::ImplAdd( PPNODE ppNode ) } } -// ------------------------------------------------------------------------ + void Octree::ImplReduce() { @@ -224,7 +224,7 @@ void Octree::ImplReduce() nLeafCount -= --nChildren; } -// ------------------------------------------------------------------------ + void Octree::CreatePalette( PNODE pNode ) { @@ -241,7 +241,7 @@ void Octree::CreatePalette( PNODE pNode ) } -// ------------------------------------------------------------------------ + void Octree::GetPalIndex( PNODE pNode ) { @@ -259,9 +259,9 @@ void Octree::GetPalIndex( PNODE pNode ) } } -// ------------------- + // - InverseColorMap - -// ------------------- + InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : nBits( 8 - OCTREE_BITS ) @@ -315,7 +315,7 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : } } -// ------------------------------------------------------------------------ + InverseColorMap::~InverseColorMap() { @@ -323,7 +323,7 @@ InverseColorMap::~InverseColorMap() rtl_freeMemory( pMap ); } -// ------------------------------------------------------------------------ + void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax ) { diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index 111fdf652a8a..a5e2c57e6f0d 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -660,7 +660,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, } } -// ------------------------------------------------------------------ + void OutputDevice::DrawTransformedBitmapEx( const basegfx::B2DHomMatrix& rTransformation, diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index 4c522a94f76a..830a1ee3748e 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -92,7 +92,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect, mpAlphaVDev->DrawRect( rRect, nHorzRound, nVertRound ); } -// ----------------------------------------------------------------------- + void OutputDevice::DrawEllipse( const Rectangle& rRect ) { @@ -140,7 +140,7 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect ) mpAlphaVDev->DrawEllipse( rRect ); } -// ----------------------------------------------------------------------- + void OutputDevice::DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) @@ -185,7 +185,7 @@ void OutputDevice::DrawArc( const Rectangle& rRect, mpAlphaVDev->DrawArc( rRect, rStartPt, rEndPt ); } -// ----------------------------------------------------------------------- + void OutputDevice::DrawPie( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) @@ -237,7 +237,7 @@ void OutputDevice::DrawPie( const Rectangle& rRect, mpAlphaVDev->DrawPie( rRect, rStartPt, rEndPt ); } -// ----------------------------------------------------------------------- + void OutputDevice::DrawChord( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ) diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 9d785e2610f9..e61e6bf58f12 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -175,7 +175,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon mpAlphaVDev->DrawGrid( rRect, rDist, nFlags ); } -// ------------------------------------------------------------------------ + // Caution: This method is nearly the same as // void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly ) // so when changes are made here do not forget to make change sthere, too @@ -240,7 +240,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, DrawTransparent(toPolyPolygon(rB2DPolyPoly), static_cast<sal_uInt16>(fTransparency * 100.0)); } -// ------------------------------------------------------------------------ + void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ) @@ -635,7 +635,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, } } -// ----------------------------------------------------------------------- + void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient ) @@ -796,7 +796,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, } } -// ----------------------------------------------------------------------- + void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, @@ -815,7 +815,7 @@ void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, EnableMapMode( bMap ); } -// ----------------------------------------------------------------------- + void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, @@ -1058,7 +1058,7 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, mpMetaFile = pOldMetaFile; } -// ----------------------------------------------------------------------- + void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, @@ -1103,7 +1103,7 @@ void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, mpMetaFile = pOldMetaFile; } -// ----------------------------------------------------------------------- + void OutputDevice::ImplDrawWallpaper( long nX, long nY, long nWidth, long nHeight, @@ -1117,7 +1117,7 @@ void OutputDevice::ImplDrawWallpaper( long nX, long nY, ImplDrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper ); } -// ----------------------------------------------------------------------- + void OutputDevice::DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ) @@ -1144,7 +1144,7 @@ void OutputDevice::DrawWallpaper( const Rectangle& rRect, mpAlphaVDev->DrawWallpaper( rRect, rWallpaper ); } -// ----------------------------------------------------------------------- + void OutputDevice::Erase() { @@ -1184,7 +1184,7 @@ void OutputDevice::Erase() mpAlphaVDev->Erase(); } -// ----------------------------------------------------------------------- + bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, GDIMetaFile* pSubst ) @@ -1242,7 +1242,7 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize, return bDrawn; } -// ----------------------------------------------------------------------- + void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt32 nLen, Color aStart, Color aEnd) { diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index 9e310c7ab9ac..33296903fbb2 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -25,7 +25,7 @@ #include "salgdi.hxx" -// ----------------------------------------------------------------------- + static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice ) { @@ -140,12 +140,12 @@ PushButtonValue* PushButtonValue::clone() const return new PushButtonValue( *this ); } -// ----------------------------------------------------------------------- + // These functions are mainly passthrough functions that allow access to // the SalFrame behind a Window object for native widget rendering purposes. -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const { @@ -160,7 +160,7 @@ bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPar } -// ----------------------------------------------------------------------- + bool OutputDevice::HitTestNativeControl( ControlType nType, ControlPart nPart, @@ -183,7 +183,7 @@ bool OutputDevice::HitTestNativeControl( ControlType nType, rIsInside, this ) ); } -// ----------------------------------------------------------------------- + static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const ImplControlValue& rVal, const OutputDevice& rDev ) { @@ -303,7 +303,7 @@ bool OutputDevice::DrawNativeControl( ControlType nType, return bRet; } -// ----------------------------------------------------------------------- + bool OutputDevice::GetNativeControlRegion( ControlType nType, ControlPart nPart, diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 2a805f6d5a67..5d632fcd02ba 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star::beans; static bool lcl_canUsePDFAxialShading(const Gradient& rGradient); -// ----------------------------------------------------------------------------- + void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) @@ -64,7 +64,7 @@ void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gra m_rOuterFace.Pop(); } -// ----------------------------------------------------------------------------- + void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSize, const BitmapEx& i_rBitmapEx, VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext ) @@ -243,7 +243,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz } -// ----------------------------------------------------------------------------- + void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevData* i_pOutDevData, const vcl::PDFWriter::PlayMetafileContext& i_rContext, VirtualDevice* pDummyVDev ) { diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index 699ef39df805..f7e0820f9c17 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -42,7 +42,7 @@ // converted to rectangles and the points in the list are deleted. // // -// ----------------------------------------------------------------------- + ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) { @@ -58,7 +58,7 @@ ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) mbTouched = false; } -// ----------------------------------------------------------------------- + ImplRegionBand::ImplRegionBand( const ImplRegionBand& rRegionBand, @@ -120,7 +120,7 @@ ImplRegionBand::ImplRegionBand( } } -// ----------------------------------------------------------------------- + ImplRegionBand::~ImplRegionBand() { @@ -145,7 +145,7 @@ ImplRegionBand::~ImplRegionBand() } } -// ----------------------------------------------------------------------- + // // generate separations from lines and process union with existing // separations @@ -198,7 +198,7 @@ void ImplRegionBand::ProcessPoints() mpFirstBandPoint = NULL; } -// ----------------------------------------------------------------------- + // // generate separations from lines and process union with existing // separations @@ -311,7 +311,7 @@ bool ImplRegionBand::InsertPoint( long nX, long nLineId, return true; } -// ----------------------------------------------------------------------- + void ImplRegionBand::MoveX( long nHorzMove ) { @@ -325,7 +325,7 @@ void ImplRegionBand::MoveX( long nHorzMove ) } } -// ----------------------------------------------------------------------- + void ImplRegionBand::ScaleX( double fHorzScale ) { @@ -338,7 +338,7 @@ void ImplRegionBand::ScaleX( double fHorzScale ) } } -// ----------------------------------------------------------------------- + // // combine overlaping sparations @@ -383,7 +383,7 @@ bool ImplRegionBand::OptimizeBand() return true; } -// ----------------------------------------------------------------------- + void ImplRegionBand::Union( long nXLeft, long nXRight ) { @@ -457,7 +457,7 @@ void ImplRegionBand::Union( long nXLeft, long nXRight ) OptimizeBand(); } -// ----------------------------------------------------------------------- + void ImplRegionBand::Intersect( long nXLeft, long nXRight ) { @@ -504,7 +504,7 @@ void ImplRegionBand::Intersect( long nXLeft, long nXRight ) OptimizeBand(); } -// ----------------------------------------------------------------------- + void ImplRegionBand::Exclude( long nXLeft, long nXRight ) { @@ -584,7 +584,7 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight ) OptimizeBand(); } -// ----------------------------------------------------------------------- + void ImplRegionBand::XOr( long nXLeft, long nXRight ) { @@ -831,7 +831,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) OptimizeBand(); } -// ----------------------------------------------------------------------- + bool ImplRegionBand::IsInside( long nX ) { @@ -847,7 +847,7 @@ bool ImplRegionBand::IsInside( long nX ) return false; } -// ----------------------------------------------------------------------- + bool ImplRegionBand::IsOver( long nLeft, long nRight ) { @@ -863,7 +863,7 @@ bool ImplRegionBand::IsOver( long nLeft, long nRight ) return false; } -// ----------------------------------------------------------------------- + bool ImplRegionBand::IsInside( long nLeft, long nRight ) { @@ -879,7 +879,7 @@ bool ImplRegionBand::IsInside( long nLeft, long nRight ) return false; } -// ----------------------------------------------------------------------- + long ImplRegionBand::GetXLeftBoundary() const { @@ -888,7 +888,7 @@ long ImplRegionBand::GetXLeftBoundary() const return mpFirstSep->mnXLeft; } -// ----------------------------------------------------------------------- + long ImplRegionBand::GetXRightBoundary() const { @@ -901,7 +901,7 @@ long ImplRegionBand::GetXRightBoundary() const return pSep->mnXRight; } -// ----------------------------------------------------------------------- + bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const { @@ -934,7 +934,7 @@ bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const return true; } -// ----------------------------------------------------------------------- + ImplRegionBand* ImplRegionBand::SplitBand (const sal_Int32 nY) { diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 6e3f7fe06d3d..8c536275a5ed 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1419,7 +1419,7 @@ bool Region::IsInside( const Rectangle& rRect ) const return aRegion.IsEmpty(); } -// ----------------------------------------------------------------------- + bool Region::IsOver( const Rectangle& rRect ) const { diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 90e6d2996c85..c2bb8b7422b7 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -215,14 +215,14 @@ int GetVerticalFlags( sal_UCS4 nChar ) return GF_NONE; // not rotated as default } -// ----------------------------------------------------------------------- + sal_UCS4 GetVerticalChar( sal_UCS4 ) { return 0; // #i14788# input method is responsible vertical char changes } -// ----------------------------------------------------------------------- + VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 nChar ) { @@ -230,7 +230,7 @@ VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 nChar ) return nChar; } -// ----------------------------------------------------------------------- + VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) { @@ -324,7 +324,7 @@ VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang ) return nChar; } -// ----------------------------------------------------------------------- + inline bool IsControlChar( sal_UCS4 cChar ) { @@ -376,7 +376,7 @@ bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) return true; } -// ----------------------------------------------------------------------- + bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) { @@ -397,7 +397,7 @@ bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) return true; } -// ----------------------------------------------------------------------- + bool ImplLayoutRuns::PosIsInRun( int nCharPos ) const { @@ -441,7 +441,7 @@ bool ImplLayoutRuns::PosIsInAnyRun( int nCharPos ) const } -// ----------------------------------------------------------------------- + bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft ) { @@ -487,7 +487,7 @@ bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft ) return true; } -// ----------------------------------------------------------------------- + bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLeft ) const { @@ -583,7 +583,7 @@ ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, maRuns.ResetPos(); } -// ----------------------------------------------------------------------- + // add a run after splitting it up to get rid of control chars void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) @@ -616,7 +616,7 @@ void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL ) maRuns.AddRun( nCharPos0, nCharPos1, bRTL ); } -// ----------------------------------------------------------------------- + bool ImplLayoutArgs::PrepareFallback() { @@ -665,7 +665,7 @@ bool ImplLayoutArgs::PrepareFallback() return true; } -// ----------------------------------------------------------------------- + bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) { @@ -686,12 +686,12 @@ SalLayout::SalLayout() maDrawOffset( 0, 0 ) {} -// ----------------------------------------------------------------------- + SalLayout::~SalLayout() {} -// ----------------------------------------------------------------------- + void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { @@ -701,7 +701,7 @@ void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mnOrientation = rArgs.mnOrientation; } -// ----------------------------------------------------------------------- + void SalLayout::Release() const { @@ -712,7 +712,7 @@ void SalLayout::Release() const delete const_cast<SalLayout*>(this); } -// ----------------------------------------------------------------------- + Point SalLayout::GetDrawPosition( const Point& rRelative ) const { @@ -744,7 +744,7 @@ Point SalLayout::GetDrawPosition( const Point& rRelative ) const return aPos; } -// ----------------------------------------------------------------------- + // returns asian kerning values in quarter of character width units // to enable automatic halfwidth substitution for fullwidth punctuation @@ -787,7 +787,7 @@ int SalLayout::CalcAsianKerning( sal_UCS4 c, bool bLeft, bool /*TODO:? bVertical return nResult; } -// ----------------------------------------------------------------------- + bool SalLayout::GetOutline( SalGraphics& rSalGraphics, ::basegfx::B2DPolyPolygonVector& rVector ) const @@ -823,7 +823,7 @@ bool SalLayout::GetOutline( SalGraphics& rSalGraphics, return (bAllOk && bOneOk); } -// ----------------------------------------------------------------------- + bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) const { @@ -854,7 +854,7 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) cons return bRet; } -// ----------------------------------------------------------------------- + bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const { @@ -877,19 +877,19 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const GenericSalLayout::GenericSalLayout() {} -// ----------------------------------------------------------------------- + GenericSalLayout::~GenericSalLayout() {} -// ----------------------------------------------------------------------- + void GenericSalLayout::AppendGlyph( const GlyphItem& rGlyphItem ) { m_GlyphItems.push_back(rGlyphItem); } -// ----------------------------------------------------------------------- + bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const { @@ -965,7 +965,7 @@ bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const return true; } -// ----------------------------------------------------------------------- + long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const { @@ -977,7 +977,7 @@ long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const return nWidth; } -// ----------------------------------------------------------------------- + // the text width is the maximum logical extent of all glyphs long GenericSalLayout::GetTextWidth() const @@ -1004,7 +1004,7 @@ long GenericSalLayout::GetTextWidth() const return nWidth; } -// ----------------------------------------------------------------------- + void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { @@ -1016,7 +1016,7 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) Justify( rArgs.mnLayoutWidth ); } -// ----------------------------------------------------------------------- + // This DXArray thing is one of the stupidest ideas I have ever seen (I've been // told that it probably a one-to-one mapping of some Windows 3.1 API, which is @@ -1144,7 +1144,7 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs ) } } -// ----------------------------------------------------------------------- + void GenericSalLayout::Justify( long nNewWidth ) { @@ -1222,7 +1222,7 @@ void GenericSalLayout::Justify( long nNewWidth ) } } -// ----------------------------------------------------------------------- + void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength ) { @@ -1264,7 +1264,7 @@ void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength ) } } -// ----------------------------------------------------------------------- + void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth ) { @@ -1317,7 +1317,7 @@ void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth ) } } -// ----------------------------------------------------------------------- + void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { @@ -1349,7 +1349,7 @@ void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray } } -// ----------------------------------------------------------------------- + sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { @@ -1370,7 +1370,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int n return -1; } -// ----------------------------------------------------------------------- + int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry, @@ -1458,7 +1458,7 @@ int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos return nCount; } -// ----------------------------------------------------------------------- + void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos ) { @@ -1485,7 +1485,7 @@ void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos ) } } -// ----------------------------------------------------------------------- + void GenericSalLayout::DropGlyph( int nStart ) { @@ -1498,7 +1498,7 @@ void GenericSalLayout::DropGlyph( int nStart ) pG->mnCharPos = -1; } -// ----------------------------------------------------------------------- + void GenericSalLayout::Simplify( bool bIsBase ) { @@ -1520,7 +1520,7 @@ void GenericSalLayout::Simplify( bool bIsBase ) m_GlyphItems.erase(m_GlyphItems.begin() + j, m_GlyphItems.end()); } -// ----------------------------------------------------------------------- + // make sure GlyphItems are sorted left to right void GenericSalLayout::SortGlyphItems() @@ -1576,7 +1576,7 @@ void MultiSalLayout::SetInComplete(bool bInComplete) maFallbackRuns[mnLevel-1] = ImplLayoutRuns(); } -// ----------------------------------------------------------------------- + MultiSalLayout::~MultiSalLayout() { @@ -1584,7 +1584,7 @@ MultiSalLayout::~MultiSalLayout() mpLayouts[ i ]->Release(); } -// ----------------------------------------------------------------------- + bool MultiSalLayout::AddFallback( SalLayout& rFallback, ImplLayoutRuns& rFallbackRuns, const PhysicalFontFace* pFallbackFont ) @@ -1599,7 +1599,7 @@ bool MultiSalLayout::AddFallback( SalLayout& rFallback, return true; } -// ----------------------------------------------------------------------- + bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs ) { @@ -1610,7 +1610,7 @@ bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs ) return true; } -// ----------------------------------------------------------------------- + void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { @@ -1979,7 +1979,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) mpLayouts[n]->DisableGlyphInjection( false ); } -// ----------------------------------------------------------------------- + void MultiSalLayout::InitFont() const { @@ -1987,7 +1987,7 @@ void MultiSalLayout::InitFont() const mpLayouts[0]->InitFont(); } -// ----------------------------------------------------------------------- + void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const { @@ -2004,7 +2004,7 @@ void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const // NOTE: now the baselevel font is active again } - // ----------------------------------------------------------------------- + sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const { @@ -2043,7 +2043,7 @@ sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFa return -1; } -// ----------------------------------------------------------------------- + long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const { @@ -2091,7 +2091,7 @@ long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const return nMaxWidth; } -// ----------------------------------------------------------------------- + void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const { @@ -2117,7 +2117,7 @@ void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) } } -// ----------------------------------------------------------------------- + int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry, @@ -2167,7 +2167,7 @@ int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& r return 0; } -// ----------------------------------------------------------------------- + bool MultiSalLayout::GetOutline( SalGraphics& rGraphics, ::basegfx::B2DPolyPolygonVector& rPPV ) const diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 2602dbc3d7f8..2d774a58b7f9 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -122,7 +122,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, pSVData->maGDIData.mpFirstVirDev = this; } -// ----------------------------------------------------------------------- + VirtualDevice::VirtualDevice( sal_uInt16 nBitCount ) : mpVirDev( NULL ), @@ -135,7 +135,7 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount ) ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount ); } -// ----------------------------------------------------------------------- + VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount ) : mpVirDev( NULL ), @@ -148,7 +148,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount ImplInitVirDev( &rCompDev, 1, 1, nBitCount ); } -// ----------------------------------------------------------------------- + VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount, sal_uInt16 nAlphaBitCount ) : mpVirDev( NULL ), @@ -165,7 +165,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount mnAlphaDepth = sal::static_int_cast<sal_Int8>(nAlphaBitCount); } -// ----------------------------------------------------------------------- + VirtualDevice::VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCount ) : mpVirDev( NULL ), @@ -176,7 +176,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCo ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount, pData ); } -// ----------------------------------------------------------------------- + VirtualDevice::~VirtualDevice() { @@ -201,7 +201,7 @@ VirtualDevice::~VirtualDevice() pSVData->maGDIData.mpLastVirDev = mpPrev; } -// ----------------------------------------------------------------------- + bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) { @@ -303,7 +303,7 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra return bRet; } -// ----------------------------------------------------------------------- + // #i32109#: Fill opaque areas correctly (without relying on // fill/linecolor state) @@ -319,7 +319,7 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) Pop(); } -// ----------------------------------------------------------------------- + bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) { @@ -373,7 +373,7 @@ bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize return ImplSetOutputSizePixel( rNewSize, true, pBuffer); } -// ----------------------------------------------------------------------- + void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode ) { @@ -455,13 +455,13 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32 mpFontCache = new ImplFontCache(); } -// ----------------------------------------------------------------------- + void VirtualDevice::Compat_ZeroExtleadBug() { meRefDevMode = (sal_uInt8)meRefDevMode | REFDEV_FORCE_ZERO_EXTLEAD; } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 7c08e016b5cb..af7a3a0f20b6 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -28,7 +28,7 @@ #include <vcl/dibtools.hxx> #include <vcl/settings.hxx> -// ----------------------------------------------------------------------- + ImplWallpaper::ImplWallpaper() : maColor( COL_TRANSPARENT ) @@ -41,7 +41,7 @@ ImplWallpaper::ImplWallpaper() : meStyle = WALLPAPER_NULL; } -// ----------------------------------------------------------------------- + ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) : maColor( rImplWallpaper.maColor ) @@ -67,7 +67,7 @@ ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) : mpRect = NULL; } -// ----------------------------------------------------------------------- + ImplWallpaper::~ImplWallpaper() { @@ -77,7 +77,7 @@ ImplWallpaper::~ImplWallpaper() delete mpRect; } -// ----------------------------------------------------------------------- + void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) { @@ -87,7 +87,7 @@ void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp ) *mpCache = rBmp; } -// ----------------------------------------------------------------------- + void ImplWallpaper::ImplReleaseCachedBitmap() { @@ -95,7 +95,7 @@ void ImplWallpaper::ImplReleaseCachedBitmap() mpCache = NULL; } -// ----------------------------------------------------------------------- + SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) { @@ -150,7 +150,7 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) return rIStm; } -// ----------------------------------------------------------------------- + SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper ) { @@ -182,7 +182,7 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap return rOStm; } -// ----------------------------------------------------------------------- + inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) { @@ -198,7 +198,7 @@ inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) mpImplWallpaper->ImplReleaseCachedBitmap(); } -// ----------------------------------------------------------------------- + Wallpaper::Wallpaper() { @@ -209,7 +209,7 @@ Wallpaper::Wallpaper() mpImplWallpaper = &aStaticImplWallpaper; } -// ----------------------------------------------------------------------- + Wallpaper::Wallpaper( const Wallpaper& rWallpaper ) { @@ -222,7 +222,7 @@ Wallpaper::Wallpaper( const Wallpaper& rWallpaper ) mpImplWallpaper->mnRefCount++; } -// ----------------------------------------------------------------------- + Wallpaper::Wallpaper( const Color& rColor ) { @@ -232,7 +232,7 @@ Wallpaper::Wallpaper( const Color& rColor ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } -// ----------------------------------------------------------------------- + Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) { @@ -242,7 +242,7 @@ Wallpaper::Wallpaper( const BitmapEx& rBmpEx ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } -// ----------------------------------------------------------------------- + Wallpaper::Wallpaper( const Gradient& rGradient ) { @@ -252,7 +252,7 @@ Wallpaper::Wallpaper( const Gradient& rGradient ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } -// ----------------------------------------------------------------------- + Wallpaper::~Wallpaper() { @@ -267,7 +267,7 @@ Wallpaper::~Wallpaper() } } -// ----------------------------------------------------------------------- + void Wallpaper::SetColor( const Color& rColor ) { @@ -279,7 +279,7 @@ void Wallpaper::SetColor( const Color& rColor ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } -// ----------------------------------------------------------------------- + const Color& Wallpaper::GetColor() const { @@ -287,7 +287,7 @@ const Color& Wallpaper::GetColor() const return mpImplWallpaper->maColor; } -// ----------------------------------------------------------------------- + void Wallpaper::SetStyle( WallpaperStyle eStyle ) { @@ -302,7 +302,7 @@ void Wallpaper::SetStyle( WallpaperStyle eStyle ) mpImplWallpaper->meStyle = eStyle; } -// ----------------------------------------------------------------------- + WallpaperStyle Wallpaper::GetStyle() const { @@ -310,7 +310,7 @@ WallpaperStyle Wallpaper::GetStyle() const return mpImplWallpaper->meStyle; } -// ----------------------------------------------------------------------- + void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) { @@ -337,7 +337,7 @@ void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } -// ----------------------------------------------------------------------- + BitmapEx Wallpaper::GetBitmap() const { @@ -351,7 +351,7 @@ BitmapEx Wallpaper::GetBitmap() const } } -// ----------------------------------------------------------------------- + bool Wallpaper::IsBitmap() const { @@ -360,7 +360,7 @@ bool Wallpaper::IsBitmap() const } -// ----------------------------------------------------------------------- + void Wallpaper::SetGradient( const Gradient& rGradient ) { @@ -376,7 +376,7 @@ void Wallpaper::SetGradient( const Gradient& rGradient ) mpImplWallpaper->meStyle = WALLPAPER_TILE; } -// ----------------------------------------------------------------------- + Gradient Wallpaper::GetGradient() const { @@ -392,7 +392,7 @@ Gradient Wallpaper::GetGradient() const } } -// ----------------------------------------------------------------------- + bool Wallpaper::IsGradient() const { @@ -401,7 +401,7 @@ bool Wallpaper::IsGradient() const } -// ----------------------------------------------------------------------- + Gradient Wallpaper::ImplGetApplicationGradient() const { @@ -417,7 +417,7 @@ Gradient Wallpaper::ImplGetApplicationGradient() const return g; } -// ----------------------------------------------------------------------- + void Wallpaper::SetRect( const Rectangle& rRect ) { @@ -441,7 +441,7 @@ void Wallpaper::SetRect( const Rectangle& rRect ) } } -// ----------------------------------------------------------------------- + Rectangle Wallpaper::GetRect() const { @@ -455,7 +455,7 @@ Rectangle Wallpaper::GetRect() const } } -// ----------------------------------------------------------------------- + bool Wallpaper::IsRect() const { @@ -464,7 +464,7 @@ bool Wallpaper::IsRect() const } -// ----------------------------------------------------------------------- + bool Wallpaper::IsFixed() const { @@ -474,7 +474,7 @@ bool Wallpaper::IsFixed() const return (!mpImplWallpaper->mpBitmap && !mpImplWallpaper->mpGradient); } -// ----------------------------------------------------------------------- + bool Wallpaper::IsScrollable() const { @@ -488,7 +488,7 @@ bool Wallpaper::IsScrollable() const return false; } -// ----------------------------------------------------------------------- + Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) { @@ -513,7 +513,7 @@ Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) return *this; } -// ----------------------------------------------------------------------- + bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const { @@ -546,7 +546,7 @@ bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const return true; } -// ----------------------------------------------------------------------- + SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ) { @@ -554,7 +554,7 @@ SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ) return ReadImplWallpaper( rIStm, *rWallpaper.mpImplWallpaper ); } -// ----------------------------------------------------------------------- + SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ) { 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 ) { |