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 /svx/source/tbxctrls | |
parent | fdo#70414: Use correct target names for building Visual Studio projects. (diff) | |
download | core-0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf.tar.gz core-0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf.zip |
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 'svx/source/tbxctrls')
-rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 10 | ||||
-rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 100 | ||||
-rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 10 | ||||
-rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 66 | ||||
-rw-r--r-- | svx/source/tbxctrls/formatpaintbrushctrl.cxx | 14 | ||||
-rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 62 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 56 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 28 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 148 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 12 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 16 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbxcolor.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbxcolorupdate.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbxdrctl.cxx | 10 |
14 files changed, 270 insertions, 270 deletions
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index cce884f49765..a8946a934337 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -36,9 +36,9 @@ #include "svx/xexch.hxx" #include <vcl/svapp.hxx> -// ------------------------ + // - SvxColorValueSetData - -// ------------------------ + class SvxColorValueSetData : public TransferableHelper { @@ -58,14 +58,14 @@ public: maData( rSetItem ) {} }; -// ----------------------------------------------------------------------------- + void SvxColorValueSetData::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_XFA ); } -// ----------------------------------------------------------------------------- + sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { @@ -80,7 +80,7 @@ sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::Da return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_uInt32 , const ::com::sun::star::datatransfer::DataFlavor& ) { diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index ae35c5c306b7..eb49b9e77f62 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -131,7 +131,7 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled ) { @@ -156,7 +156,7 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled enableEntry( 2, bEnabled ); } -// ----------------------------------------------------------------------- + void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bEnabled ) { @@ -166,7 +166,7 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE enableEntry( 1, bEnabled ); } -// ----------------------------------------------------------------------- + void SAL_CALL ExtrusionDirectionWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event @@ -200,7 +200,7 @@ void SAL_CALL ExtrusionDirectionWindow::statusChanged( } } -// ----------------------------------------------------------------------- + IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl ) { @@ -246,23 +246,23 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( { } -// ----------------------------------------------------------------------- + ::Window* ExtrusionDirectionControl::createPopupWindow( ::Window* pParent ) { return new ExtrusionDirectionWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -271,7 +271,7 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr @@ -280,14 +280,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstan return *new ExtrusionDirectionControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL ExtrusionDirectionControl::getImplementationName( ) throw (RuntimeException) { return ExtrusionDirectionControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames( ) throw (RuntimeException) { @@ -352,7 +352,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( AddStatusListener( msMetricUnit ); } -// ----------------------------------------------------------------------- + void ExtrusionDepthWindow::implSetDepth( double fDepth ) { @@ -371,7 +371,7 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth ) } } -// ----------------------------------------------------------------------- + void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) { @@ -385,7 +385,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) }; } -// ----------------------------------------------------------------------- + void SAL_CALL ExtrusionDepthWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event @@ -419,7 +419,7 @@ void SAL_CALL ExtrusionDepthWindow::statusChanged( } } -// ----------------------------------------------------------------------- + void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -437,7 +437,7 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) { @@ -500,7 +500,7 @@ ExtrusionDepthController::ExtrusionDepthController( { } -// ----------------------------------------------------------------------- + ::Window* ExtrusionDepthController::createPopupWindow( ::Window* pParent ) { @@ -508,16 +508,16 @@ ExtrusionDepthController::ExtrusionDepthController( } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL ExtrusionDepthController_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { @@ -526,21 +526,21 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames( return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL ExtrusionDepthController::getImplementationName( ) throw (RuntimeException) { return ExtrusionDepthController_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames( ) throw (RuntimeException) { @@ -550,7 +550,7 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames // #################################################################### -// ------------------------------------------------------------------------- + ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING )) @@ -613,7 +613,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr AddStatusListener( msExtrusionLightingIntensity ); } -// ----------------------------------------------------------------------- + void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled ) { @@ -627,7 +627,7 @@ void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled ) } } -// ----------------------------------------------------------------------- + void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) { @@ -656,7 +656,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) enableEntry( 3, bEnabled ); } -// ----------------------------------------------------------------------- + void SAL_CALL ExtrusionLightingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event @@ -690,7 +690,7 @@ void SAL_CALL ExtrusionLightingWindow::statusChanged( } } -// ----------------------------------------------------------------------- + void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -705,7 +705,7 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl ) { @@ -762,23 +762,23 @@ ExtrusionLightingControl::ExtrusionLightingControl( { } -// ----------------------------------------------------------------------- + ::Window* ExtrusionLightingControl::createPopupWindow( ::Window* pParent ) { return new ExtrusionLightingWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL ExtrusionLightingControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -787,7 +787,7 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames( return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr @@ -796,14 +796,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstanc return *new ExtrusionLightingControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL ExtrusionLightingControl::getImplementationName( ) throw (RuntimeException) { return ExtrusionLightingControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames( ) throw (RuntimeException) { @@ -839,7 +839,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( AddStatusListener( msExtrusionSurface ); } -// ----------------------------------------------------------------------- + void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) { @@ -851,7 +851,7 @@ void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) } } -// ----------------------------------------------------------------------- + void SAL_CALL ExtrusionSurfaceWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event @@ -872,7 +872,7 @@ void SAL_CALL ExtrusionSurfaceWindow::statusChanged( } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl) { @@ -907,23 +907,23 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( { } -// ----------------------------------------------------------------------- + ::Window* ExtrusionSurfaceControl::createPopupWindow( ::Window* pParent ) { return new ExtrusionSurfaceWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -932,7 +932,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr @@ -941,14 +941,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance return *new ExtrusionSurfaceControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName( ) throw (RuntimeException) { return ExtrusionSurfaceControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames( ) throw (RuntimeException) { @@ -968,21 +968,21 @@ ExtrusionColorControl::ExtrusionColorControl( mpBtnUpdater = new ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ); } -// ----------------------------------------------------------------------- + ExtrusionColorControl::~ExtrusionColorControl() { delete mpBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() { @@ -999,7 +999,7 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 92f095e75d2b..c99830464191 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -516,7 +516,7 @@ FillControl::FillControl( Window* pParent, WinBits nStyle ) : aDelayTimer.Start(); } -//------------------------------------------------------------------------ + FillControl::~FillControl() { @@ -524,7 +524,7 @@ FillControl::~FillControl() delete pLbFillAttr; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) { @@ -535,7 +535,7 @@ IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) } IMPL_LINK_INLINE_END( FillControl, DelayHdl, Timer *, pTimer ) -//------------------------------------------------------------------------ + IMPL_LINK( FillControl, SelectFillTypeHdl, ListBox *, pBox ) { @@ -641,7 +641,7 @@ IMPL_LINK( FillControl, SelectFillTypeHdl, ListBox *, pBox ) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) { @@ -772,7 +772,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) return 0; } -//------------------------------------------------------------------------ + void FillControl::Resize() { diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index ea0d92491451..c1c6365c3546 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -98,12 +98,12 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent fillFavorites( GALLERY_THEME_FONTWORK ); } -// ----------------------------------------------------------------------- + FontWorkGalleryDialog::~FontWorkGalleryDialog() { } -// ----------------------------------------------------------------------- + void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId) { @@ -243,7 +243,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork() } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) { @@ -252,7 +252,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) { @@ -261,7 +261,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl) return( 0L ); } -//------------------------------------------------------------------------ + SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem ); FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) @@ -271,20 +271,20 @@ FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + FontWorkShapeTypeControl::~FontWorkShapeTypeControl() { } -// ----------------------------------------------------------------------- + SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; //( aLastAction.getLength() == 0 ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT ); } -// ----------------------------------------------------------------------- + SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow() { @@ -293,7 +293,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow() return NULL; } -// ----------------------------------------------------------------------- + void FontWorkShapeTypeControl::Select( sal_Bool ) { @@ -354,7 +354,7 @@ FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rContr AddStatusListener( msFontworkAlignment ); } -// ----------------------------------------------------------------------- + void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled ) { @@ -366,7 +366,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled ) } } -// ----------------------------------------------------------------------- + void SAL_CALL FontworkAlignmentWindow::statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ) { @@ -385,7 +385,7 @@ void SAL_CALL FontworkAlignmentWindow::statusChanged( const frame::FeatureStateE } } -// ----------------------------------------------------------------------- + void FontworkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) { @@ -401,7 +401,7 @@ void FontworkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl) { @@ -442,30 +442,30 @@ public: }; -// ----------------------------------------------------------------------- + FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) ) { } -// ----------------------------------------------------------------------- + ::Window* FontworkAlignmentControl::createPopupWindow( ::Window* pParent ) { return new FontworkAlignmentWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL FontworkAlignmentControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -474,21 +474,21 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames( return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new FontworkAlignmentControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL FontworkAlignmentControl::getImplementationName( ) throw (RuntimeException) { return FontworkAlignmentControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames( ) throw (RuntimeException) { @@ -517,7 +517,7 @@ private: }; -// ----------------------------------------------------------------------- + FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )) @@ -545,7 +545,7 @@ FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxCont AddStatusListener( msFontworkKernCharacterPairs ); } -// ----------------------------------------------------------------------- + void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled ) { @@ -571,7 +571,7 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact } } -// ----------------------------------------------------------------------- + void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool bEnabled ) { @@ -579,7 +579,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool b checkEntry( 6, bEnabled ); } -// ----------------------------------------------------------------------- + void SAL_CALL FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) { @@ -611,7 +611,7 @@ void SAL_CALL FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::s } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl) { @@ -685,23 +685,23 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc { } -// ----------------------------------------------------------------------- + ::Window* FontworkCharacterSpacingControl::createPopupWindow( ::Window* pParent ) { return new FontworkCharacterSpacingWindow( *this, m_xFrame, pParent ); } -// ----------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------- + OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() { return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" ); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) { @@ -710,21 +710,21 @@ Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServic return aSNS; } -// -------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new FontworkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) ); } -// -------------------------------------------------------------------- + OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName( ) throw (RuntimeException) { return FontworkCharacterSpacingControl_getImplementationName(); } -// -------------------------------------------------------------------- + Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames( ) throw (RuntimeException) { diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 0af1446b99d3..2f87062297c8 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -51,14 +51,14 @@ FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlot m_aDoubleClickTimer.SetTimeout(nDblClkTime); } -// ----------------------------------------------------------------------- + FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() { m_aDoubleClickTimer.Stop(); } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::impl_executePaintBrush() { Sequence< PropertyValue > aArgs( 1 ); @@ -68,7 +68,7 @@ void FormatPaintBrushToolBoxControl::impl_executePaintBrush() , aArgs ); } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::DoubleClick() { m_aDoubleClickTimer.Stop(); @@ -77,14 +77,14 @@ void FormatPaintBrushToolBoxControl::DoubleClick() this->impl_executePaintBrush(); } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::Click() { m_bPersistentCopy = false; m_aDoubleClickTimer.Start(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) { //there was no second click during waiting @@ -92,12 +92,12 @@ IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) return 0; } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::Select( sal_Bool ) { } -// ----------------------------------------------------------------------- + void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 01b221c05155..9591a1c9ae94 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -73,13 +73,13 @@ SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinB aDelayTimer.Start(); } -// ----------------------------------------------------------------------- + SvxLineBox::~SvxLineBox() { } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl) { @@ -91,7 +91,7 @@ IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + void SvxLineBox::Select() { @@ -156,7 +156,7 @@ void SvxLineBox::Select() } } -// ----------------------------------------------------------------------- + bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) { @@ -185,7 +185,7 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) return LineLB::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxLineBox::Notify( NotifyEvent& rNEvt ) { @@ -212,7 +212,7 @@ bool SvxLineBox::Notify( NotifyEvent& rNEvt ) return nHandled; } -// ----------------------------------------------------------------------- + void SvxLineBox::ReleaseFocus_Impl() { @@ -288,13 +288,13 @@ SvxColorBox::SvxColorBox( } } -// ----------------------------------------------------------------------- + SvxColorBox::~SvxColorBox() { } -// ----------------------------------------------------------------------- + void SvxColorBox::Update( const XLineColorItem* pItem ) { @@ -335,7 +335,7 @@ void SvxColorBox::Update( const XLineColorItem* pItem ) SetNoSelection(); } -// ----------------------------------------------------------------------- + void SvxColorBox::Select() { @@ -361,7 +361,7 @@ void SvxColorBox::Select() } } -// ----------------------------------------------------------------------- + bool SvxColorBox::PreNotify( NotifyEvent& rNEvt ) { @@ -391,7 +391,7 @@ bool SvxColorBox::PreNotify( NotifyEvent& rNEvt ) return ColorLB::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxColorBox::Notify( NotifyEvent& rNEvt ) { @@ -430,7 +430,7 @@ void SvxColorBox::DataChanged( const DataChangedEvent& rDCEvt ) ColorLB::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + void SvxColorBox::ReleaseFocus_Impl() { @@ -477,13 +477,13 @@ SvxMetricField::SvxMetricField( Show(); } -// ----------------------------------------------------------------------- + SvxMetricField::~SvxMetricField() { } -// ----------------------------------------------------------------------- + void SvxMetricField::Update( const XLineWidthItem* pItem ) { @@ -496,7 +496,7 @@ void SvxMetricField::Update( const XLineWidthItem* pItem ) SetText( "" ); } -// ----------------------------------------------------------------------- + void SvxMetricField::Modify() { @@ -514,7 +514,7 @@ void SvxMetricField::Modify() aArgs ); } -// ----------------------------------------------------------------------- + void SvxMetricField::ReleaseFocus_Impl() { @@ -526,7 +526,7 @@ void SvxMetricField::ReleaseFocus_Impl() } } -// ----------------------------------------------------------------------- + void SvxMetricField::Down() { @@ -538,21 +538,21 @@ void SvxMetricField::Down() MetricField::Down(); } -// ----------------------------------------------------------------------- + void SvxMetricField::Up() { MetricField::Up(); } -// ----------------------------------------------------------------------- + void SvxMetricField::SetCoreUnit( SfxMapUnit eUnit ) { ePoolUnit = eUnit; } -// ----------------------------------------------------------------------- + void SvxMetricField::RefreshDlgUnit() { @@ -564,7 +564,7 @@ void SvxMetricField::RefreshDlgUnit() } } -// ----------------------------------------------------------------------- + bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) { @@ -576,7 +576,7 @@ bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) return MetricField::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxMetricField::Notify( NotifyEvent& rNEvt ) { @@ -650,13 +650,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillTypeBox(Window *pPar return new SvxFillTypeBox(pParent); } -// ----------------------------------------------------------------------- + SvxFillTypeBox::~SvxFillTypeBox() { } -// ----------------------------------------------------------------------- + bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) { @@ -677,7 +677,7 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) return FillTypeLB::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) { @@ -708,7 +708,7 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) return nHandled; } -// ----------------------------------------------------------------------- + void SvxFillTypeBox::ReleaseFocus_Impl() { @@ -743,13 +743,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillAttrBox(Window *pPar return new SvxFillAttrBox(pParent); } -// ----------------------------------------------------------------------- + SvxFillAttrBox::~SvxFillAttrBox() { } -// ----------------------------------------------------------------------- + bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) { @@ -761,7 +761,7 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) return FillAttrLB::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) { @@ -792,14 +792,14 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) return nHandled; } -// ----------------------------------------------------------------------- + void SvxFillAttrBox::Select() { FillAttrLB::Select(); } -// ----------------------------------------------------------------------- + void SvxFillAttrBox::ReleaseFocus_Impl() { diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 07898e1023f5..1d5aa7688f54 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -98,7 +98,7 @@ private: const long TableWindow::TABLE_CELLS_HORIZ = 10; const long TableWindow::TABLE_CELLS_VERT = 15; -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(TableWindow, SelectHdl) { @@ -106,7 +106,7 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) @@ -154,20 +154,20 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri SetOutputSizePixel( Size( mnTableWidth + 3, mnTableHeight + 33 ) ); } -// ----------------------------------------------------------------------- + TableWindow::~TableWindow() { } -// ----------------------------------------------------------------------- + SfxPopupWindow* TableWindow::Clone() const { return new TableWindow( GetId(), maCommand, GetText(), rTbx, mxFrame ); } -// ----------------------------------------------------------------------- + void TableWindow::MouseMove( const MouseEvent& rMEvt ) { @@ -181,7 +181,7 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt ) Update( nNewCol, nNewLine ); } -// ----------------------------------------------------------------------- + void TableWindow::KeyInput( const KeyEvent& rKEvt ) { @@ -255,7 +255,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) SfxPopupWindow::KeyInput(rKEvt); } -// ----------------------------------------------------------------------- + void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -263,7 +263,7 @@ void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); } -// ----------------------------------------------------------------------- + void TableWindow::Paint( const Rectangle& ) { @@ -333,7 +333,7 @@ void TableWindow::Paint( const Rectangle& ) } } -// ----------------------------------------------------------------------- + void TableWindow::PopupModeEnd() { @@ -351,7 +351,7 @@ void TableWindow::PopupModeEnd() SfxPopupWindow::PopupModeEnd(); } -// ----------------------------------------------------------------------- + void TableWindow::Update( long nNewCol, long nNewLine ) { @@ -369,7 +369,7 @@ void TableWindow::Update( long nNewCol, long nNewLine ) } } -// ----------------------------------------------------------------------- + void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) { @@ -391,7 +391,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) } } -// ----------------------------------------------------------------------- + void TableWindow::CloseAndShowTableDialog() { @@ -437,7 +437,7 @@ public: sal_uInt16 GetColCount() const { return (sal_uInt16)nCol; } }; -// ----------------------------------------------------------------------- + ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), @@ -474,14 +474,14 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUStri StartCascading(); } -// ----------------------------------------------------------------------- + SfxPopupWindow* ColumnsWindow::Clone() const { return new ColumnsWindow( GetId(), maCommand, GetText(), rTbx, mxFrame ); } -// ----------------------------------------------------------------------- + void ColumnsWindow::MouseMove( const MouseEvent& rMEvt ) { @@ -561,7 +561,7 @@ void ColumnsWindow::UpdateSize_Impl( long nNewCol ) } Update(); } -// ----------------------------------------------------------------------- + void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -622,7 +622,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) SfxPopupWindow::KeyInput(rKEvt); } -// ----------------------------------------------------------------------- + void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) { @@ -633,7 +633,7 @@ void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); } -// ----------------------------------------------------------------------- + void ColumnsWindow::Paint( const Rectangle& ) { @@ -689,7 +689,7 @@ void ColumnsWindow::Paint( const Rectangle& ) DrawRect( Rectangle( 0, 0, aSize.Width() - 1, aSize.Height() - nTextHeight + 1 ) ); } -// ----------------------------------------------------------------------- + void ColumnsWindow::PopupModeEnd() { @@ -724,20 +724,20 @@ SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + SvxTableToolBoxControl::~SvxTableToolBoxControl() { } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxTableToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONTIMEOUTANDMOVE; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindow() { @@ -752,7 +752,7 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindow() return 0; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading() { @@ -761,7 +761,7 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading() return 0; } -// ----------------------------------------------------------------------- + void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -790,20 +790,20 @@ SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl() { } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxColumnsToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONTIMEOUTANDMOVE; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindow() { @@ -818,7 +818,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindow() return pWin; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading() { diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 451e451eb2cc..29586d4f997a 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -423,13 +423,13 @@ SfxPopupWindow* SvxLineEndWindow::Clone() const return new SvxLineEndWindow( GetId(), mxFrame, GetText() ); } -// ----------------------------------------------------------------------- + SvxLineEndWindow::~SvxLineEndWindow() { } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) { @@ -490,7 +490,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::FillValueSet() { @@ -541,7 +541,7 @@ void SvxLineEndWindow::FillValueSet() } } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::Resize() { @@ -567,7 +567,7 @@ void SvxLineEndWindow::Resize() } } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::Resizing( Size& rNewSize ) { @@ -614,21 +614,21 @@ void SvxLineEndWindow::Resizing( Size& rNewSize ) rNewSize.Width() = nW; rNewSize.Height() = nH; } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::StartSelection() { aLineEndSet.StartSelection(); } -// ----------------------------------------------------------------------- + bool SvxLineEndWindow::Close() { return SfxPopupWindow::Close(); } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::StateChanged( sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState ) @@ -651,7 +651,7 @@ void SvxLineEndWindow::StateChanged( } } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::PopupModeEnd() { @@ -663,7 +663,7 @@ void SvxLineEndWindow::PopupModeEnd() SfxPopupWindow::PopupModeEnd(); } -// ----------------------------------------------------------------------- + void SvxLineEndWindow::SetSize() { @@ -716,20 +716,20 @@ SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + SvxLineEndToolBoxControl::~SvxLineEndToolBoxControl() { } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxLineEndToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow() { @@ -744,7 +744,7 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow() return pLineEndWin; } -// ----------------------------------------------------------------------- + void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b46c61c9d4fa..b282f8fb016f 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -88,7 +88,7 @@ #include <editeng/eerdll.hxx> #include <editeng/editrids.hrc> -// ------------------------------------------------------------------------ + #define MAX_MRU_FONTNAME_ENTRIES 5 #define LOGICAL_EDIT_HEIGHT 12 @@ -360,7 +360,7 @@ SvxStyleBox_Impl::~SvxStyleBox_Impl() { } -// ----------------------------------------------------------------------- + void SvxStyleBox_Impl::ReleaseFocus() { @@ -373,7 +373,7 @@ void SvxStyleBox_Impl::ReleaseFocus() m_xFrame->getContainerWindow()->setFocus(); } -// ----------------------------------------------------------------------- + void SvxStyleBox_Impl::Select() { @@ -463,14 +463,14 @@ void SvxStyleBox_Impl::Select() } } } -// ----------------------------------------------------------------------- + void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily ) { eStyleFamily = eNewFamily; } -// ----------------------------------------------------------------------- + bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) { @@ -487,7 +487,7 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -707,7 +707,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) } } -//-------------------------------------------------------------------- + IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl ) { @@ -717,7 +717,7 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl ) return 0; } -// ----------------------------------------------------------------------- + static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl* pBox ) { @@ -819,7 +819,7 @@ SvxFontNameBox_Impl::~SvxFontNameBox_Impl() GetSubEdit()->RemoveEventListener( LINK( this, SvxFontNameBox_Impl, CheckAndMarkUnknownFont )); } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::FillList() { @@ -860,7 +860,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent*, event return 0; } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem ) { @@ -877,7 +877,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem ) SetText( aCurName ); } -// ----------------------------------------------------------------------- + bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) { @@ -891,7 +891,7 @@ bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) return FontNameBox::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- + bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -936,7 +936,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) return nHandled || FontNameBox::Notify( rNEvt ); } -// --------------------------------------------------------------------------- + void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -950,7 +950,7 @@ void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) FontNameBox::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::ReleaseFocus_Impl() { @@ -963,7 +963,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl() m_xFrame->getContainerWindow()->setFocus(); } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::EnableControls_Impl() { @@ -982,7 +982,7 @@ void SvxFontNameBox_Impl::EnableControls_Impl() EnableWYSIWYG( bEnable ); } -// ----------------------------------------------------------------------- + void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) { @@ -1164,7 +1164,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const return new SvxColorWindow_Impl( maCommand, theSlotId, GetFrame(), GetText(), GetParent(), mLastColor ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) { @@ -1216,28 +1216,28 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + void SvxColorWindow_Impl::Resize() { lcl_ResizeValueSet( *this, aColorSet); } -// ----------------------------------------------------------------------- + void SvxColorWindow_Impl::StartSelection() { aColorSet.StartSelection(); } -// ----------------------------------------------------------------------- + bool SvxColorWindow_Impl::Close() { return SfxPopupWindow::Close(); } -// ----------------------------------------------------------------------- + void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { @@ -1352,7 +1352,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) aFrameSet.SetItemImage( i, aImgList.GetImage( i ) ); } } -// ----------------------------------------------------------------------- + #define FRM_VALID_LEFT 0x01 #define FRM_VALID_RIGHT 0x02 @@ -1478,14 +1478,14 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + void SvxFrameWindow_Impl::Resize() { lcl_ResizeValueSet( *this, aFrameSet); } -// ----------------------------------------------------------------------- + void SvxFrameWindow_Impl::StateChanged( @@ -1528,14 +1528,14 @@ void SvxFrameWindow_Impl::StateChanged( SfxPopupWindow::StateChanged( nSID, eState, pState ); } -// ----------------------------------------------------------------------- + void SvxFrameWindow_Impl::StartSelection() { aFrameSet.StartSelection(); } -// ----------------------------------------------------------------------- + bool SvxFrameWindow_Impl::Close() { @@ -1611,7 +1611,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const return new SvxLineWindow_Impl( GetId(), GetFrame(), GetParent() ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) { @@ -1643,28 +1643,28 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl) return 0; } -// ----------------------------------------------------------------------- + void SvxLineWindow_Impl::Resize() { m_aLineStyleLb.Resize(); } -// ----------------------------------------------------------------------- + bool SvxLineWindow_Impl::Close() { return SfxPopupWindow::Close(); } -// ----------------------------------------------------------------------- + Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() { return &m_aLineStyleLb; } -// ----------------------------------------------------------------------- + void SvxLineWindow_Impl::GetFocus() { @@ -1683,7 +1683,7 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) #endif } -// ----------------------------------------------------------------------- + //######################################################################## // Helper classes @@ -1702,7 +1702,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( { } -// ----------------------------------------------------------------------- + void SfxStyleControllerItem_Impl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) @@ -1862,13 +1862,13 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl( } } -// ----------------------------------------------------------------------- + SvxStyleToolBoxControl::~SvxStyleToolBoxControl() { delete pImpl; } -// ----------------------------------------------------------------------- + void SAL_CALL SvxStyleToolBoxControl::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException) { @@ -1919,7 +1919,7 @@ throw (::com::sun::star::uno::RuntimeException) DELETEZ( pImpl ); } -// ----------------------------------------------------------------------- + void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException) { // Do nothing, we will start binding our listener when we are visible. @@ -1934,7 +1934,7 @@ void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException) } } -// ----------------------------------------------------------------------- + SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() { @@ -1952,7 +1952,7 @@ SfxStyleFamily SvxStyleToolBoxControl::GetActFamily() return SFX_STYLE_FAMILY_PARA; } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::FillStyleBox() { @@ -2068,7 +2068,7 @@ void SvxStyleToolBoxControl::FillStyleBox() } } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName ) { @@ -2090,7 +2090,7 @@ void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName ) } } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::Update() { @@ -2111,7 +2111,7 @@ void SvxStyleToolBoxControl::Update() return; } - //-------------------------------------------------------------------- + const SfxTemplateItem* pItem = NULL; if ( nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1]) ) @@ -2141,7 +2141,7 @@ void SvxStyleToolBoxControl::Update() SelectStyle( pItem->GetStyleName() ); } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, const SfxTemplateItem* pItem ) @@ -2154,7 +2154,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, Update(); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification) { @@ -2180,7 +2180,7 @@ IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification) return 0; } -// ----------------------------------------------------------------------- + void SvxStyleToolBoxControl::StateChanged( @@ -2220,7 +2220,7 @@ void SvxStyleToolBoxControl::StateChanged( Update(); } -// ----------------------------------------------------------------------- + Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent ) { @@ -2253,7 +2253,7 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl( { } -// ----------------------------------------------------------------------- + void SvxFontNameToolBoxControl::StateChanged( @@ -2291,7 +2291,7 @@ void SvxFontNameToolBoxControl::StateChanged( rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); } -// ----------------------------------------------------------------------- + Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent ) { @@ -2318,21 +2318,21 @@ SvxFontColorToolBoxControl::SvxFontColorToolBoxControl( rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } -// ----------------------------------------------------------------------- + SvxFontColorToolBoxControl::~SvxFontColorToolBoxControl() { delete pBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxFontColorToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow() { @@ -2352,7 +2352,7 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void SvxFontColorToolBoxControl::StateChanged( @@ -2393,21 +2393,21 @@ SvxColorToolBoxControl::SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ); } -// ----------------------------------------------------------------------- + SvxColorToolBoxControl::~SvxColorToolBoxControl() { delete pBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() { @@ -2428,7 +2428,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void SvxColorToolBoxControl::StateChanged( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) @@ -2501,21 +2501,21 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl( pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ); } -// ----------------------------------------------------------------------- + SvxColorExtToolBoxControl::~SvxColorExtToolBoxControl() { delete pBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxColorExtToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONTIMEOUT; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow() { @@ -2551,7 +2551,7 @@ SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void SvxColorExtToolBoxControl::StateChanged( @@ -2582,7 +2582,7 @@ void SvxColorExtToolBoxControl::StateChanged( } } -// ----------------------------------------------------------------------- + void SvxColorExtToolBoxControl::Select( sal_Bool ) { @@ -2643,14 +2643,14 @@ SvxFrameToolBoxControl::SvxFrameToolBoxControl( rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxFrameToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow() { @@ -2667,7 +2667,7 @@ SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow() return pFrameWin; } -// ----------------------------------------------------------------------- + void SvxFrameToolBoxControl::StateChanged( @@ -2697,14 +2697,14 @@ SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl( rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow() { @@ -2718,7 +2718,7 @@ SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow() return pLineWin; } -// ----------------------------------------------------------------------- + void SvxFrameLineStyleToolBoxControl::StateChanged( @@ -2749,7 +2749,7 @@ SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl( rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); } -// ----------------------------------------------------------------------- + SvxFrameLineColorToolBoxControl::~SvxFrameLineColorToolBoxControl() { @@ -2757,14 +2757,14 @@ SvxFrameLineColorToolBoxControl::~SvxFrameLineColorToolBoxControl() delete pBtnUpdater; } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxFrameLineColorToolBoxControl::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow() { @@ -2783,7 +2783,7 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow() return pColorWin; } -// ----------------------------------------------------------------------- + void SvxFrameLineColorToolBoxControl::StateChanged( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) @@ -2815,13 +2815,13 @@ SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sa aDefaultText = rTbx.GetItemText( nId ); } -// ----------------------------------------------------------------------- + SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController() { } -// ----------------------------------------------------------------------- + void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -2847,7 +2847,7 @@ static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ) rValueSet.SetPosSizePixel( Point(2,2), aSize ); } -// ----------------------------------------------------------------------- + static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) { @@ -2857,7 +2857,7 @@ static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size rWin.SetOutputSizePixel( aSize ); } -// ----------------------------------------------------------------------------- + Reference< ::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible() { FillList(); diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index c2ad93a71096..62806157d50d 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -135,7 +135,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( SetText( "" ); } -// ----------------------------------------------------------------------- + void SvxFontSizeBox_Impl::ReleaseFocus_Impl() { @@ -149,7 +149,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl() m_xFrame->getContainerWindow()->setFocus(); } -// ----------------------------------------------------------------------- + void SvxFontSizeBox_Impl::Select() { @@ -173,7 +173,7 @@ void SvxFontSizeBox_Impl::Select() } } -// ----------------------------------------------------------------------- + void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) { @@ -195,7 +195,7 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) SaveValue(); } -// ----------------------------------------------------------------------- + void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescriptor& rCurrentFont ) { @@ -221,7 +221,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto m_aCurText = GetText(); // zum R"ucksetzen bei ESC merken } -// ----------------------------------------------------------------------- + bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) { @@ -271,7 +271,7 @@ void SvxFontSizeBox_Impl::SetOptimalSize() SetDropDownSizePixel(aDropSize); } -// --------------------------------------------------------------------------- + void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 98cbbe0cdf28..a446d4e8dab0 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -239,7 +239,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) } -//----------------------------------------------------------------------------------------------------------- + // SearchToolbarControllersManager SearchToolbarControllersManager::SearchToolbarControllersManager() @@ -346,7 +346,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag return xStatusListener; } -//----------------------------------------------------------------------------------------------------------- + // FindTextToolbarController FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) @@ -502,7 +502,7 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) return 0; } -//----------------------------------------------------------------------------------------------------------- + // class UpDownSearchToolboxController UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext, Type eType ) @@ -597,7 +597,7 @@ void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::Fe { } -//----------------------------------------------------------------------------------------------------------- + // MatchCaseToolboxController MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) @@ -695,7 +695,7 @@ void SAL_CALL MatchCaseToolboxController::statusChanged( const css::frame::Featu { } -//----------------------------------------------------------------------------------------------------------- + // class FindAllToolboxController FindAllToolboxController::FindAllToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -782,7 +782,7 @@ void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::Feature { } -//----------------------------------------------------------------------------------------------------------- + // class ExitSearchToolboxController ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -880,7 +880,7 @@ void SAL_CALL ExitSearchToolboxController::statusChanged( const css::frame::Feat { } -//----------------------------------------------------------------------------------------------------------- + // class SearchLabelToolboxController SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ) @@ -962,7 +962,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController:: return VCLUnoHelper::GetInterface(pSL); } -//----------------------------------------------------------------------------------------------------------- + // class FindbarDispatcher FindbarDispatcher::FindbarDispatcher() diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 4c33fbb9bf26..b83be60f60ef 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -62,7 +62,7 @@ namespace svx } } - //-------------------------------------------------------------------- + void ToolboxAccess::toggleToolbox() const { try @@ -94,7 +94,7 @@ namespace svx } } - //-------------------------------------------------------------------- + bool ToolboxAccess::isToolboxVisible() const { return ( m_xLayouter.is() && m_xLayouter->isElementVisible( m_sToolboxResName ) ); diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 2396145eda09..f561fb9e7746 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -72,13 +72,13 @@ namespace svx } } - // ----------------------------------------------------------------------- + ToolboxButtonColorUpdater::~ToolboxButtonColorUpdater() { } - // ----------------------------------------------------------------------- + void ToolboxButtonColorUpdater::Update( const Color& rColor ) { diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 2453f4593d72..cac037a5fdb7 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -41,7 +41,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlDraw, SfxAllEnumItem); using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; -// ----------------------------------------------------------------------- + SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : @@ -54,7 +54,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) @@ -68,14 +68,14 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, GetId(), xLayoutMgr->isElementVisible( m_sToolboxName ) != sal_False ); } -// ----------------------------------------------------------------------- + SfxPopupWindowType SvxTbxCtlDraw::GetPopupWindowType() const { return SFX_POPUPWINDOW_ONCLICK; } -// ----------------------------------------------------------------------- + void SvxTbxCtlDraw::toggleToolbox() { @@ -99,7 +99,7 @@ void SvxTbxCtlDraw::toggleToolbox() } } -// ----------------------------------------------------------------------- + void SvxTbxCtlDraw::Select( sal_Bool ) { |